更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/UseStatusEnum.java

@@ -13,11 +13,10 @@ import java.util.Map;
 @AllArgsConstructor
 public enum UseStatusEnum {
 
-    SUBMIT("使用单位提交", "submit", "使用单位待提交"),
-    RECEIVE("一级受理", "receive", "一级待受理"),
-    PRELIMINARY("二级受理", "preliminary", "二级待受理"),
-    REEXAMINE("三级受理", "reexamine", "三级待受理");
-
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    RECEIVE("一级受理", "receive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    PRELIMINARY("二级受理", "preliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    REEXAMINE("三级受理", "reexamine", "三级待受理","","");
 
 
     private final String name;
@@ -26,6 +25,10 @@ public enum UseStatusEnum {
 
     private final String pass;
 
+    private final String reject;
+
+    private final String rollBack;
+
 
 
     public static UseStatusEnum getMessage(String name){

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -47,7 +47,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/flowExecute")
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
-        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
         return ResponseHelper.buildResponse("ok");
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -83,6 +83,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     @Transactional
     public void save(JSONObject map) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         UseInfo useInfo = new UseInfo();
         BeanUtil.copyProperties(map, useInfo);
         LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
@@ -104,7 +105,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
         jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
-        jgUseRegistration.setUseUnitCreditCode("91610131628001738N");
+        if (map.containsKey("receiveCompanyCode")){
+            jgUseRegistration.setReceiveCompanyCode(String.valueOf(map.getString("receiveCompanyCode")));
+        }else {
+            jgUseRegistration.setReceiveCompanyCode("610000");
+        }
+        // 使用单位提交
+        jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))){
             jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
         }
@@ -122,7 +129,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 业务管理设备信息保存
             JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
             jgRelationEquip.setEquId(map.get("equipId").toString());
-//            jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
             List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
             jgUseRegistration.setApplyNo(applicationFormCode.get(0));
             jgUseRegistration.setAuditStatus("待提交");
@@ -139,19 +145,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             } else {
                 // 启动并执行流程
                 instanceId = startByVariable();
-                jgUseRegistration.setInstanceStatus("1460532889249755137");
-                jgUseRegistration.setReceiveCompanyCode("610000");
+//                jgUseRegistration.setInstanceStatus("1460532889249755137");
+//                jgUseRegistration.setReceiveCompanyCode("610000");
+                updateExecuteIds(instanceId, jgUseRegistration.getSequenceNbr(), "0");
             }
 
             if (!ObjectUtils.isEmpty(instanceId)) {
                 // 执行流程
-                String status = flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", true);
-                jgUseRegistration.setAuditStatus("已提交");
-                jgUseRegistration.setStatus(UseStatusEnum.RECEIVE.getPass());
+                flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "");
+                // 更新数据信息
+                updateExecuteIds(instanceId, jgUseRegistration.getSequenceNbr(), "0");
             }
-            jgUseRegistration.setInstanceId(instanceId);
-
-            this.getBaseMapper().updateById(jgUseRegistration);
         }
     }
 
@@ -170,24 +174,56 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return instanceId;
     }
 
-    public String flowExecute(Long id,String instanceId, String operate, String comment, Boolean update) {
+//    public String flowExecute(Long id,String instanceId, String operate, String comment, Boolean update) {
+//        String role = "";
+//        String taskName = "流程结束";
+//        ArrayList<String> roleList = new ArrayList<>();
+//        try {
+//            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
+//            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
+//            String taskId = taskMessage.getString("id");
+//            //组装信息
+//            TaskResultDTO dto = new TaskResultDTO();
+//            dto.setResultCode("approvalStatus");
+//            dto.setTaskId(taskId);
+//            dto.setComment(comment);
+//            HashMap<String, Object> map = new HashMap<>();
+//            map.put("approvalStatus", operate);
+//            dto.setVariable(map);
+//            //执行流程
+//            Workflow.taskClient.completeByTask(taskId, dto);
+//            // 查询下节点任务
+//            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+//            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+//                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+//                String nextTaskId = nextTask.getString("id");
+//                taskName = nextTask.getString("name");
+//                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+//                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+//                for (Object datum : data) {
+//                    if (((Map) datum).containsKey("groupId")) {
+//                        roleList.add(((Map) datum).get("groupId").toString());
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        role= String.join(",", roleList);
+//        if (update) {
+//            Boolean rollBack = "1".equals(operate) ? true : false;
+//            updateStatus(id,instanceId, taskName, role, rollBack);
+//        }
+//        return role;
+//    }
+
+    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate){
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = "";
         String taskName = "流程结束";
         ArrayList<String> roleList = new ArrayList<>();
+        JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
         try {
-            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
-            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
-            String taskId = taskMessage.getString("id");
-            //组装信息
-            TaskResultDTO dto = new TaskResultDTO();
-            dto.setResultCode("approvalStatus");
-            dto.setTaskId(taskId);
-            dto.setComment(comment);
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("approvalStatus", operate);
-            dto.setVariable(map);
-            //执行流程
-            Workflow.taskClient.completeByTask(taskId, dto);
             // 查询下节点任务
             JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
             if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
@@ -205,42 +241,85 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             e.printStackTrace();
         }
+        if (!"流程结束".equals(taskName)){
             role= String.join(",", roleList);
-        if (update) {
-            Boolean rollBack = "1".equals(operate) ? true : false;
-            updateStatus(id,instanceId, taskName, role, rollBack);
-        }
-        return role;
-    }
-
-    public void updateStatus(Long id , String instanceId, String taskName, String role, Boolean rollBack) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
-        lambda.eq(JgUseRegistration::getSequenceNbr, id);
-        JgUseRegistration jgUseRegistration = this.getBaseMapper().selectOne(lambda);
-        if ("流程结束".equals(taskName)) {
-            jgUseRegistration.setStatus(taskName);
-            jgUseRegistration.setAuditStatus("已完成");
-        } else {
             jgUseRegistration.setNextExecuteIds(role);
             jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
+            jgUseRegistration.setInstanceId(instanceId);
             if (!ObjectUtils.isEmpty(jgUseRegistration.getInstanceStatus())) {
                 jgUseRegistration.setInstanceStatus(jgUseRegistration.getInstanceStatus() + "," + role);
             } else {
                 jgUseRegistration.setInstanceStatus(role);
             }
-            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
-            jgUseRegistration.setStatus(message.getPass());
+            if ("0".equals(operate)){
+                // 通过操作
+                jgUseRegistration.setStatus(UseStatusEnum.getMessage(taskName).getPass());
+            }else {
+                // 驳回操作
+                jgUseRegistration.setStatus(UseStatusEnum.getMessage(taskName).getReject());
+                jgUseRegistration.setPromoter(null);
             }
-        if (rollBack){
-            this.getBaseMapper().update(jgUseRegistration, lambda);
-            this.getBaseMapper().updatePromoter(jgUseRegistration.getSequenceNbr());
+
         }else {
-            this.getBaseMapper().update(jgUseRegistration, lambda);
+            jgUseRegistration.setStatus(taskName);
+        }
+        this.getBaseMapper().updateById(jgUseRegistration);
+
+    }
+
+    public void flowExecute(Long id,String instanceId, String operate, String comment) {
+        try {
+            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
+            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
+            String taskId = taskMessage.getString("id");
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(taskId);
+            dto.setComment(comment);
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", operate);
+            dto.setVariable(map);
+            //执行流程
+            Workflow.taskClient.completeByTask(taskId, dto);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+        // 更新下一步执行人
+        updateExecuteIds(instanceId, id, operate);
+
     }
 
+
+//    public void updateStatus(Long id , String instanceId, String taskName, String role, Boolean rollBack) {
+//        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+//        LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
+//        lambda.eq(JgUseRegistration::getSequenceNbr, id);
+//        JgUseRegistration jgUseRegistration = this.getBaseMapper().selectOne(lambda);
+//        if ("流程结束".equals(taskName)) {
+//            jgUseRegistration.setStatus(taskName);
+//            jgUseRegistration.setAuditStatus("已完成");
+//        } else {
+//            jgUseRegistration.setNextExecuteIds(role);
+//            jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
+//            if (!ObjectUtils.isEmpty(jgUseRegistration.getInstanceStatus())) {
+//                jgUseRegistration.setInstanceStatus(jgUseRegistration.getInstanceStatus() + "," + role);
+//            } else {
+//                jgUseRegistration.setInstanceStatus(role);
+//            }
+//            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
+//            jgUseRegistration.setStatus(message.getPass());
+//        }
+//        if (rollBack){
+//            this.getBaseMapper().update(jgUseRegistration, lambda);
+//            this.getBaseMapper().updatePromoter(jgUseRegistration.getSequenceNbr());
+//        }else {
+//            this.getBaseMapper().update(jgUseRegistration, lambda);
+//        }
+//    }
+
     public void withdraw(String instanceId) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String taskName = "";
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
         LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
@@ -256,8 +335,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
-                    if (((Map) datum).containsKey("groupId")) {
-                        roleList.add(((Map) datum).get("groupId").toString());
+                    if (((Map<?, ?>) datum).containsKey("groupId")) {
+                        roleList.add(((Map<?, ?>) datum).get("groupId").toString());
                     }
                 }
             }
@@ -265,13 +344,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             e.printStackTrace();
         }
         if (!ObjectUtils.isEmpty(taskName)) {
-            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
-            jgUseRegistration.setStatus(message.getPass());
-        }
 
+            jgUseRegistration.setStatus(UseStatusEnum.getMessage(taskName).getRollBack());
+        }
         String join = String.join(",", roleList);
-        JgUseRegistration jgUseRegistration1 = this.getBaseMapper().selectOne(lambda);
-        this.updateStatus(jgUseRegistration1.getSequenceNbr(), instanceId, taskName, join, true);
+        jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
+        jgUseRegistration.setNextExecuteIds(join);
+        this.update(jgUseRegistration, lambda);
     }
 
     public void deleteBatch(List<Long> ids) {