更新

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

@@ -3,9 +3,6 @@ package com.yeejoin.amos.boot.module.jg.api.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 使用登记状态西悉尼
  */

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

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 使用登记状态西悉尼
+ */
+@Getter
+@AllArgsConstructor
+public enum WorkFlowStatusEnum {
+
+    /**
+     * 使用登记流程
+     */
+    USE_SUBMIT("使用单位提交", "useSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    USE_RECEIVE("一级受理", "useReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    USE_PRELIMINARY("二级受理", "usePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    USE_REEXAMINE("三级受理", "useReexamine", "三级待受理","",""),
+
+
+    /**
+     * 维保流程
+     */
+    MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位撤回"),
+    MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位撤回"),
+    MAIN_PRELIMINARY("监管单位审核", "mainPreliminary", "监管单位待受理", "", "");
+
+
+
+    private final String name;
+
+    private final String code;
+
+    private final String pass;
+
+    private final String reject;
+
+    private final String rollBack;
+
+
+
+    public static WorkFlowStatusEnum getMessage(String code){
+        for (WorkFlowStatusEnum constants : values()) {
+            if (constants.getCode().equals(code)) {
+                return constants;
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeignService.java

@@ -2,15 +2,10 @@ package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
-import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 

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

@@ -14,7 +14,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
@@ -38,7 +39,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.ArrayList;
@@ -71,7 +71,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     RedisUtils redisUtils;
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
-    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page ,List<String> roleIds) {
+
+    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
     }
@@ -105,17 +106,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
         jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
-        if (map.containsKey("receiveCompanyCode")){
+        if (map.containsKey("receiveCompanyCode")) {
             jgUseRegistration.setReceiveCompanyCode(String.valueOf(map.getString("receiveCompanyCode")));
-        }else {
+        } else {
             jgUseRegistration.setReceiveCompanyCode("610000");
         }
         // 使用单位提交
         jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-        if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))){
+        if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
             jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
         }
-        if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))){
+        if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
             jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
         }
 
@@ -132,7 +133,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
             jgUseRegistration.setApplyNo(applicationFormCode.get(0));
             jgUseRegistration.setAuditStatus("待提交");
-            jgUseRegistration.setStatus(UseStatusEnum.SUBMIT.getPass());
+            jgUseRegistration.setStatus(WorkFlowStatusEnum.USE_SUBMIT.getPass());
             this.save(jgUseRegistration);
             jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
             jgRelationEquipMapper.insert(jgRelationEquip);
@@ -217,19 +218,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 //        return role;
 //    }
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate){
+    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 = "流程结束";
+        String taskCode = "已完成";
         ArrayList<String> roleList = new ArrayList<>();
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
         try {
             // 查询下节点任务
+
             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");
+                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
+                JSONObject result = nodeInfo.getResult();
+                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
+                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
                 AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
@@ -241,8 +246,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!"流程结束".equals(taskName)){
-            role= String.join(",", roleList);
+        if (!"已完成".equals(taskCode)) {
+            role = String.join(",", roleList);
             jgUseRegistration.setNextExecuteIds(role);
             jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
             jgUseRegistration.setInstanceId(instanceId);
@@ -251,23 +256,27 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             } else {
                 jgUseRegistration.setInstanceStatus(role);
             }
-            if ("0".equals(operate)){
+            if ("0".equals(operate)) {
                 // 通过操作
-                jgUseRegistration.setStatus(UseStatusEnum.getMessage(taskName).getPass());
-            }else {
+                jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
+            } else {
                 // 驳回操作
-                jgUseRegistration.setStatus(UseStatusEnum.getMessage(taskName).getReject());
+                jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgUseRegistration.setPromoter(null);
             }
 
-        }else {
-            jgUseRegistration.setStatus(taskName);
+        } else {
+            jgUseRegistration.setStatus(taskCode);
+            if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
+                // 生成使用登记证编号
+                jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
+            }
         }
         this.getBaseMapper().updateById(jgUseRegistration);
 
     }
 
-    public void flowExecute(Long id,String instanceId, String operate, String comment) {
+    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")));
@@ -345,7 +354,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         if (!ObjectUtils.isEmpty(taskName)) {
 
-            jgUseRegistration.setStatus(UseStatusEnum.getMessage(taskName).getRollBack());
+            jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskName).getRollBack());
         }
         String join = String.join(",", roleList);
         jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
@@ -378,6 +387,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     /**
      * 参数为监管码
+     *
      * @param supervisoryCode
      * @return
      */