fix(jg):工业管道使用登记汇总表打印问题修改

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

@@ -365,8 +365,8 @@
             ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
             to_char(ui."USE_DATE", 'YYYY-MM') useDate,
             (SELECT DESIGN_UNIT_NAME from idx_biz_jg_design_info where "RECORD" = ui."RECORD") designUnitName,
-            (SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE limit 1) uscUnitName,
-            to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE limit 1), 'YYYY-MM') uscDate,
+            (SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE DESC limit 1) uscUnitName,
+            to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE DESC limit 1), 'YYYY-MM') uscDate,
             ui."RECORD" record,
             ri."EQU_CODE" equCode,
             ri."EQU_LIST" equList,
@@ -386,13 +386,14 @@
             pp."PIPELINE_NUMBER" pipelineNumber,
             pp."NOMINAL_DIAMETER" nominalDiameter,
             pp."WALL_THICKNESS" wallThickness,
-            pp."PIPE_LENGTH" pipeLength,
+            ROUND(pp."PIPE_LENGTH" / 1000.0, 4) pipeLength,
             pp."PRESSURE" pressure,
             pp."TEMPERATURE" temperature,
             pp."MEDIUM" medium,
-            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1) inspectOrgName,
+            pp."REMARKS" remarks,
+            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
             (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 limit 1)) inspectConclusion,
-            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
             idx_biz_jg_use_info ui
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -247,4 +247,14 @@ public class JgUseRegistrationController extends BaseController {
         jgUseRegistrationServiceImpl.correctWrongData(applayNoList);
         return ResponseHelper.buildResponse("ok");
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/useDate/handle")
+    @ApiOperation(httpMethod = "GET", value = "使用登记单子中投用年月的数据处理", notes = "使用登记单子中投用年月的数据处理")
+    public ResponseModel<Object> yunWeiRegistrationWrongData() {
+        // 关联 任务 ： 26599 压力管道技术参数除起始位置、备注外均为必填，压力管道信息汇总表要求的字段在其余模块的都要求必填，压力管道信息汇总表也需要展示
+        // http://113.142.68.105:5080/zentao/task-view-26599.html
+        jgUseRegistrationServiceImpl.useDateHandler();
+        return ResponseHelper.buildResponse("ok");
+    }
 }