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/dto/JgInstallationNoticeDto.java

@@ -258,4 +258,6 @@ public class JgInstallationNoticeDto extends BaseDto {
      */
     private String createUserName;
 
+    private String factoryNum;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -414,5 +414,13 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("\"create_user_name\"")
     private String createUserName;
 
+    /**
+     * 设备出场编号
+     */
+//    @TableField("\"factory_num\"")
+            @TableField(exist = false)
+    private String factoryNum;
+
+
 
 }

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

@@ -197,7 +197,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
         }
         Map<String, Object> map = equipmentInfos.get(0);
-        BeanUtil.copyProperties(installationInfo, map, "equList", "supervisoryCode");
+        BeanUtil.copyProperties(installationInfo, map, "equList", "supervisoryCode", "factoryNum");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("installationInfo", map);
         }};
@@ -210,7 +210,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
     public JgInstallationNoticeDto updateInstallationNotice(String submitType, JgInstallationNoticeDto 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)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -526,7 +525,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getEquRegisterCode()) ? "" : item.getEquRegisterCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -553,6 +552,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setEntrustingUnitName(dto.getUseUnitName());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
             dto.setEquRegisterCode(String.valueOf(obj.get("EQU_CODE")));
+            dto.setFactoryNum(String.valueOf(obj.get("FACTORY_NUM")));
             StringBuffer buffer = new StringBuffer();
             buffer.append(dto.getProvinceName()).append(dto.getCityName()).append(dto.getCountyName()).append(dto.getAddress());
             dto.setEquAddress(buffer.toString());

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

@@ -93,13 +93,13 @@
     "type": "109",
     "pageType": "look",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739250036920840194&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "109",
     "pageType": "edit",
     "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1739250036920840194&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "110",