流程功能代码优化，融资产品，合同，还款

sc-service/src/main/java/com/huyi/service/contract/controller/ContractControllers.java

@@ -12,6 +12,7 @@ import com.huyi.service.base.service.IZcFinanceProConRelService;
 import com.huyi.service.base.service.IZcFinanceQuotaConRelService;
 import com.huyi.service.contract.service.IOwnContractService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.IdUtils;
@@ -69,11 +70,11 @@ public class ContractControllers extends BaseController {
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
         //获取企业
-//        String companyId = use.getCompanyId();
+        String companyId = use.getCompanyId();
         Map map = new HashMap(16);
-//        if(CommonUtil.isNotEmpty(companyId)){
-//            map.put("companyId",companyId);
-//        }
+        if(!SalaryConstants.OPEX.equals(companyId)){
+            map.put("companyId",companyId);
+        }
         //合同模板名称
         if(CommonUtil.isNotEmpty(zfcName)){
             map.put("zfcName",zfcName);

sc-service/src/main/java/com/huyi/service/financeProduct/controller/FinanceProductControllers.java

@@ -21,7 +21,6 @@ import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.security.annotation.PreAuthorize;
 import com.tianhu.common.security.service.TokenService;
-import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,12 +69,12 @@ public class FinanceProductControllers extends BaseController {
     @GetMapping("/list")
     public AjaxResult list(String zfpName, String scyName, String begin,String end, QueryRequest request) {
         //查询当前操作员
-        LoginUser userInfo = tokenService.getLoginUser();
-        SysUser use = userInfo.getSysUser();
+//        LoginUser userInfo = tokenService.getLoginUser();
+//        SysUser use = userInfo.getSysUser();
         //获取企业
 //        String companyId = use.getCompanyId();
         Map map = new HashMap(16);
-//        if(CommonUtil.isNotEmpty(companyId)){
+//        if(!SalaryConstants.OPEX.equals(companyId)){
 //            map.put("companyId",companyId);
 //        }
         //产品名称
@@ -159,6 +158,13 @@ public class FinanceProductControllers extends BaseController {
         if(CommonUtil.isEmpty(zfpName)){
             return AjaxResult.error("产品名称不能为空");
         }
+        //校验产品名称是否重复
+        LambdaQueryWrapper<ZcFinanceProduct> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ZcFinanceProduct::getZfpName,zfpName);
+        List<ZcFinanceProduct> list = zcFinanceProductService.findZcFinanceProducts(lambdaQueryWrapper);
+        if(list.size()>0){
+            return AjaxResult.error("融资产品已存在");
+        }
         //产品类型
         String zfpType = CommonUtil.objToString(map.get("zfpType"));
         //经办人意愿方式
@@ -312,6 +318,8 @@ public class FinanceProductControllers extends BaseController {
         //获取当前用户
         LoginUser userInf = tokenService.getLoginUser();
         String user = CommonUtil.objToString(userInf.getSysUser().getUserId());
+        //主键
+        String zfpId = CommonUtil.objToString(map.get("zfpId"));
         //产品编号
         String zfpNumber = CommonUtil.objToString(map.get("zfpNumber"));
         if(CommonUtil.isEmpty(zfpNumber)){
@@ -324,6 +332,14 @@ public class FinanceProductControllers extends BaseController {
         if(CommonUtil.isEmpty(zfpName)){
             return AjaxResult.error("产品名称不能为空");
         }
+        //判断产品名称是否重复
+        LambdaQueryWrapper<ZcFinanceProduct> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ZcFinanceProduct::getZfpName,zfpName);
+        lambdaQueryWrapper.ne(ZcFinanceProduct::getZfpId,zfpId);
+        List<ZcFinanceProduct> list = zcFinanceProductService.findZcFinanceProducts(lambdaQueryWrapper);
+        if(list.size()>0){
+            return AjaxResult.error("融资产品已存在");
+        }
         //资方
         String zfpManagementId = CommonUtil.objToString(map.get("zfpManagementId"));
         if(CommonUtil.isEmpty(zfpManagementId)){
@@ -404,8 +420,7 @@ public class FinanceProductControllers extends BaseController {
         String zfpProfitRate = CommonUtil.objToString(map.get("zfpProfitRate"));
         //是否需平台审批
         String zfpPlatform = CommonUtil.objToString(map.get("zfpPlatform"));
-        //主键
-        String zfpId = CommonUtil.objToString(map.get("zfpId"));
+
         //产品编号
         String heard = "";
         if("0".equals(zfpType)){

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -34,7 +34,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 还款controller
@@ -82,6 +85,8 @@ public class repaymentController extends BaseController {
             map.put("supplierId",company);
         }else if("01".equals(companyType)){
             map.put("coreId",company);
+        }else if("03".equals(companyType)){
+            map.put("management",company);
         }
         if(CommonUtil.isNotEmpty(type)){
             if("00".equals(type)){
@@ -384,14 +389,38 @@ public class repaymentController extends BaseController {
      */
     @GetMapping("/repaymentAmount")
     public AjaxResult repaymentAmount(String day){
-        Map map = new HashMap();
+        //当前用户
+        SysUser user = tokenService.getLoginUser().getSysUser();
+        //企业Id
+        String company = user.getCompanyId();
+        //企业类型
+        String companyType = user.getCompanyType();
+        Map map = new HashMap(16);
+        // 企业类型 00:平台,01:核心企业,02:供应商,03:资方
+        if("02".equals(companyType)){
+            map.put("supplierId",company);
+        }else if("01".equals(companyType)){
+            map.put("coreId",company);
+        }else if("03".equals(companyType)){
+            map.put("management",company);
+        }
+        //天数 00:7天 01:30天 02:60天 03:90天
+        if("00".equals(day)){
+            day = "7";
+        }else if("01".equals(day)){
+            day = "30";
+        }else if("02".equals(day)){
+            day = "60";
+        }else if("03".equals(day)){
+            day = "90";
+        }
         if(CommonUtil.isNotEmpty(day)){
             int days = Integer.parseInt(day);
-            //当前日期
+            //将来日期
             String date = DateUtils.getFetureDate(days);
             map.put("day",date);
         }
-
-        return AjaxResult.success(map);
+        Map amount = ownRepaymentService.selectRepaymentAmount(map);
+        return AjaxResult.success(amount.get("zfrLoanAmount"));
     }
 }

sc-service/src/main/java/com/huyi/service/repayment/mapper/OwnRepaymentMapper.java

@@ -37,4 +37,11 @@ public interface OwnRepaymentMapper
      * @return
      */
     public List<Map> selectNoPageRepaymentList(Map map);
+
+    /**
+     * 查询未还款金额
+     * @param map
+     * @return
+     */
+    public Map selectRepaymentAmount(Map map);
 }

sc-service/src/main/java/com/huyi/service/repayment/service/IOwnRepaymentService.java

@@ -37,4 +37,11 @@ public interface IOwnRepaymentService
      */
     public List<Map> selectNoPageRepaymentList(Map map);
 
+    /**
+     * 查询未还款金额
+     * @param map
+     * @return
+     */
+    public Map selectRepaymentAmount(Map map);
+
 }

sc-service/src/main/java/com/huyi/service/repayment/service/impl/OwnRepaymentServiceImpl.java

@@ -45,4 +45,6 @@ public class OwnRepaymentServiceImpl implements IOwnRepaymentService
         return ownRepaymentMapper.selectNoPageRepaymentList(map);
     }
 
+    @Override
+    public Map selectRepaymentAmount(Map map) {return ownRepaymentMapper.selectRepaymentAmount(map);}
 }

sc-service/src/main/resources/mapper/contract/OwnContractMapper.xml

@@ -25,6 +25,9 @@
             on z.create_by = u.user_id
             where 1=1
             and z.zfc_status != '02'
+            <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+                AND z.zfc_management_id = #{paramMap.companyId}
+            </if>
             <if test="paramMap.zfcName != null  and paramMap.zfcName != ''">
                 AND z.zfc_name LIKE concat('%', #{paramMap.zfcName}, '%')
             </if>

sc-service/src/main/resources/mapper/financeProduct/OwnFinanceProductMapper.xml

@@ -35,6 +35,9 @@
             left join sys_company s
             on z.zfp_management_id = s.scy_id
             where 1=1
+<!--            <if test="paramMap.companyId != null  and paramMap.companyId != ''">-->
+<!--                AND z.zfp_management_id = #{paramMap.companyId}-->
+<!--            </if>-->
             <if test="paramMap.zfpName != null  and paramMap.zfpName != ''">
                 AND z.zfp_name LIKE concat('%', #{paramMap.zfpName}, '%')
             </if>

sc-service/src/main/resources/mapper/repayment/OwnRepaymentMapper.xml

@@ -37,6 +37,9 @@
             <if test="paramMap.coreId != null  and paramMap.coreId != ''">
                 and i.zfi_core_id = #{paramMap.coreId}
             </if>
+            <if test="paramMap.management != null  and paramMap.management != ''">
+                and p.zfp_management_id = #{paramMap.management}
+            </if>
             <if test="paramMap.zfrApplyStatus != null  and paramMap.zfrApplyStatus != ''">
                 AND r.zfr_apply_status = #{paramMap.zfrApplyStatus}
             </if>
@@ -120,12 +123,26 @@
     </select>
     <select id="selectRepaymentAmount" parameterType="map" resultType="map">
         select
-            zfr_loan_amount 'zfrLoanAmount'
-        from zc_finance_record
-        where zfr_apply_status = '00'
+            IFNULL(CAST(ROUND(SUM(r.zfr_loan_amount),2)AS CHAR),'0.00') AS 'zfrLoanAmount'
+        from zc_finance_record r
+        left join zc_finance_inf i
+        on r.zfr_finance_id = i.zfi_id
+        left join zc_finance_product p
+        on i.zfi_product_id = p.zfp_id
+        where 1=1
+        and zfr_apply_status = '00'
+        <if test="supplierId != null  and supplierId != ''">
+            and i.zfi_supplier_id = #{supplierId}
+        </if>
+        <if test="coreId != null  and coreId != ''">
+            and i.zfi_core_id = #{coreId}
+        </if>
+        <if test="management != null  and management != ''">
+            and p.zfp_management_id = #{management}
+        </if>
         <if test="day != null  and day != ''">
             <![CDATA[
-                and zfr_repayment_date <= #{day}
+                and r.zfr_repayment_date <= #{day}
             ]]>
         </if>
     </select>