融信日志记录

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

@@ -210,9 +210,9 @@ public class  FlowableController extends BaseController
             approvalService.addPlatformApproval(map);
         }//融资企业融信开立审批通过
         else if("1000000001".equals(menuId)){
-            LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             String [] arr = id.split("\\|");
             String zfiId = arr[0];
+            LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ZcFinanceInf::getZfiId,zfiId);
             //lambdaQueryWrapper.eq(WcContractInf::getCifCompanyId,arr[1]);
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
@@ -221,6 +221,14 @@ public class  FlowableController extends BaseController
             zcFinanceInfService.update(zcFinanceInf,lambdaQueryWrapper);
             //判断融资展品是否需要平台审批
             ZcFinanceInf inf = zcFinanceInfService.getById(zfiId);
+            //融资企业Id
+            String company = inf.getZfiSupplierId();
+            //融资企业名称
+            SysCompany sysCompany = sysCompanyService.getById(company);
+            String companyName = sysCompany.getScyName();
+            /**融信操作日志*/
+            financeLog.addFinanceLog(id, "融信开立【完成】，由《"+companyName+"》提交平台审批", null, FinanceLog.STATUS_ZERO);
+
             //融资产品
             String zfiProductId = inf.getZfiProductId();
             ZcFinanceProduct zcFinanceProduct = iZcFinanceProductService.getById(zfiProductId);
@@ -251,11 +259,6 @@ public class  FlowableController extends BaseController
 //                financeInf.setZfiSignDate(DateUtils.getNowDate());
                 zcFinanceInfService.updateById(financeInf);
                 //TODO 给融资企业经办人生成盖章待办
-                //融资企业Id
-                String company = inf.getZfiSupplierId();
-                //融资企业名称
-                SysCompany sysCompany = sysCompanyService.getById(company);
-                String companyName = sysCompany.getScyName();
                 //融信编码
                 String zfiNumber = inf.getZfiNumber();
                 //经办人
@@ -275,8 +278,6 @@ public class  FlowableController extends BaseController
             ZcFinanceInf financeInf = zcFinanceInfService.getById(zfiId);
             //发起人Id
             Long user = Long.valueOf(financeInf.getCreateBy());
-            //融资企业
-            String company = financeInf.getZfiSupplierId();
             //融信编号
             String number = financeInf.getZfiNumber();
             //创建时间
@@ -288,6 +289,9 @@ public class  FlowableController extends BaseController
             remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"", null, null);
         }//融资企业补充资料审批通过
         else if("1000000003".equals(menuId)){
+            /**融信操作日志*/
+            financeLog.addFinanceLog(id, "补充资料【完成】，提交于平台审核", null, FinanceLog.STATUS_ZERO);
+
             LambdaQueryWrapper<ZcFinanceInf> wrapper = new LambdaQueryWrapper<>();
             String [] arr = id.split("\\|");
             //融信id
@@ -406,16 +410,24 @@ public class  FlowableController extends BaseController
                 zcFinanceInf.setZfiStatus("02");
                 //签收日期
                 zcFinanceInf.setZfiSignDate(DateUtils.getNowDate());
+                /**融信操作日志*/
+                financeLog.addFinanceLog(id, "平台资料审核【通过】，融信资料提交《"+supplierName+"》签收", null, FinanceLog.STATUS_TWO);
                 //TODO 融资企业开立时不能更改融信状态
             }else if ("0".equals(zfiCreateType)){
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("00");
+                /**融信操作日志*/
+                financeLog.addFinanceLog(id, "平台资料审核【通过】，融信资料提交《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(id, "融信确权【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
             }
             //TODO 融资企业开立时， 给融资企业经办人生成盖章待办
             else if ("2".equals(zfiCreateType)){
                 //标题
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
+                /**融信操作日志*/
+                financeLog.addFinanceLog(id, "平台资料审核【通过】，融信资料提交《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(id, "融信确权生效【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
             }
             //更新融信表状态
             wrapper.eq(ZcFinanceInf::getZfiId,zfiId);
@@ -435,9 +447,6 @@ public class  FlowableController extends BaseController
 //                //调用核心企业确权审批
 //                approvalService.coreConfirmationApproval(map);
 //            }
-            /**融信操作日志*/
-            financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
-            financeLog.addFinanceLog(zfiId, "融信确权【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
         }
         //融资签收通过
         else if("1000000005".equals(menuId)){
@@ -717,7 +726,14 @@ public class  FlowableController extends BaseController
             remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"", null, null);
 
             /**融信操作日志*/
-            financeLog.addFinanceLog(zfiId, "平台资料审核退回，请重新核对资料再次提交", null, FinanceLog.STATUS_ZERO);
+            if ("0".equals(inf.getZfiCreateType())) {
+                financeLog.addFinanceLog(zfiId, "平台资料审核退回，请重新核对资料再次提交", null, FinanceLog.STATUS_ZERO);
+            } else if ("1".equals(inf.getZfiCreateType())) {
+                financeLog.addFinanceLog(zfiId, "平台资料审核退回，请重新核对资料再次提交", null, FinanceLog.STATUS_ONE);
+            } else if ("2".equals(inf.getZfiCreateType())) {
+                financeLog.addFinanceLog(zfiId, "平台资料审核退回，请重新核对资料再次提交", null, FinanceLog.STATUS_ZERO);
+            }
+
         }//融资企业签收审批拒绝
         else if("1000000005".equals(menuId)){
             LambdaQueryWrapper<SysUserCompanyRel> userQueryWrapper = new LambdaQueryWrapper<>();

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

@@ -231,6 +231,8 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //TODO 融资企业经办人盖章代办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
+                /**融信操作日志*/
+                financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "平台资料审核【通过】，融信资料提交《"+supplierName+"》签收", null, FinanceLog.STATUS_TWO);
                 //查询供应商授信额度表
             }else if ("0".equals(zfiCreateType)){
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
@@ -249,6 +251,9 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //TODO 融资企业开立时， 给融资企业经办人生成盖章待办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
+                /**融信操作日志*/
+                financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "平台资料审核【通过】，融信资料提交《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "融信确权生效【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
             }
             zcFinanceInfService.updateById(zcFinanceInf);
         }else if (!"200".equals(resMap.get("code"))) {
@@ -542,6 +547,9 @@ public class ApprovalServiceImpl implements ApprovalService {
         }
         //未开启流程实例
         else if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
+            /**融信操作日志*/
+            financeLog.addFinanceLog(zfiId, "补充资料【完成】，提交于平台审核", null, FinanceLog.STATUS_ZERO);
+
             //修改融资方审批状态为通过
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //融信id
@@ -684,8 +692,13 @@ public class ApprovalServiceImpl implements ApprovalService {
         JSONObject jsonObj=new JSONObject(map);
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+
+        SysCompany company = iSysCompanyService.getById(companyId);
+
         //未开启流程实例
         if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
+            /**融信操作日志*/
+            financeLog.addFinanceLog(String.valueOf(flowParam.get("businessKey")), "融信开立【完成】，由《"+company.getScyName()+"》提交平台审批", null, FinanceLog.STATUS_ZERO);
             //修改状态为通过
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //融信编号

sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -192,10 +192,6 @@ public class CreditHandleController extends BaseController {
             financeInf.setUpdateTime(createTime);
             financeInf.setUpdateBy(CommonUtil.objToString(use.getUserId()));
             financeInfService.updateById(financeInf);
-
-            /**融信操作日志*/
-            financeLog.addFinanceLog(zfiId, "融信确权【通过】，融信提交于《"+supplierName+"》签收", null, FinanceLog.STATUS_TWO);
-            financeLog.addFinanceLog(zfiId, "《"+supplierName+"》待签收", null, FinanceLog.STATUS_TWO);
         }else if("2".equals(zfiCreateType) && "00".equals(flag)){//供应商开立并且通过
             ZcFinanceInf financeInf = new ZcFinanceInf();
             //编号
@@ -251,6 +247,8 @@ public class CreditHandleController extends BaseController {
             /**融信操作日志*/
             if ("0".equals(zfiCreateType)) {
                 financeLog.addFinanceLog(zfiId, "融信确权【拒绝】，融信失效，请联系《"+coreName+"》确认业务信息", null, FinanceLog.STATUS_TWO);
+            } else if ("2".equals(zfiCreateType)) {
+                financeLog.addFinanceLog(zfiId, "融信确权【拒绝】，融信失效", null, FinanceLog.STATUS_TWO);
             }
         }else if("00".equals(flag)){
             //调确权审批
@@ -457,6 +455,8 @@ public class CreditHandleController extends BaseController {
         ZcFinanceInf zcFinanceInf = financeInfService.getById(zfiId);
         if ("0".equals(zcFinanceInf.getZfiCreateType())) {
             financeLog.addFinanceLog(zfiId, "融信签收【拒签】，融信失效", null, FinanceLog.STATUS_THREE);
+        } else if ("1".equals(zcFinanceInf.getZfiCreateType())) {
+            financeLog.addFinanceLog(zfiId, "补充资料【拒绝】，融信失效", null, FinanceLog.STATUS_TWO);
         }
 
         return AjaxResult.success();

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -696,6 +696,9 @@ public class OwnMessageController extends BaseController {
                 //给融资企业经办人添加一条签收待办
                 String title = "【融资签收】您提交于"+openName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"", null, null);
+
+                /**融信操作日志*/
+                financeLog.addFinanceLog(zfiId, "融信开立【完成】，由《"+openName+"》提交于《"+receiverName+"》补全资料", tokenService.getLoginUser().getSysUser().getUserId(), FinanceLog.STATUS_ZERO);
             }else if("02".equals(companyType)){
                 //融资企业
                 //修改融信状态
@@ -716,6 +719,9 @@ public class OwnMessageController extends BaseController {
                 // 核心企业经办人生成一条已生效消息
                 String  titleName = "【融信生效】您提交于"+receiverName+"的融信【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")承诺还款日期:"+expireDateA+"融信已生效";
                 remoteSystemService.sendNotice(zfiCoreId,zfiId,titleName,"01","04","","0",coreHandler,"", null, null);
+
+                /**融信操作日志*/
+                financeLog.addFinanceLog(zfiId, "融信签收【已签收】，融信生效", tokenService.getLoginUser().getSysUser().getUserId(), FinanceLog.STATUS_THREE);
             }
 
         }
@@ -744,6 +750,10 @@ public class OwnMessageController extends BaseController {
                 String title = "【融资签收】您提交于"+openName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"", null, null);
 
+                /**融信操作日志*/
+                financeLog.addFinanceLog(zfiId, "融信确权【通过】，融信提交于《"+receiverName+"》签收", null, FinanceLog.STATUS_TWO);
+                financeLog.addFinanceLog(zfiId, "《"+receiverName+"》待签收", null, FinanceLog.STATUS_TWO);
+
             }else if("02".equals(companyType)){
                 //融资企业
                 //修改融信状态
@@ -763,7 +773,7 @@ public class OwnMessageController extends BaseController {
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"", null, null);
 
                 /**融信操作日志*/
-                financeLog.addFinanceLog(zfiId, "融信签收【已签收】，融信生效", null, FinanceLog.STATUS_ZERO);
+                financeLog.addFinanceLog(zfiId, "融信签收【已签收】，融信生效", tokenService.getLoginUser().getSysUser().getUserId(), FinanceLog.STATUS_THREE);
             }
 
         }
@@ -790,6 +800,9 @@ public class OwnMessageController extends BaseController {
                 //给融资企业经办人生成一条生效消息
                 String  titleName = "【融信生效】您提交于"+openName+"的融信【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")承诺还款日期:"+expireDateA+"融信已生效";
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,titleName,"01","04","","0",supplierHandler,"", null, null);
+
+                /**融信操作日志*/
+                financeLog.addFinanceLog(zfiId, "经办人盖章后生成：融信确权【通过】，融信生效", null, FinanceLog.STATUS_TWO);
             }else if("02".equals(companyType)){
                 //融资企业
                 //修改融信状态