检验结果录入

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/IdxBizJgProjectContraptionServiceImpl.java

@@ -310,7 +310,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         Page<Map<String, Object>> page=new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        page.setRecords(baseMapper.selectEquipListPage(sequenceNbr,(current-1)*size,size));
+        page.setRecords(baseMapper.selectEquipListPage(sequenceNbr, (current - 1) * size, size));
         page.setTotal(baseMapper.selectEquipCount(sequenceNbr));
         return page;
     }
@@ -334,6 +334,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                           Map map = (LinkedHashMap)record;
                           detectionInfo.setRecDate(new Date());
                           detectionInfo.setSequenceNbr((String) map.get("detectionInfoSequenceNbr"));
+                          detectionInfo.setInspectConclusion((String)map.get("inspectConclusionCode"));
                           jgInspectionDetectionInfos.add(detectionInfo);
                         }
                     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -146,7 +146,7 @@
         SELECT ibjtpp."SEQUENCE_NBR" AS sequenceNbr,
         ibjtpp."PIPE_NAME" AS pipeName,
         ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
-        ibjtpp."DEVICE_LEVEL" AS deviceLevel,
+        (select name from cb_data_dictionary where code = ibjtpp."DEVICE_LEVEL" and type = 'GBI') deviceLevel,
         ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
         ibjtpp."WALL_THICKNESS" AS wallThickness,
         ibjtpp."PIPE_LENGTH" AS pipeLength,
@@ -159,7 +159,7 @@
         ibjtpp."REMARKS" AS remarks,
         (select SEQUENCE_NBR from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) detectionInfoSequenceNbr,
         (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
-        (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectConclusion,
+        (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1)) inspectConclusion,
         (select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) nextInspectDate,
         (select USC_UNIT_NAME from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscUnitName,
         (select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscDate,