补充资料审批需不需要调用平台审批

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -318,7 +318,7 @@ public class  FlowableController extends BaseController
             wrapper.eq(ZcFinanceInf::getZfiId,zfiId);
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             zcFinanceInf.setZfiSupplierStatus("01");
-            zcFinanceInfService.update(zcFinanceInf,wrapper);
+
             //融信id查询融资产品
             ZcFinanceInf inf = zcFinanceInfService.getById(zfiId);
             //融资产品
@@ -331,6 +331,7 @@ public class  FlowableController extends BaseController
             ZcFinanceProduct zcFinanceProduct = iZcFinanceProductService.getById(zfiProductId);
             //是否需平台审批(0:不需要,1:需要)
             String zfpPlatform = zcFinanceProduct.getZfpPlatform();
+            System.out.println("补充资料审批通过==产品平台审批是否需要状态==>"+zfpPlatform);
             if ("1".equals(zfpPlatform)) {
                 //调用平台审批
                 Map map = new HashMap();
@@ -343,19 +344,15 @@ public class  FlowableController extends BaseController
                 //调用平台审批
                 approvalService.addPlatformApproval(map);
             }else {
-                ZcFinanceInf financeInf = new ZcFinanceInf();
-                //主键
-                financeInf.setZfiId(zfiId);
                 //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
-                financeInf.setZfiPlatformStatus("01");
-                //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
-                financeInf.setZfiSupplierStatus("01");
+                zcFinanceInf.setZfiPlatformStatus("01");
+                System.out.println("补充资料审批通过====>不需要平台审批");
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 //ToDo 不更改融信状态
 //                financeInf.setZfiStatus("02");
                 //签收日期
 //                financeInf.setZfiSignDate(DateUtils.getNowDate());
-                zcFinanceInfService.updateById(financeInf);
+//                zcFinanceInfService.updateById(financeInf);
                 //TODo 给融资企业经办人生成一条盖章待办
                 /*----------查询供应商企业经办人----------*/
                 //查询用户与企业关系表
@@ -379,6 +376,7 @@ public class  FlowableController extends BaseController
                 /**融信操作日志*/
                 financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+supplierName+"》签收", null, FinanceLog.STATUS_TWO);
             }
+            zcFinanceInfService.update(zcFinanceInf,wrapper);
         } //平台审批通过
         else if("1000000004".equals(menuId)){
             LambdaQueryWrapper<ZcFinanceInf> wrapper = new LambdaQueryWrapper<>();
@@ -517,9 +515,11 @@ public class  FlowableController extends BaseController
             //审批通过
             zcfInf.setZfiSupplierStatus("01");
             zcFinanceInfService.update(zcfInf,lambdaQueryWrapper);
+            //查询融信信息
+            ZcFinanceInf zcFinanceInf = zcFinanceInfService.getById(id);
             //待办标题
-            String tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的融信编号为【"+ id+"】的资料待签署";
-            remoteSystemService.sendNotice(companyId,id,tittle,"00","","03","0",userId,"", "01", "/credit/confirmationAudit/"+id);
+            String tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的融信编号为【"+ zcFinanceInf.getZfiNumber()+"】的资料待签署";
+            remoteSystemService.sendNotice(companyId,id,tittle,"00","","03","0",userId,"", "01", "/credit/addInformation/"+id);
             //TODo 给融资企业生成盖章待办
         }
         //融资审批通过

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -394,7 +394,7 @@ public class ApprovalServiceImpl implements ApprovalService {
             zcFinanceInfService.updateById(zcFinanceInf);
             //待办标题
             String tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的：融信编号为【"+ CommonUtil.objToString(map.get("zfiNumber"))+"】的资料待签署";
-            remoteSystemService.sendNotice(companyId,CommonUtil.objToString(map.get("zfiId")),tittle,"00",null,"03","0",userId,null, "01", "/credit/confirmationAudit/"+CommonUtil.objToString(map.get("zfiId")));
+            remoteSystemService.sendNotice(companyId,CommonUtil.objToString(map.get("zfiId")),tittle,"00",null,"03","0",userId,null, "01", "/credit/addInformation/"+CommonUtil.objToString(map.get("zfiId")));
             //TODO 给融资企业经办人盖章待办
         }else if ("450".equals(resMap.get("code"))) {
             throw new Exception("未配置审批流程");
@@ -560,13 +560,13 @@ public class ApprovalServiceImpl implements ApprovalService {
             zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
             //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
             zcFinanceInf.setZfiSupplierStatus("01");
-            zcFinanceInfService.updateById(zcFinanceInf);
             //融信id查询融资产品
             ZcFinanceInf inf = zcFinanceInfService.getById(zfiId);
             //查询融资产品是否需要平台审批
             ZcFinanceProduct zcFinanceProduct = zcFinanceProductService.getById(CommonUtil.objToString(map.get("zfiProductId")));
             //是否需平台审批(0:不需要,1:需要)
             String zfpPlatform = zcFinanceProduct.getZfpPlatform();
+            System.out.println("补充资料审批通过==产品平台审批是否需要状态==>"+zfpPlatform);
             if ("1".equals(zfpPlatform)) {
                 //调用平台审批
                 Map maps = new HashMap();
@@ -579,19 +579,22 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //调用平台审批
                 approvalService.addPlatformApproval(maps);
             }else {
-                ZcFinanceInf financeInf = new ZcFinanceInf();
-                //主键
-                financeInf.setZfiId(zfiId);
                 //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
-                financeInf.setZfiPlatformStatus("01");
-                //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
-                financeInf.setZfiSupplierStatus("01");
+                zcFinanceInf.setZfiPlatformStatus("01");
+                System.out.println("补充资料审批通过====>不需要平台审批");
+//                ZcFinanceInf financeInf = new ZcFinanceInf();
+//                //主键
+//                financeInf.setZfiId(zfiId);
+//                //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+//                financeInf.setZfiPlatformStatus("01");
+//                //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+//                financeInf.setZfiSupplierStatus("01");
                 //TODO 融信状态不更改
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
 //                financeInf.setZfiStatus("02");
                 //签收日期
-                financeInf.setZfiSignDate(DateUtils.getNowDate());
-                zcFinanceInfService.updateById(financeInf);
+                //financeInf.setZfiSignDate(DateUtils.getNowDate());
+//                zcFinanceInfService.updateById(financeInf);
                 //TODO 给融资企业经办人生成一条盖章待办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", "01", "/credit/creditSeal/"+zfiId);
@@ -599,6 +602,9 @@ public class ApprovalServiceImpl implements ApprovalService {
                 /**融信操作日志*/
                 financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+supplierName+"》签收", null, FinanceLog.STATUS_TWO);
             }
+            System.out.println("更新融信表byId开始===============>");
+            zcFinanceInfService.updateById(zcFinanceInf);
+            System.out.println("更新融信表byId结束===============>");
         }else if ("450".equals(resMap.get("code"))){
             throw new Exception("未配置审批流程!");
         }else if (!"200".equals(resMap.get("code"))) {

sc-service/src/main/resources/mapper/financeRecord/FinanceRecordMapper.xml

@@ -103,7 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON s.scy_id = b.zbi_payer_id
         LEFT JOIN sys_company c
         ON c.scy_id = b.zbi_payee_id
-        where zbi_status = '00'
+        where 1=1
+--         zbi_status = '00'
         <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
             and b.zbi_id  IN (${paramMap.billIdList})
         </if>