Merge branch 'develop_tzs_register' of…

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

@@ -256,7 +256,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             dto.setChangeCertificate(null);
             taskModelDto.setModel(dto);
             //摘要 按原有规则组装
-            taskModelDto.setTaskContent("来自"+dto.getUseUnitCreditCode()+"【"+dto.getReceiveOrgName()+"】的业务办理,【申请单号:"+dto.getApplyNo()+"】");
+            taskModelDto.setTaskContent(buildTaskContent(dto) + "待提交");
             //申请单号
             taskModelDto.setTaskCode(dto.getApplyNo());
             //业务类型枚举code值

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

@@ -179,7 +179,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         // 仅保存
         if ("add".equals(pageType)) {
             this.save(jgEnableDisable);
-            buildTask(Arrays.asList(jgEnableDisable),businessCode, workflowResultList,Boolean.FALSE);
+            buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.FALSE);
             if(!SUBMIT_TYPE_FLOW.equals(submit)){
                 // 暂存任务
                 buildTaskDraft(jgEnableDisable);
@@ -215,11 +215,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEnableDisable.getEquList(), jgEnableDisable.getSequenceNbr(), jgEnableDisable.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEnableDisable.getEquList(), jgEnableDisable.getSupervisoryCode(), jgEnableDisable.getApplyNo()));
             //申请单号
             dto.setTaskCode(jgEnableDisable.getApplyNo());
             //业务类型枚举code值
-            dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
+            dto.setTaskType(BusinessTypeEnum.JG_EQUIPMENT_START.getCode());
             ////业务主键
             dto.setRelationId(jgEnableDisable.getSequenceNbr() + "");
             modelDtos.add(dto);
@@ -242,22 +242,21 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setApplyType(map.getString("applyType"));
         jgEnableDisable.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-        jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-        jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
-            jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
-            jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-            jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
-        }
-        jgEnableDisable.setEquList(map.get("equListDesc").toString());
-        jgEnableDisable.setSupervisoryCode(map.get("supervisoryCode").toString());
-        if (!CollectionUtils.isEmpty(workflowResultList)) {
-            jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+            if (!CollectionUtils.isEmpty(workflowResultList)) {
+                jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
+                jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
+                jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+                jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
+                jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
+                jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
+                jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
+            }
         } else {
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
+        jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
+        jgEnableDisable.setSupervisoryCode(String.valueOf(map.get("supervisoryCode")));
         jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
         jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
     }
@@ -270,16 +269,17 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         String  taskType = businessCode.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode())?BusinessTypeEnum.JG_EQUIPMENT_START.getCode():BusinessTypeEnum.JG_EQUIPMENT_STOP.getCode();
         String  taskTypeLabel = businessCode.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode())?BusinessTypeEnum.JG_EQUIPMENT_START.getName():BusinessTypeEnum.JG_EQUIPMENT_STOP.getName();
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
-        WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(item.getCreateDate());
-            taskModelDto.setTaskName(workflowResultDto.getNextTaskName()); // 工作流API返回
+            if(workflowResultList.size()>0){
+                taskModelDto.setTaskName(workflowResultList.get(0).getNextTaskName()); // 工作流API返回
+                taskModelDto.setExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds()); // 工作流API返回
+            }
             taskModelDto.setTaskCode(item.getApplyNo());
             taskModelDto.setTaskType(taskType);
             taskModelDto.setTaskTypeLabel(taskTypeLabel);
             taskModelDto.setRelationId(item.getInstanceId());
-            taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
             taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
@@ -299,7 +299,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 commonService.deleteTaskModel(item.getSequenceNbr()+"");
             }
         });
-        commonService.buildTaskModel(taskModelDtoList);
+        if(bool){
+            commonService.buildTaskModel(taskModelDtoList);
+        }
     }
 
 
@@ -560,17 +562,19 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     public Map<String, Object> getDetail(Long sequenceNbr) {
         Map<String,Object> resultMap = this.baseMapper.getDetail(sequenceNbr);
         JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
-        Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
-        map.put("equListDesc",map.get("equList"));
-        map.put("equCategoryDesc",map.get("equCategory"));
-        map.put("equDefineDesc",map.get("equDefine"));
-        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
-                "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
-        for (String s : fields) {
-            if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
-                map.put(s, JSON.parseArray(map.get(s).toString()));
+        if(!ObjectUtils.isEmpty(jgEnableDisableEq)){
+            Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgEnableDisableEq.getEquId());
+            map.put("equListDesc",map.get("equList"));
+            map.put("equCategoryDesc",map.get("equCategory"));
+            map.put("equDefineDesc",map.get("equDefine"));
+            String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
+                    "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
+            for (String s : fields) {
+                if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
+                    map.put(s, JSON.parseArray(map.get(s).toString()));
+            }
+            resultMap.putAll(map);
         }
-        resultMap.putAll(map);
         return resultMap;
 
     }

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

@@ -329,11 +329,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     public void deleteBatch(List<Long> ids) {
-        JgScrapCancel jgScrapCancel = new JgScrapCancel();
-        jgScrapCancel.setIsDelete(true);
-        LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
-        lambda.in(JgScrapCancel::getSequenceNbr, ids);
-        this.update(jgScrapCancel, lambda);
+        if (!ids.isEmpty()) {
+            for (Long id : ids) {
+                LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
+                lambda.eq(JgScrapCancel::getSequenceNbr, id);
+                JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
+                //删除代办消息
+                commonService.deleteTaskModel(jgScrapCancel.getInstanceId());
+                //更新jgScrapCancel数据
+                jgScrapCancel.setIsDelete(true);
+                this.updateById(jgScrapCancel);
+            }
+        }
     }
 
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {

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

@@ -132,6 +132,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
+        map.remove("submit");
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getEquId, equipId);
@@ -207,8 +208,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgRelationEquipMapper.insert(jgRelationEquip);
         }
         // 暂存历史表
+        Object submit = map.get("submit");
         updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
-        if (!ObjectUtils.isEmpty(map.get("submit"))) {
+        if (!ObjectUtils.isEmpty(submit)) {
             // 删除暂存代办
             commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
             String instanceId = "";

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -171,7 +171,7 @@
     "type": "111",
     "name": "改造变更登记",
     "pageType": "draft",
-    "url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "111",