融资管理,授信管理

sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -76,7 +76,9 @@ public class CreditLineController extends BaseController {
                   //开始日期
                   @RequestParam (required = false) Map startTime,
                   //结束日期
-                  @RequestParam (required = false) Map endTime,QueryRequest request) {
+                  @RequestParam (required = false) Map endTime,
+                  //授信类型(融资产品类型)
+                  @RequestParam (required = false) String zfpType,QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser user = userInfo.getSysUser();
@@ -103,6 +105,8 @@ public class CreditLineController extends BaseController {
         //结束日期区间
         map.put("endTimeA",endTime.get("endTime[0]"));
         map.put("endTimeB",endTime.get("endTime[1]"));
+        //授信类型(融资产品类型)
+        map.put("zfpType",zfpType);
         IPage<Map> list = creditLineService.selectCreditLineList(map, request);
         List listAll = list.getRecords();
         for (int j = 0; j < listAll.size(); j++) {

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -332,9 +332,9 @@ public class FinanceRecordController extends BaseController {
         //审批状态
         //TODO
         //融资状态
-        zcFinanceRecord.setZfrStatus("00");
+        zcFinanceRecord.setZfrStatus("04");
         //审批状态(00:审核中 01:审批通过, 02:审批拒绝, 03:暂存)
-        zcFinanceRecord.setZfrApproveStt("03");
+//        zcFinanceRecord.setZfrApproveStt("03");
         //创建者
         zcFinanceRecord.setCreateBy(userId);
         //创建时间
@@ -365,7 +365,7 @@ public class FinanceRecordController extends BaseController {
         //融信id
         zcFinanceInf.setZfiId(zfrFinanceId);
         //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
-        zcFinanceInf.setZfiStatus("04");
+//        zcFinanceInf.setZfiStatus("04");
         //修改人
         zcFinanceInf.setUpdateBy(userId);
         //修改时间

sc-service/src/main/java/com/huyi/service/financeRecord/controller/RecordSealController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.constant.FileConstants;
+import com.huyi.service.util.DocumentConstant;
 import com.keao.tianhu.core.util.AmtUtil;
 import com.spire.doc.Document;
 import com.spire.doc.FileFormat;
@@ -506,33 +507,33 @@ public class RecordSealController extends BaseController {
                 //往word中填充数据
                 Map<String,Object> ps = new HashMap<>();
                 //开立方
-                ps.put("openName",openName);
+                ps.put(DocumentConstant.OPEN_NAME,openName);
                 //开立方社会统一代码
-                ps.put("openCode",openCode);
+                ps.put(DocumentConstant.OPEN_CODE,openCode);
                 //开立方银行
-                ps.put("openBank",openBank);
+                ps.put(DocumentConstant.OPEN_BANK,openBank);
                 //开立方账号
-                ps.put("openAccount",openAccount);
+                ps.put(DocumentConstant.OPEN_ACCOUNT,openAccount);
                 //接收方
-                ps.put("receiverName",receiverName);
+                ps.put(DocumentConstant.RECEIVER_NAME,receiverName);
                 //接收方社会统一代码
-                ps.put("receiverCode",receiverCode);
+                ps.put(DocumentConstant.RECEIVER_CODE,receiverCode);
                 //接收方银行
-                ps.put("receiverBank",receiverBank);
+                ps.put(DocumentConstant.RECEIVER_BANK,receiverBank);
                 //接收方账号
-                ps.put("receiverAccount",receiverAccount);
+                ps.put(DocumentConstant.RECEIVER_ACCOUNT,receiverAccount);
                 //小写金额
-                ps.put("zfiAmount",AmtUtil.moneyFormat(zfiAmount));
+                ps.put(DocumentConstant.ZFI_AMOUNT,AmtUtil.moneyFormat(zfiAmount));
                 //大写金额
-                ps.put("zfiAmountBig",zfiAmountBig);
+                ps.put(DocumentConstant.ZFI_AMOUNT_BIG,zfiAmountBig);
                 //起止日期
-                ps.put("stopDate",stopDate);
+                ps.put(DocumentConstant.STOP_DATE,stopDate);
                 //当前日期
-                ps.put("currecntDate",currecntDate);
+                ps.put(DocumentConstant.CURRECNT_DATE,currecntDate);
                 //还款编号
-                ps.put("zfiPaymentNumber",zfiPaymentNumber);
+                ps.put(DocumentConstant.ZFI_PAYMENT_NUMBER,zfiPaymentNumber);
                 //承诺还款日
-                ps.put("expireDate",expireDateA);
+                ps.put(DocumentConstant.EXPIRE_DATE,expireDateA);
                 //调用替换word中的变量
                 WordUtil.wordTemplate(filePath,filePath,ps);
                 /**-------- word 变量替换 结束--------**/
@@ -679,6 +680,22 @@ public class RecordSealController extends BaseController {
                 financeFileRelService.updateById(financeFileRel);
             }
         }
+        /**-------- 盖章完成修改融信状态并 开始--------**/
+        //获取此操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        //获取用户编号
+        String userId = user.getUserId()+"";
+        //修改融信状态
+        ZcFinanceInf finance = new ZcFinanceInf();
+        finance.setZfiId(zfiId);
+        //已生效
+        finance.setZfiStatus("02");
+        //修改时间
+        finance.setUpdateTime(DateUtils.getNowDate());
+        //修改人
+        finance.setUpdateBy(userId);
+        financeInfService.updateById(finance);
         /**-------- 盖章完成修改融信状态并且发起审批 结束--------**/
         return AjaxResult.success();
     }

sc-service/src/main/resources/mapper/creditLine/CreditLineMapper.xml

@@ -59,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="paramMap.endTimeB != null  and paramMap.endTimeB != ''">
             and r.zfpcr_end_date &lt;=  #{paramMap.endTimeB}
         </if>
+        <if test="paramMap.zfpType != null  and paramMap.zfpType != ''">
+            and p.zfp_type = #{paramMap.zfpType}
+        </if>
         order by r.create_time desc
     </select>
 

sc-service/src/main/resources/mapper/supplierCreditLine/SupplierCreditLineMapper.xml

@@ -57,10 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             scy_type		    'scyType',
             r.create_time		'createTime'
         FROM sys_company_rel r
-        LEFT JOIN sys_company ON r.scr_launch_company_id = scy_id
+        LEFT JOIN sys_company ON r.scr_receive_company_id = scy_id
         WHERE scy_status = '00'
-        AND scr_receive_company_id = #{paramMap.companyId}
-        AND scr_launch_type = '00'
+        AND scr_status = '01'
+        AND scr_launch_company_id = #{paramMap.companyId}
+        AND scr_launch_type = '01'
         ORDER BY r.create_time DESC)
         UNION
         (SELECT
@@ -74,10 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             scy_type		    'scyType',
             r.create_time		'createTime'
         FROM sys_company_rel r
-        LEFT JOIN sys_company ON r.scr_receive_company_id = scy_id
+        LEFT JOIN sys_company ON r.scr_launch_company_id = scy_id
         WHERE scy_status = '00'
-        AND scr_launch_company_id = #{paramMap.companyId}
-        AND scr_receive_type = '00'
+        AND scr_status = '01'
+        AND scr_receive_company_id = #{paramMap.companyId}
+        AND scr_receive_type = '01'
         ORDER BY r.create_time DESC)
     </select>
 </mapper>