融资操作记录

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
+import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.utils.CommonUtil;
@@ -53,9 +54,8 @@ public class  FlowableController extends BaseController
     private ApprovalService approvalService;
     @Autowired
     private IZcFinanceRecordService zcFinanceRecordService;
-    // 开始流程
-    public final static String STRART_FLOW = "flow/strartFlow";
-
+    @Autowired
+    private FinanceLog financeLog;
     //自动生成的合同服务类
     @Autowired
     private IZcFinanceInfService zcFinanceInfService;
@@ -435,6 +435,9 @@ 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)){
@@ -712,6 +715,9 @@ public class  FlowableController extends BaseController
             //标题
             String title = "【审批拒绝】您提交于【"+coreName +"】的融信【"+zfiNumber+"】审批被拒绝，拒绝的理由为：【审批意见】";
             remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"", null, null);
+
+            /**融信操作日志*/
+            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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
+import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.util.FlowableService;
 import com.tianhu.common.core.utils.CommonUtil;
@@ -50,9 +51,7 @@ public class ApprovalServiceImpl implements ApprovalService {
     @Autowired
     private IZcFinanceProductService zcFinanceProductService;
     @Autowired
-    private IZcFinanceSupplierQuotaService iZcFinanceSupplierQuotaService;
-    @Autowired
-    private IZcFinanceProComRelService iZcFinanceProComRelService;
+    private FinanceLog financeLog;
     @Autowired
     private TokenService tokenService;
 
@@ -243,6 +242,9 @@ public class ApprovalServiceImpl implements ApprovalService {
                 // TODO 给核心企业经办人确权待办
                 String coreTitle = "【融信确权】由【"+supplierName+"】发起的融信【融信编号:"+zfiNumber+"】【融信金额:"+zfiAmount+"元】资料待确权";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,coreTitle,"00","","02","0",coreUserId.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);
             }else if ("2".equals(zfiCreateType)){
                 //TODO 融资企业开立时， 给融资企业经办人生成盖章待办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";

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

@@ -453,6 +453,12 @@ public class CreditHandleController extends BaseController {
         String title = "【融信拒签】您提交于"+supplierName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+bigAmt+"),融信拒签，该融信已失效";
         remoteSystemService.sendNotice(zfiCoreId,zfiId,title,"01","03","","0",handler,"", null, null);
 
+        /**融信操作日志*/
+        ZcFinanceInf zcFinanceInf = financeInfService.getById(zfiId);
+        if ("0".equals(zcFinanceInf.getZfiCreateType())) {
+            financeLog.addFinanceLog(zfiId, "融信签收【拒签】，融信失效", null, FinanceLog.STATUS_THREE);
+        }
+
         return AjaxResult.success();
     }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
+import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.credit.service.OwnCreditService;
 import com.huyi.service.util.FlowableService;
@@ -76,7 +77,7 @@ public class OwnCreditController extends BaseController {
     @Autowired
     private IZcBillFileRelService billFileRelService;
     @Autowired
-    private FlowableService flowableService;
+    private FinanceLog financeLog;
     //审批服务类
     @Autowired
     private ApprovalService approvalService;
@@ -883,6 +884,9 @@ public class OwnCreditController extends BaseController {
             //供应商申请
             //调用融资申请审批流
             approvalService.financeApplyApproval(CommonUtil.entityToMap(inf));
+            // 日志名称
+            String logContent = "融信申请提交【完成】";
+            financeLog.addFinanceLog(inf.getZfiId(), logContent, user.getUserId(), FinanceLog.STATUS_ZERO);
         }
         return AjaxResult.success();
     }

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.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.common.cfcaCommon.ICfcaFaceAuthService;
+import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.constant.FileConstants;
 import com.huyi.service.credit.service.OwnCreditService;
 import com.huyi.service.util.DocumentConstant;
@@ -98,6 +99,9 @@ public class OwnMessageController extends BaseController {
     //消息待办服务类
     @Autowired
     private RemoteSystemService remoteSystemService;
+    //消息待办服务类
+    @Autowired
+    private FinanceLog financeLog;
 
     /**
      * 发送短信
@@ -757,6 +761,9 @@ public class OwnMessageController extends BaseController {
                 //给融资企业生成去融资待办
                 String title = "【融资待办】"+openName+"签发的融信【"+zfiNumber+"】已生效,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")";
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"", null, null);
+
+                /**融信操作日志*/
+                financeLog.addFinanceLog(zfiId, "融信签收【已签收】，融信生效", null, FinanceLog.STATUS_ZERO);
             }
 
         }