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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -25,6 +25,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getUseDetail(@Param("id")String id);
 
+    Map<String, Object> getDesDetail(@Param("id")String id);
+
     Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
 
     void updatePromoter(@Param("id")Long id);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -147,5 +147,19 @@
             </if>
         </where>
     </select>
+    <select id="getDesDetail" resultType="java.util.Map">
+        select DESIGN_UNIT_CREDIT_CODE as designUnitCreditCode,
+               DESIGN_UNIT_NAME        as designUnitName,
+               DESIGN_LICENSE_NUM      as designLicenseNum,
+               DESIGN_USE_DATE         as designUseDate,
+               DESIGN_DATE             as designDate,
+               DRAWING_DO              as drawingDo,
+               APPRAISAL_UNIT          as appraisalUnit,
+               APPRAISAL_DATE          as appraisalDate,
+               DESIGN_DOC              as designDoc,
+               DESIGN_STANDARD         as designStandard
+        from idx_biz_jg_design_info
+        where RECORD = #{id}
+    </select>
 
 </mapper>

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

@@ -38,7 +38,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
         jgUseRegistrationServiceImpl.save(map);
         return ResponseHelper.buildResponse("ok");
@@ -72,7 +72,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/deleteMessage")
-    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    @ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
     public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
         ArrayList<Long> ids = new ArrayList<>();
         ids.add(id);

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

@@ -688,7 +688,7 @@ public class CommonServiceImpl implements ICommonService {
                 model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
                 model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName());
                 model.setStartUserId(RequestContext.getExeUserId());
-                model.setStartUser(reginParams.getUserModel().getUserName());
+                model.setStartUser(reginParams.getUserModel().getRealName());
                 model.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
                 model.setStartDate(new Date());
                 model.setExecuteUserIds(RequestContext.getExeUserId());

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

@@ -276,6 +276,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
     public JgChangeRegistrationNameDto updateInfo(String submitType, JgChangeRegistrationNameDto jgChangeRegistrationNameDto, String op) {
         if (Objects.isNull(jgChangeRegistrationNameDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");

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

@@ -694,6 +694,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     taskModelDto.setRelationId(instanceId);
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgChangeRegistrationTransfer, taskMessageDto);
+                    taskModelDto.setPageType(this.getPageTypeByCurrentNode(jgChangeRegistrationTransfer.getAuditStatus()));
                     taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }

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

@@ -88,23 +88,28 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdate(JSONObject map, ReginParams reginParams) {
         JgEnableDisable jgEnableDisable = new JgEnableDisable();
-        if(!"null".equals(String.valueOf(map.get("sequenceNbr")))){
+        if (!"null".equals(String.valueOf(map.get("sequenceNbr")))) {
             jgEnableDisable = this.baseMapper.selectById(String.valueOf(map.get("sequenceNbr")));
+        } else {
+            // 获取申请编号
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+            jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
         }
         jgEnableDisable.setCreateDate(new Date());
         String submit = String.valueOf(map.get("submit"));
         String pageType = String.valueOf(map.get("formType"));
         String record = String.valueOf(map.get("record"));
-        String businessCode = String.valueOf(map.get("businessCode"));
+        String businessCode = ObjectUtils.isEmpty(map.get("applyType"))?String.valueOf(map.get("businessCode")):String.valueOf(map.get("applyType"));
         // 接收机构
         String[] receiveOrgCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
         List<WorkflowResultDto> workflowResultList = new ArrayList<>();
 
-        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+        List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
 
         String instanceId = "";
-        if (map.containsKey("instanceId")) {
+        if (SUBMIT_TYPE_FLOW.equals(submit)) {
+            if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))){
                 // 只调用执行API，返回下个节点信息，用于填充业务字段
                 //组装信息
                 TaskResultDTO dto = new TaskResultDTO();
@@ -114,18 +119,19 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 if (FlowStatusEnum.REJECTED.getName().equals(jgEnableDisable.getAuditStatus()) || FlowStatusEnum.ROLLBACK.getName().equals(jgEnableDisable.getAuditStatus())) {
                     commMap.put("approvalStatus", "提交");
                     //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(jgEnableDisable.getUseUnitCreditCode());
+                    dto.setNextExecuteUserCompanyCode(jgEnableDisable.getReceiveCompanyCode());
                 } else {
                     commMap.put("approvalStatus", submit);
                     //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(jgEnableDisable.getReceiveCompanyCode());
+                    dto.setNextExecuteUserCompanyCode(jgEnableDisable.getUseUnitCreditCode());
                 }
 
                 dto.setVariable(commMap);
-            processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+                processTaskDTOS.add(processTaskDTO);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-
+                workflowResultList.add(workflowResultDto);
                 if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
                     jgEnableDisable.setExecuteSequence(jgEnableDisable.getExecuteSequence() + "," + workflowResultDto.getNextExecutorRoleIds());
                 } else {
@@ -148,9 +154,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 map1.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map1);
                 if (ObjectUtils.isEmpty(taskV2Model)) {
-                // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(jgEnableDisable), businessCode, Collections.singletonList(workflowResultDto),Boolean.TRUE);
-            } else {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     // 创建新的代办
@@ -166,24 +169,16 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             } else {
-            // 获取申请编号
-            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
-            jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
                 // 启动工作流并返回信息
                 workflowResultList = workFlowInfo(submit, record,receiveOrgCode[0]);
                 //业务数据组装等
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
-
-
+        }
         // 仅保存
+        this.saveOrUpdate(jgEnableDisable);
         if ("add".equals(pageType)) {
-            this.save(jgEnableDisable);
             buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.FALSE);
-            if(!SUBMIT_TYPE_FLOW.equals(submit)){
-                // 暂存任务
-                buildTaskDraft(jgEnableDisable);
-            }
         } else {
             // 编辑
             jgEnableDisable.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -192,12 +187,18 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, String.valueOf(map.get("sequenceNbr")));
             jgEnableDisableEqService.getBaseMapper().delete(lambda);
         }
+        if(!SUBMIT_TYPE_FLOW.equals(submit)){
+            // 暂存任务
+            buildTaskDraft(jgEnableDisable);
+        } else {
+            buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.TRUE);
+        }
         if(!"null".equals(record)){
             // 关联设备表
             JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
             jgEnableDisableEq.setEquId(record);
             jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
-            jgEnableDisableEqService.save(jgEnableDisableEq);
+            jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
         }
 
     }
@@ -497,6 +498,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgEnableDisable));
         jsonObject.put("nextExecuteUser", jgEnableDisable.getNextExecutorIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
+        jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+        jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
         commonService.rollbackTask(jgEnableDisable.getInstanceId(), jsonObject);
     }
 

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

@@ -214,6 +214,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      * @param noticeDto 安装告知
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
+    @Transactional
     public JgInstallationNoticeDto updateInstallationNotice(String submitType, JgInstallationNoticeDto noticeDto, String op) {
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
@@ -729,6 +730,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
 
+    @Transactional
     public void cancel(JgInstallationNoticeDto noticeDto) {
         JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());

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

@@ -243,6 +243,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @param noticeDto 移装告知
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
+    @Transactional
     public JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
@@ -623,6 +624,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
 
+    @Transactional
     public void cancel(JgTransferNoticeDto noticeDto) {
         JgTransferNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());

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

@@ -462,6 +462,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
         jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
+        jsonObject.put("flowStatus",  commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
+        jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
         if (!WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)) {
             jsonObject.put("pageType", "look");
         }
@@ -495,17 +497,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         Map<String, Object> detail = this.baseMapper.getDetail(id);
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
+        Map<String, Object> useDestail = this.baseMapper.getDesDetail(id);
         if (!ObjectUtils.isEmpty(inspectDetail)) {
             detail.putAll(inspectDetail);
         }
         if (!ObjectUtils.isEmpty(useDetail)) {
             detail.putAll(useDetail);
         }
+        if (!ObjectUtils.isEmpty(useDestail)) {
+            detail.putAll(useDestail);
+        }
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
         detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
         return detail;
     }
 

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

@@ -135,19 +135,19 @@
     "type": "109",
     "pageType": "draft",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit&isEdit=true"
   },
   {
     "type": "109",
     "pageType": "look",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look&isEdit=false"
   },
   {
     "type": "109",
     "pageType": "edit",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit&isEdit=true"
   },
   {
     "type": "110",