1.压力管道新批量开发，使用登记开发提交

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

@@ -1018,8 +1018,8 @@
         WHERE
             ri."EQU_CATEGORY" = '8300'
             and ui."PROJECT_CONTRAPTION_ID" = #{projectContraptionSeq}
-            AND ui.IS_INTO_MANAGEMENT = false
-            AND ri."USE_ORG_CODE" <![CDATA[<>]]> ''
+            AND ui.IS_INTO_MANAGEMENT = true
+            and (length(ri.USE_ORG_CODE) = 0 or ri.USE_ORG_CODE is null)
             ORDER BY ui.REC_DATE DESC
         )
     </select>

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

@@ -3623,10 +3623,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public Map<String, Object> getDeviceListByProjectContraption(String projectContraptionSeq) {
+        IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getById(projectContraptionSeq);
         Map<String, Object> re = new HashMap<>();
         List<Map<String, Object>> equList = this.getBaseMapper().selectPieLineListByOfCanReg(projectContraptionSeq);
-        re.put("equipmentLists",equList);
-        re.put("projectContraption","111111111");
+        re.put("equipmentLists", equList);
+        re.put("projectContraption", projectContraption.getProjectContraption());
+        re.put("projectContraptionId", projectContraptionSeq);
         this.setPieLineInspectInfo(projectContraptionSeq, re);
         this.setConstructionInfo(projectContraptionSeq, re);
         return re;
@@ -3641,11 +3643,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             re.put("installLeaderPhone",construction.getConstructionLeaderPhone());
             re.put("installStartDate", construction.getUscDate());
             re.put("installPropertyUnitName", construction.getConstructionLeaderName());
-            re.put("installProxyStatementAttachment", JSON.parseObject(construction.getProxyStatementAttachment()));
-            re.put("installContractAttachment", JSON.parseObject(construction.getConstructionContractAttachment()));
-            re.put("insOtherAccessories", JSON.parseObject(construction.getConstructionOtherAccessories()));
+            re.put("installProxyStatementAttachment", JSON.parse(construction.getProxyStatementAttachment()));
+            re.put("installContractAttachment", JSON.parse(construction.getConstructionContractAttachment()));
+            re.put("insOtherAccessories", JSON.parse(construction.getConstructionOtherAccessories()));
             re.put("installStreet", construction.getStreetName());
             re.put("installProvince", construction.getProvinceName());
+            re.put("installAddress", construction.getAddress());
             re.put("installCity", construction.getCityName());
             re.put("installCounty", construction.getCountyName());
             re.put("uscUnitCreditCode", construction.getUscUnitCreditCode());
@@ -3666,7 +3669,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             re.put("inspectDate", inspection.getInspectDate());
             re.put("inspectStaff", inspection.getInspectStaff());
             re.put("nextInspectDate", inspection.getNextInspectDate());
-            re.put("inspectReport", JSON.parseObject(inspection.getInspectReport()));
+            re.put("inspectReport", JSON.parse(inspection.getInspectReport()));
             re.put("inspectReportNo",inspection.getInspectReportNo());
             // 返回代表是系统的数据，前端控制系统的检验信息不让编辑
             re.put("jySeq",inspection.getSequenceNbr());