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/resources/mapper/JgEnableDisableMapper.xml

@@ -64,6 +64,8 @@
                concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
                       use.STREET_NAME) as fullAddress,
                jri.EQU_CODE            as equCode,
+               jed.audit_status        as auditStatus,
+               jed.apply_no            as applyNo,
                jed.apply_type          as applyType,
                jed.remark,
                use.RECORD              as record,

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

@@ -36,7 +36,7 @@
             </if>
             <if test="type != 'company'">
                 AND isn.instance_id is not null
-                AND isn.receive_org_code = #{orgCode}
+                AND isn.receive_company_code = #{orgCode}
             </if>
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}

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

@@ -64,8 +64,8 @@
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     ur.instance_status like concat('%',#{role},'%')
-                </foreach>
                     or ur.create_user_id = #{dto.createUserId}
+                </foreach>
             </if>
             <if test="dto.type == 'supervision'">
                 AND ur.receive_org_code = #{orgCode}

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

@@ -1084,6 +1084,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
+        if (jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())){
+            modelDto.setPageType("edit");
+        }
         TaskMessageDto obj = new TaskMessageDto();
         obj.setInstanceId(jgChangeRegistrationName.getInstanceId());
         obj.setStatus(jgChangeRegistrationName.getStatus());
@@ -1122,9 +1125,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             // 执行通过节点，单位code为接收机构单位信息
             return jgChangeRegistrationName.getReceiveOrgCode();
         }
-        if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass())
-                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getReject())
-                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getRollBack())){
+        if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass())
+                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())
+                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack())){
             // 驳回且当前节点为一键节点时，单位code为发起人单位信息
             return jgChangeRegistrationName.getUseUnitCreditCode();
         }

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

@@ -252,6 +252,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                notice.setInstanceId(workflowResultDto.getInstanceId());
                 this.updateById(notice);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);

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

@@ -463,6 +463,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
         modelDto.setModel(taskMessageDto);
+        modelDto.setPageType(this.getPageTypeForReject(operate, jgScrapCancelDto.getAuditStatus()));
         commonService.buildTaskModel(Collections.singletonList(modelDto));
     }
 
@@ -470,6 +471,21 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return commonService.getDictionaryCodeByName(auditStatus);
     }
 
+    private String getPageTypeForReject(String operate, String auditStatus) {
+        // 驳回
+        if ("1".equals(operate)) {
+            // 且驳回到的节点为使用单位提交 则可编辑
+            if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus) ||
+                    WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus) ||
+                    WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
+            ) {
+                return "edit";
+            }
+            return "look";
+        }
+        return "look";
+    }
+
     private TaskV2Model updateTaskModel(JgScrapCancelDto jgScrapCancelDto, String operate) {
         Map<String, Object> params = new HashMap<>();
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
@@ -557,6 +573,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jsonObject.put("taskType", businessTypeJudgment(jgScrapCancel.getCancelType()).getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(jgScrapCancel.getAuditStatus()));
         jsonObject.put("flowStatusLabel", jgScrapCancel.getAuditStatus());
+        // 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
+        jsonObject.put("pageType", this.getPageTypeByCurrentNode(jgScrapCancel.getAuditStatus()));
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -564,6 +582,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return commonService.getDictionaryCodeByName(auditStatus);
     }
 
+    private String getPageTypeByCurrentNode(String auditStatus) {
+        if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus)
+                || WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus)
+                || WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
+        ) {
+            return "edit";
+        } else {
+            return "look";
+        }
+    }
+
     @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {

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

@@ -283,6 +283,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                notice.setInstanceId(workflowResultDto.getInstanceId());
                 jgTransferNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);

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

@@ -49,6 +49,12 @@
   },
   {
     "type": "104",
+    "pageType": "draft",
+    "name": "维修告知",
+    "url": "/mixuap?appId=1742358052905971713&id=1736722439125102594&roleIds={roleIds}&userId={userId}&formType=edit"
+  },
+  {
+    "type": "104",
     "pageType": "look",
     "name": "维修告知",
     "url": "/mixuap?appId=1742358052905971713&id=1736722439125102594&roleIds={roleIds}&userId={userId}&formType=look"
@@ -181,6 +187,12 @@
   },
   {
     "type": "112-1",
+    "pageType": "draft",
+    "name": "设备启用",
+    "url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=edit"
+  },
+  {
+    "type": "112-1",
     "pageType": "look",
     "name": "设备启用",
     "url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=look"
@@ -193,6 +205,12 @@
   },
   {
     "type": "112-2",
+    "pageType": "draft",
+    "name": "设备停用",
+    "url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=edit"
+  },
+  {
+    "type": "112-2",
     "pageType": "look",
     "name": "设备停用",
     "url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=look"