审批修改

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

@@ -440,13 +440,22 @@ public class  FlowableController extends BaseController
         }
         //融资签收通过
         else if("1000000005".equals(menuId)){
+            LambdaQueryWrapper<SysUserCompanyRel> userQueryWrapper = new LambdaQueryWrapper<>();
+            userQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+            userQueryWrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
+            List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQueryWrapper);
+            String userId= String.valueOf(userList.get(0).getSucrUserId());
+            //查询企业名称
+            SysCompany sysCompany = sysCompanyService.getById(companyId);
             LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ZcFinanceInf::getZfiId,id);
             ZcFinanceInf zcfInf = new ZcFinanceInf();
             //审批通过
-            //TODo 改审批状态
-            zcfInf.setZfiStatus("02");
+            zcfInf.setZfiSupplierStatus("01");
             zcFinanceInfService.update(zcfInf,lambdaQueryWrapper);
+            //待办标题
+            String tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的融信编号为【"+ id+"】的资料待签署";
+            remoteSystemService.sendNotice(companyId,id,tittle,"00","","03","0",userId,"");
             //TODo 给融资企业生成盖章待办
         }
         //融资审批通过
@@ -654,25 +663,34 @@ public class  FlowableController extends BaseController
             //标题
             String title = "【审批拒绝】您提交于【"+coreName +"】的融信【"+zfiNumber+"】审批被拒绝，拒绝的理由为：【审批意见】";
             remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"");
-        }//融资企业签收审批
+        }//融资企业签收审批拒绝
         else if("1000000005".equals(menuId)){
+            LambdaQueryWrapper<SysUserCompanyRel> userQueryWrapper = new LambdaQueryWrapper<>();
+            userQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+            userQueryWrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
+            List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQueryWrapper);
+            String userId= String.valueOf(userList.get(0).getSucrUserId());
+            //查询企业名称
+            SysCompany sysCompany = sysCompanyService.getById(companyId);
             LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ZcFinanceInf::getZfiId,id);
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //审批拒绝
-            //TODo 改审批状态
-            zcFinanceInf.setZfiStatus("03");
+            zcFinanceInf.setZfiSupplierStatus("02");
             zcFinanceInfService.update(zcFinanceInf,lambdaQueryWrapper);
-            //TODo 给融资企业经办人签收待办
+            //待办标题
+            String tittle = "融资企业签收由"+sysCompany.getScyName() +"发起的：融信编号为:"+ id+"的资料代签收";
+            remoteSystemService.sendNotice(companyId,id,tittle,"00",null,"03","0",userId,null);
+            //TODO 给融资企业经办人签收待办
         }//融资审批
         else if("1000000006".equals(menuId)){
-                LambdaQueryWrapper<ZcFinanceRecord> zcFinanceRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                zcFinanceRecordLambdaQueryWrapper.eq(ZcFinanceRecord::getZfrId,id);
-                ZcFinanceRecord zcFinanceRecord = new ZcFinanceRecord();
-                //审批拒绝
-                zcFinanceRecord.setZfrStatus("02");
-                zcFinanceRecord.setZfrApproveStt("02");
-                zcFinanceRecordService.update(zcFinanceRecord,zcFinanceRecordLambdaQueryWrapper);
+            LambdaQueryWrapper<ZcFinanceRecord> zcFinanceRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            zcFinanceRecordLambdaQueryWrapper.eq(ZcFinanceRecord::getZfrId,id);
+            ZcFinanceRecord zcFinanceRecord = new ZcFinanceRecord();
+            //审批拒绝
+            zcFinanceRecord.setZfrStatus("02");
+            zcFinanceRecord.setZfrApproveStt("02");
+            zcFinanceRecordService.update(zcFinanceRecord,zcFinanceRecordLambdaQueryWrapper);
             List<ZcFinanceRecord> list = zcFinanceRecordService.findZcFinanceRecords(zcFinanceRecordLambdaQueryWrapper);
             LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(ZcFinanceInf::getZfiId,list.get(0).getZfrFinanceId());

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

@@ -344,6 +344,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         String userId= String.valueOf(userList.get(0).getSucrUserId());
         //查询用户名称
         SysUser sysUser = iSysUserService.getById(userId);
+        SysCompany sysCompany = iSysCompanyService.getById(companyId);
         String userName =  sysUser.getNickName();
         //查询当前操作员
         flowParam.put("menuId", "1000000005");
@@ -363,27 +364,29 @@ public class ApprovalServiceImpl implements ApprovalService {
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
         if ("200".equals(resMap.get("code"))){
-
-            ZcFinanceInf zfi = new ZcFinanceInf();
-            zfi.setZfiId(CommonUtil.objToString(map.get("zfiId")));
-            //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
-            //TODO 不更改状态
-            zfi.setZfiStatus("00");
-            zcFinanceInfService.updateById(zfi);
+            //修改资方审批状态为审批
+            ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
+            //融信id
+            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            //资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+            zcFinanceInf.setZfiSupplierStatus("00");
+            zcFinanceInfService.updateById(zcFinanceInf);
         }
         //未开启流程实例
         if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
-            //修改平台审批状态为通过/融信状态为已签收
+            //修改资方审批状态为通过/融信状态为已签收
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //融信id
             zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
-            //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
-            zcFinanceInf.setZfiPlatformStatus("01");
-            //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
-            //TODO 不更改融信状态
-            //TODo 给融资企业经办人盖章待办
-            zcFinanceInf.setZfiStatus("02");
+            //资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+            zcFinanceInf.setZfiSupplierStatus("01");
             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);
+            //TODO 给融资企业经办人盖章待办
+        }else if ("450".equals(resMap.get("code"))) {
+            throw new Exception("未配置审批流程");
         }else if (!"200".equals(resMap.get("code"))) {
             throw new Exception(resMap.get("message").toString());
         }
@@ -441,7 +444,7 @@ public class ApprovalServiceImpl implements ApprovalService {
             zcFinanceRecordService.update(zcFinanceRecord,zcFinanceRecordLambdaQueryWrapper);
         }
         //未开启流程实例
-        if("300".equals(resMap.get("code"))){
+        if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //融信id
             zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
@@ -457,6 +460,8 @@ public class ApprovalServiceImpl implements ApprovalService {
             zcFinanceRecord.setZfrApproveStt("01");
             zcFinanceRecordService.update(zcFinanceRecord,zcFinanceRecordLambdaQueryWrapper);
             //TODO 发起人最终结果【通过】消息通知
+        }else if ("450".equals(resMap.get("code"))) {
+            throw new Exception("未配置审批流程");
         }else if (!"200".equals(resMap.get("code"))) {
             throw new Exception(resMap.get("message").toString());
         }