供应商开立流程日志修改及查询当前融信的流程进程

sc-service/src/main/java/com/huyi/service/common/financeLog/FinanceLog.java

@@ -29,7 +29,7 @@ public class FinanceLog {
      * @param node      操作后的所属节点
      *                  融资企业申请------- 0:融信申请,1:平台审批,2:融信确权,3:签收生效
      *                  核心企业开立------- 0:融信开立,1:补全资料,2:平台审核,3:签收生效
-     *                  融资企业开立------- 0:融信开立,1:平台审核,2:确权生效
+     *                  融资企业开立------- 0:平台审核,1:合同签署,2:确权生效
      */
     public void addFinanceLog(String financeId, String content, Long userId, String node){
         ZcFinanceLog financeLog = new ZcFinanceLog();

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

@@ -225,6 +225,8 @@ public class  FlowableController extends BaseController
             for (Object key : beanMap.keySet()) {
                 map.put(key + "", beanMap.get(key));
             }
+            /**融信操作日志*/
+            financeLog.addFinanceLog(zfiId, "融资申请提交【完成】，融信资料提交平台审核", null, FinanceLog.STATUS_ONE);
             approvalService.addPlatformApproval(map);
         }//融资企业融信开立审批通过
         else if("1000000001".equals(menuId)){
@@ -295,8 +297,8 @@ public class  FlowableController extends BaseController
                 //融资企业名称
                 SysCompany coreCompany = sysCompanyService.getById(inf.getZfiCoreId());
                 String coreCompanyName = coreCompany.getScyName();
-                financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);
-                financeLog.addFinanceLog(zfiId, "融信确权生效【审批中】融信资料提交于《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);
+          /*      financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(zfiId, "融信确权生效【审批中】融信资料提交于《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);*/
             }
             //TODO 发起人最终结果【通过】消息通知
             //查询发起人,融资企业Id
@@ -526,7 +528,7 @@ public class  FlowableController extends BaseController
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", "01", "/credit/creditSeal/"+zfiId);
                 /**融信操作日志*/
-                financeLog.addFinanceLog(id, "平台资料审核【通过】", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(id, "平台审核融信资料【通过】，请签署融信业务合同", null, FinanceLog.STATUS_ONE);
                 //financeLog.addFinanceLog(id, "融信确权生效【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
             }
             //更新融信表状态
@@ -915,7 +917,7 @@ public class  FlowableController extends BaseController
             } 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);
+                financeLog.addFinanceLog(zfiId, "平台审核融信资料【退回】，请编辑后，再次提交", null, FinanceLog.STATUS_ZERO);
             }
 
         }//融资企业签收审批拒绝

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

@@ -553,8 +553,6 @@ public class ApprovalServiceImpl implements ApprovalService {
         }
         //未开启流程实例
         else if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
-            /**融信操作日志*/
-            financeLog.addFinanceLog(zfiId, "补充资料【完成】，提交于平台审核", null, FinanceLog.STATUS_ONE);
 
             //修改融资方审批状态为通过
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
@@ -578,6 +576,8 @@ public class ApprovalServiceImpl implements ApprovalService {
                         maps.put(key + "", beanMap.get(key));
                     }
                 }
+                /**融信操作日志*/
+                financeLog.addFinanceLog(zfiId, "补充资料【完成】，提交于平台审核", null, FinanceLog.STATUS_ONE);
                 //调用平台审批
                 approvalService.addPlatformApproval(maps);
             }else {
@@ -712,8 +712,6 @@ public class ApprovalServiceImpl implements ApprovalService {
 
         //未开启流程实例
         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();
             //融信编号
@@ -739,6 +737,8 @@ public class ApprovalServiceImpl implements ApprovalService {
                         maps.put(key + "", beanMap.get(key));
                     }
                 }
+                /**融信操作日志*/
+                financeLog.addFinanceLog(String.valueOf(flowParam.get("businessKey")), "平台审核融信资料【审核中】", null, FinanceLog.STATUS_ZERO);
                 //调用平台审批
                 approvalService.addPlatformApproval(maps);
             }else {
@@ -759,8 +759,8 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //融资企业名称
                 SysCompany coreCompany = iSysCompanyService.getById(inf.getZfiCoreId());
                 String coreCompanyName = coreCompany.getScyName();
-                financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);
-                financeLog.addFinanceLog(zfiId, "融信确权生效【审批中】融信资料提交于《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);
+               /* financeLog.addFinanceLog(zfiId, "平台资料审核【通过】，融信资料提交《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(zfiId, "融信确权生效【审批中】融信资料提交于《"+coreCompanyName+"》确权", null, FinanceLog.STATUS_ONE);*/
             }
 //            //调用平台审批
 //            approvalService.addPlatformApproval(map);

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

@@ -1,17 +1,9 @@
 package com.huyi.service.credit.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.huyi.service.base.entity.SysCompany;
-import com.huyi.service.base.entity.ZcFinanceInf;
-import com.huyi.service.base.service.ISysCompanyService;
-import com.huyi.service.base.service.IZcFinanceInfService;
 import com.huyi.service.util.FlowableService;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
-import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.web.controller.BaseController;
-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;
@@ -75,6 +67,27 @@ public class ApprovalRelatedCreditController extends BaseController {
     }
 
 
+    /**
+     * 查询当前流程进度
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/approvalProcess")
+    public R approvalProcess(@RequestBody Map<String,Object> map ) throws Exception {
+        //获取融信编号
+        String zfiId = CommonUtil.objToString(map.get("zfiId"));
+        Map<String,Object> m = new HashMap<>();
+        m.put("businessKey",zfiId);
+        Map<String,Object> mmp = flowableService.selectCurrentProcess(m);
+        //不等于200
+        if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
+            throw  new Exception("查询审批流程失败");
+        }
+        List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
+        return R.ok(list);
+    }
+
 
 
 

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

@@ -247,7 +247,7 @@ 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);
+                financeLog.addFinanceLog(zfiId, "确权【拒绝】，融信失效，业务结束", null, FinanceLog.STATUS_TWO);
             }
         }else if("00".equals(flag)){
             //调确权审批
@@ -652,6 +652,15 @@ public class CreditHandleController extends BaseController {
         //已办
         notice.setStatus("1");
         sysNoticeService.update(notice,noticeLambdaQueryWrapper);
+
+        ZcFinanceInf  inf =  financeInfService.getById(zfiId);
+        if(inf == null){
+            throw new Exception("获取融信信息失败");
+        }
+        //供应商开立
+        if("2".equals(inf.getZfiCreateType())){
+            financeLog.addFinanceLog(zfiId, "合同签署【作废】，业务结束", null, FinanceLog.STATUS_ONE);
+        }
         return AjaxResult.success();
     }
 

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

@@ -899,7 +899,7 @@ public class OwnMessageController extends BaseController {
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,titleName,"01","04","","0",supplierHandler,"", null, null);
 
                 /**融信操作日志*/
-                financeLog.addFinanceLog(zfiId, "融信确权【通过】，融信生效", null, FinanceLog.STATUS_TWO);
+                financeLog.addFinanceLog(zfiId, "确权【完成】,融信生效", null, FinanceLog.STATUS_TWO);
                 //融信生效之后，将对应的收付账状态改为已质押
                 //查询该融信对应的应收付账款
                 LambdaQueryWrapper<ZcFinanceBillRel> financeBillRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -967,7 +967,7 @@ public class OwnMessageController extends BaseController {
                 finance.setUpdateBy(userId);
                 financeInfService.updateById(finance);
                 //增加流程
-                financeLog.addFinanceLog(zfiId, "融信确权生效【审批中】融信资料提交于《"+openName+"》确权", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(zfiId, "合同签署【完成】,融信资料提交于《"+openName+"》确权,确权生效【确权中】", null, FinanceLog.STATUS_TWO);
             }
 
         }

sc-service/src/main/java/com/huyi/service/util/FlowableService.java

@@ -32,6 +32,8 @@ public class FlowableService {
 	public final static String DELETE_GROUP = "api/deleteGroup";
 	//查询是否配置审批流程
 	public final static String SELECT_APPROVAL = "cloudSupplyChain/selectApproval";
+	//查询当前审批进程
+	public final static String SELECT_CURRENT_PROCESS = "cloudSupplyChain/selectCurrentProcess";
 	//查询是否配置审批流程
 	public final static String FLOWABLE_URL = "flowable_url";
 	@Autowired
@@ -161,4 +163,17 @@ public class FlowableService {
 		return apiPost(SELECT_APPROVAL,map);
 	}
 
+
+	/**
+	 * 查询当前审批进程
+	 * @param map
+	 * @return
+	 */
+	public Map<String, Object> selectCurrentProcess(Map<String,Object> map) {
+		return apiPost(SELECT_CURRENT_PROCESS,map);
+	}
+
+
+
+
 }