提交长输管道、公用管道的打印汇总表

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

@@ -278,7 +278,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
             if (ValidationUtil.isEmpty(idxBizJgProjectContraption)) {
                 throw new BadRequest("没有查询到汇总信息！");
             }
-            List<Map<String, Object>> allEquipment = baseMapper.selectEquipList(sequenceNbr);
+            List<Map<String, Object>> allEquipment = baseMapper.selectEquipListByExport(sequenceNbr);
             total = allEquipment.size();
             AgencyUserModel result = new AgencyUserModel();
             if (!ValidationUtil.isEmpty(idxBizJgProjectContraption.getRecUserId())) {
@@ -354,7 +354,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
      */
     public void pressurePipeEquData(Map<String, Object> exportParamsMap, List<Map<String, Object>> equData, int current, int size) {
 
-        String[] fieldNames = {"pipeName", "pipelineNumber", "deviceLevel", "designUnitName", "uscUnitName",
+        String[] fieldNames = {"productName", "pipelineNumber", "deviceLevel", "designUnitName", "uscUnitName",
                 "uscDate", "useDate", "nominalDiameter", "wallThickness", "pipeLength", "pressure", "temperature",
                 "medium", "inspectConclusion", "inspectOrgName", "nextInspectDate", "remarks"};
         // 填充有效数据

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java

@@ -67,4 +67,11 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
      * @return
      */
     long selectEquipCount(@Param("sequenceNbr") String sequenceNbr);
+
+    /**
+     * 获取导出传输/公共管道的信息
+     * @param sequenceNbr
+     * @return
+     */
+    List<Map<String, Object>> selectEquipListByExport(@Param("sequenceNbr") String sequenceNbr);
 }

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

@@ -213,4 +213,33 @@
              </choose>
              and not EXISTS (SELECt 1 FROM tz_jyjc_inspection_application a where a.status='6611' and a.application_unit_code=#{companyCode} and a.project_contraption_id = pc.sequence_nbr)
     </select>
+
+    <select id="selectEquipListByExport" resultType="java.util.Map">
+        SELECT ibjtpp."PIPE_NAME" AS productName,
+        ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
+        ibjtpp."DEVICE_LEVEL" AS deviceLevel,
+        ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
+        ibjtpp."WALL_THICKNESS" AS wallThickness,
+        ibjtpp."PIPE_LENGTH" AS pipeLength,
+        ibjtpp."PRESSURE" AS pressure,
+        ibjtpp."TEMPERATURE" AS temperature,
+        ibjtpp."MEDIUM" AS medium,
+        ibjtpp."WORK_PRESSURE" AS workPressure,
+        ibjtpp."WORK_TEMPERATURE" AS workTemperature,
+        ibjtpp."WORK_MEDIUM" AS workMedium,
+        ibjtpp."REMARKS" AS remarks,
+        (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 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,
+        ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
+        ibjui."USE_DATE" AS useDate,
+        ibjui."RECORD" AS record
+        FROM idx_biz_jg_use_info ibjui
+        LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
+        LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
+        WHERE ibjui.project_contraption_id = #{sequenceNbr}
+        ORDER BY ibjtpp.REC_DATE ASC
+    </select>
 </mapper>