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

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

@@ -175,6 +175,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
     @Autowired
     private IdxBizJgProjectContraptionServiceImpl projectContraptionService;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -1728,7 +1729,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         if (ValidationUtil.isEmpty(projectContraption)) {
             return null;
         }
-        List<Map<String, Object>> deviceList = this.baseMapper.getDeviceListByProjectContraption(projectContraptionSeq);
+        List<Map<String, Object>> deviceList = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionSeq);
+        deviceList.forEach(device -> {
+            String deviceLevel = String.valueOf(device.get("deviceLevel"));
+            device.put("deviceLevel", dataDictionaryMapper.selectById(deviceLevel).getName());
+            device.put("sequenceNbr", projectContraptionSeq);
+        });
         return new JSONObject().fluentPut("deviceList", deviceList)
                 .fluentPut("projectContraption", projectContraption.getProjectContraption())
                 .fluentPut("projectContraptionNo", projectContraption.getProjectContraptionNo())

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

@@ -1820,7 +1820,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
             jsonObject.remove("otherAccessories");
             jsonObject.remove("instanceStatus");
-            setEquListCode2Json(jgUseRegistration, jsonObject);
+            setEquListCode2Json(data, jsonObject);
             // 非单位办理
             if (!"unit".equals(manageType)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();