fix:管道安装告知设备信息回显

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

@@ -1825,12 +1825,27 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             String deviceLevel = String.valueOf(device.get("deviceLevel"));
             device.put("deviceLevel", dataDictionaryMapper.selectById(deviceLevel).getName());
             device.put("sequenceNbr", projectContraptionSeq);
+            device.put("equListName", projectContraption.getEquListName());
         });
-        return new JSONObject().fluentPut("deviceList", deviceList)
+        JSONObject result = new JSONObject();
+        result.fluentPut("deviceList", deviceList)
                 .fluentPut("projectContraption", projectContraption.getProjectContraption())
                 .fluentPut("projectContraptionNo", projectContraption.getProjectContraptionNo())
                 .fluentPut("pipelineLength", projectContraption.getPipelineLength())
                 .fluentPut("projectContraptionId", projectContraptionSeq);
+        if (!ValidationUtil.isEmpty(projectContraption.getCity())) {
+            result.fluentPut("city", projectContraption.getCity() + "_" + projectContraption.getCityName());
+        }
+        if (!ValidationUtil.isEmpty(projectContraption.getCounty())) {
+            result.fluentPut("county", projectContraption.getCounty() + "_" + projectContraption.getCountyName());
+        }
+        if (!ValidationUtil.isEmpty(projectContraption.getStreet())) {
+            result.fluentPut("factoryUseSiteStreet", projectContraption.getStreet() + "_" + projectContraption.getStreetName());
+        }
+        if (!ValidationUtil.isEmpty(projectContraption.getAddress())) {
+            result.fluentPut("address", projectContraption.getAddress());
+        }
+        return result;
     }
 
     @Override