Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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/JgMaintainNoticeServiceImpl.java

@@ -8,14 +8,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
-import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -28,11 +30,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseUnitLicence;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
-import jdk.nashorn.api.scripting.JSObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -118,10 +118,10 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("constructionContractList", JSON.parseArray(notice.getConstructionContract()));
         maintainInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         maintainInfo.put("city", ObjectUtils.isEmpty(notice.getCity()) ? null : notice.getCity() + "_" + notice.getCityName());
-        maintainInfo.put("constructionManagerId",ObjectUtils.isEmpty(notice.getConstructionManagerId()) ? null :  notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
-        maintainInfo.put("county",ObjectUtils.isEmpty(notice.getCounty()) ? null :  notice.getCounty() + "_" + notice.getCountyName());
+        maintainInfo.put("constructionManagerId", ObjectUtils.isEmpty(notice.getConstructionManagerId()) ? null : notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
+        maintainInfo.put("county", ObjectUtils.isEmpty(notice.getCounty()) ? null : notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCounty() + notice.getStreetName() + notice.getAddress());
-        maintainInfo.put("useUnitCreditCode",ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null :   notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+        maintainInfo.put("useUnitCreditCode", ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null : notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
         maintainInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
         if (!ValidationUtil.isEmpty(notice.getInspectionUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getInspectionUnitName())) {
             maintainInfo.put("inspectUnitId", notice.getInspectionUnitCreditCode() + "_" + notice.getInspectionUnitName());
@@ -143,7 +143,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 map.put(s, JSON.parseArray(map.get(s).toString()));
         }
         maintainInfo.putAll(map);
-        return new HashMap<String, Map<String, Object>>() {{put(TABLE_PAGE_ID, maintainInfo);}};
+        return new HashMap<String, Map<String, Object>>() {{
+            put(TABLE_PAGE_ID, maintainInfo);
+        }};
     }
 
     /**
@@ -166,13 +168,13 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             // 如果没有实例ID，说明是启动并执行一步
             // 直接调用工作流 启动并执行API  -  可以拿到两个节点的信息，用于填充业务字段
             // 如果有实例ID，为撤回或者驳回后重新提交
-            if(!StringUtils.hasText(noticeDto.getInstanceId())){
+            if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 // 发起流程
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
+                dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
@@ -194,7 +196,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 notice.setInstanceId(workflowResultDto.getInstanceId());
                 jgMaintainNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto),Boolean.TRUE);
+                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
             } else {
                 // 只调用执行API，返回下个节点信息，用于填充业务字段
                 //组装信息
@@ -415,7 +417,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
         List<String> applyNoList = applyNoResult.getResult();
 
-        List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList,model.getReceiveCompanyCode());
+        List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
 
         List<JgMaintainNotice> list = new ArrayList<>();
         List<JgMaintainNoticeEq> equipList = new ArrayList<>();
@@ -441,8 +443,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
-            dto.setEquList(obj.get("EQU_LIST").toString());
-            dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
 
@@ -472,6 +474,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
     /**
      * 暂存任务生成待办
+     *
      * @param list 业务信息
      */
     private void buildTaskDraft(List<JgMaintainNotice> list) {
@@ -526,19 +529,19 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+                commonService.deleteTaskModel(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);
     }
 
 
-    private List<WorkflowResultDto> workFlowInfo(String submitType,List<Map<String, Object>> deviceList,String receiveCompanyCode) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList, String receiveCompanyCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
-            deviceList.forEach(item->{
+            deviceList.forEach(item -> {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
@@ -556,7 +559,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
 
-
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
         AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
@@ -749,7 +751,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 TaskMessageDto taskMessageDto = new TaskMessageDto();
-                BeanUtils.copyProperties(jgMaintainNotice,taskMessageDto);
+                BeanUtils.copyProperties(jgMaintainNotice, taskMessageDto);
                 taskMap.put("model", taskMessageDto);
                 commonService.updateTaskModel(taskMap);
             } else {

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/JgTransferNoticeServiceImpl.java

@@ -266,7 +266,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
+                dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
@@ -422,6 +422,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
     /**
      * 暂存任务生成待办
+     *
      * @param list 业务信息
      */
     private void buildTaskDraft(List<JgTransferNotice> list) {
@@ -465,8 +466,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
             }
-            dto.setEquList(obj.get("EQU_LIST").toString());
-            dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
+            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -516,7 +517,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDtoList.add(taskModelDto);
             if (isDeleteDraft) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+                commonService.deleteTaskModel(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -536,7 +537,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             deviceList.forEach(item -> {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
+                dto.setBusinessKey(String.valueOf(item.get("SEQUENCE_NBR")));
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(receiveOrgCode);