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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/PipelineEnum.java

@@ -13,7 +13,9 @@ public enum PipelineEnum {
 
     PRESSURE_PIPELINE("压力管道", "8000"),
 
-    INDUSTRIAL_PIPELINE("工业管道", "8300");
+    INDUSTRIAL_PIPELINE("工业管道", "8300"),
+    LONG_DISTANCE_PIPELINE("长输管道", "8100"),
+    COMMON_PIPELINE("公用管道", "8200");
 
     private final String name;
 

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

@@ -6,9 +6,11 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -16,6 +18,9 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -97,6 +102,7 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.proConPageByParams(params, page, reginParams));
 	}
 
+
 	/**
 	 * 根据入参 列表查询（当前）单位下的工程管道
 	 *
@@ -127,6 +133,70 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	}
 
 	/**
+	 * 根据sequenceNbr分页查询管道信息
+	 *
+	 * @param sequenceNbr
+	 * @param current 当前页
+	 * @param size 大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/techParamsPipelinePage")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询管道信息",  notes = "管道工程装置表分页查询")
+	public ResponseModel <Page<Map<String, Object>>> techParamsPipelinePage(@RequestParam("sequenceNbr") String sequenceNbr,
+																		   @RequestParam(value = "current") int current,
+																		   @RequestParam(value = "size") int size) {
+		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.techParamsPipelinePage(sequenceNbr,current,size));
+	}
+
+	/**
+	 * 新增或者更新检验信息
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveOrUpdateDetectionInfo")
+	@ApiOperation(httpMethod = "POST", value = "新增或者更新检验信息", notes = "新增或者更新检验信息")
+	public ResponseModel<?> saveOrUpdateDetectionInfo(@RequestBody IdxBizJgInspectionDetectionInfo detectionInfo) {
+		idxBizJgProjectContraptionServiceImpl.saveOrUpdateDetectionInfo(detectionInfo);
+		return ResponseHelper.buildResponse("更新成功");
+	}
+
+	/**
+	 * 新增或者更新检验信息批量
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveOrUpdateDetectionInfoBatch")
+	@ApiOperation(httpMethod = "POST", value = "新增或者更新检验信息", notes = "新增或者更新检验信息")
+	public ResponseModel<?> saveOrUpdateDetectionInfoBatch(@RequestBody List<IdxBizJgInspectionDetectionInfo> detectionInfos) {
+		idxBizJgProjectContraptionServiceImpl.saveOrUpdateDetectionInfoBatch(detectionInfos);
+		return ResponseHelper.buildResponse("更新成功");
+	}
+
+	/**
+	 * 获取检验信息详情
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getDetectionInfoDetail")
+	@ApiOperation(httpMethod = "GET", value = "获取检验信息详情", notes = "获取检验信息详情")
+	public ResponseModel<IdxBizJgInspectionDetectionInfo> getDetectionInfoDetail(@RequestParam("sequenceNbr") String sequenceNbr) {
+		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.getDetectionInfoDetail(sequenceNbr));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/summaryBasicInfo/export")
+	@ApiOperation(httpMethod = "GET", value = "导出基本信息汇总表(长输/公用管道)", notes = "导出基本信息汇总表(长输/公用管道)")
+	public void exportSummaryBasicInfo(HttpServletResponse response,
+									   @RequestParam("sequenceNbr") String sequenceNbr,
+									   @RequestParam("category") String category) {
+		idxBizJgProjectContraptionServiceImpl.exportSummaryBasicInfo(sequenceNbr, response, category);
+	}
+
+	/**
      * 列表分页查询
      *
      * @param current 当前页
@@ -144,6 +214,7 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	    return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.queryForIdxBizJgProjectContraptionPage(page));
 	}
 
+
 	/**
 	 * 列表全部数据查询
      *
@@ -155,4 +226,5 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	public ResponseModel<List<IdxBizJgProjectContraptionDto>> selectForList() {
 	    return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.queryForIdxBizJgProjectContraptionList());
 	}
+
 }

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

@@ -2434,6 +2434,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String formattedDate = currentDate.format(formatter);
         exportParamsMap.put("printDate", formattedDate);
+        //获取分类名称
+        exportParamsMap.put("categoryName", "工业管道");
         // 使用单位
         exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
         // 使用单位地址

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/PressurePipeBasicInformationSummary.ftl

@@ -69,7 +69,7 @@
                                 <w:sz w:val="36"/>
                                 <w:szCs w:val="36"/>
                             </w:rPr>
-                            <w:t>工业管道</w:t>
+                            <w:t>${categoryName}</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="7AEDB7EF" w14:textId="156F0207" w:rsidR="00EA7A71" w:rsidRDefault="00DB6291">

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

@@ -36,4 +36,20 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
     Integer countContraptionInUseTimesForDelete(@Param("projectContraptionId") Long projectContraptionId);
 
     List<IdxBizJgProjectContraption> selectErrorManagementProject();
+
+    /**
+     * 获取管道信息分页
+     * @param sequenceNbr
+     * @param current
+     * @param size
+     * @return
+     */
+    List<Map<String, Object>> selectEquipListPage(@Param("sequenceNbr") String sequenceNbr, @Param("current") int current, @Param("size") int size);
+
+    /**
+     * 获取管道信息总数
+     * @param sequenceNbr
+     * @return
+     */
+    long selectEquipCount(@Param("sequenceNbr") String sequenceNbr);
 }

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

@@ -141,4 +141,45 @@
           and p.is_into_management = false
           and n.is_delete = false
     </select>
+
+    <select id="selectEquipListPage" resultType="java.util.Map">
+        SELECT ibjtpp."SEQUENCE_NBR" AS sequenceNbr,
+        ibjtpp."PIPE_NAME" AS pipeName,
+        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 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 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
+        limit #{current},#{size}
+    </select>
+
+    <select id="selectEquipCount" resultType="long">
+        SELECT count(1)
+        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>