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

@@ -25,12 +25,14 @@
                jed.next_executor_ids as nextExecutorIds,
                jed.promoter,
                jed.next_execute_user_ids as nextExecuteUserIds,
-               jed.create_user_id as createUserId
+               jed.create_user_id as createUserId,
+               oi.SUPERVISORY_CODE as supervisoryCode
 
         FROM tzs_jg_enable_disable jed
                  LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
                  LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
                  LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
+                 LEFT JOIN idx_biz_jg_other_info oi on jri.RECORD = oi.RECORD
         <where>
             <if test="dto.applyNo != null and dto.applyNo != '' ">
               and  jed.apply_no like concat('%',#{dto.applyNo},'%')

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

@@ -180,6 +180,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
         } else {
+            jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
             jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
             jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -274,6 +275,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
             }
         } else {
+            jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
         jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
@@ -397,6 +399,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         if ("0".equals(operate)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
                 jgEnableDisable.setPromoter("");
+                jgEnableDisable.setAuditPassDate(new Date());
                 jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getName()));
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();

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

@@ -446,6 +446,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 dto.setInstanceId(workflowResultDtoList.get(i).getInstanceId());
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
             } else {
+                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
             dto.setEquList(String.valueOf(obj.get("EQU_LIST")));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/json/equipCategory.json

 {
+  "__eightCategory__": "设备一码通总览使用",
   "eightCategory": [
     {
       "name": "电梯",
@@ -89,6 +90,7 @@
       "type": "ropeway"
     }
   ],
+  "__other__": "监管业务使用",
   "other": [
     {
       "name": "电梯",
@@ -139,14 +141,58 @@
       "imageUrl": "upload/tzs/common/image/监管索道.png"
     }
   ],
+  "__superviseBusiness__": "监管业务-启停注销使用",
   "superviseBusiness": [
     {
       "name": "电梯",
       "code": "3000",
       "image": "upload/tzs/common/image/总览电梯.png",
       "imageUrl": "upload/tzs/common/image/监管电梯.png"
+    },
+    {
+      "name": "起重机械",
+      "code": "4000",
+      "image": "upload/tzs/common/image/总览起重机械.png",
+      "imageUrl": "upload/tzs/common/image/监管起重机械.png"
+    },
+    {
+      "name": "场内机动车辆",
+      "code": "5000",
+      "image": "upload/tzs/common/image/总览厂车.png",
+      "imageUrl": "upload/tzs/common/image/监管厂车.png"
+    },
+    {
+      "name": "锅炉",
+      "code": "1000",
+      "image": "upload/tzs/common/image/总览锅炉.png",
+      "imageUrl": "upload/tzs/common/image/监管锅炉.png"
+    },
+    {
+      "name": "压力容器",
+      "code": "2000",
+      "image": "upload/tzs/common/image/总览压力容器.png",
+      "imageUrl": "upload/tzs/common/image/监管压力容器.png"
+    },
+    {
+      "name": "压力管道",
+      "code": "8000",
+      "image": "upload/tzs/common/image/总览压力管道.png",
+      "imageUrl": "upload/tzs/common/image/监管压力管道.png"
+    },
+    {
+      "name": "大型游乐设施",
+      "code": "6000",
+      "image": "upload/tzs/common/image/总览游乐设施.png",
+      "imageUrl": "upload/tzs/common/image/监管游乐设施.png"
+    },
+    {
+      "name": "客运索道",
+      "code": "9000",
+      "image": "upload/tzs/common/image/总览索道.png",
+      "imageUrl": "upload/tzs/common/image/监管索道.png"
     }
   ],
+  "__supervise__": "检验检测使用",
   "supervise": [
     {
       "name": "锅炉",
@@ -204,6 +250,7 @@
       "type": "rides"
     }
   ],
+  "__SCJY__": "检验检测使用",
   "SCJY": [
     {
       "name": "起重机械",
@@ -228,6 +275,7 @@
       "type": "vehicle"
     }
   ],
+  "__DQJY__": "检验检测使用",
   "DQJY": [
     {
       "name": "电梯",
@@ -317,17 +365,19 @@
       "sum": "0",
       "type": "ropeway"
     }
-  ],"DTJC":[
-  {
-    "name": "电梯",
-    "code": "3000",
-    "image": "upload/tzs/common/image/总览电梯.png",
-    "imageUrl": "upload/tzs/common/image/监管电梯.png",
-    "waitClaim": "0",
-    "alreadyClaim": "0",
-    "refuseClaim": "0",
-    "sum": "0",
-    "type": "elevator"
-  }
-]
+  ],
+  "__DTJC__": "检验检测使用",
+  "DTJC": [
+    {
+      "name": "电梯",
+      "code": "3000",
+      "image": "upload/tzs/common/image/总览电梯.png",
+      "imageUrl": "upload/tzs/common/image/监管电梯.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "elevator"
+    }
+  ]
 }
\ No newline at end of file