前台约检增加查询条件

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipescheduling/vo/EquipPipeSchedulingPipesRespVO.java

@@ -84,6 +84,12 @@ public class EquipPipeSchedulingPipesRespVO {
     @ExcelProperty("管道数量")
     private Integer pipeCount;
 
+    @Schema(description = "关联部门id")
+    private String relationDept;
+
+    @Schema(description = "关联部门名称")
+    private String relationDeptName;
+
     @ExcelIgnore
     private List<EquipPipePlanSchedulingVO> pipes = new ArrayList<>();
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorder/vo/OrderFromPdfReqVO.java

@@ -34,4 +34,7 @@ public class OrderFromPdfReqVO {
 
     @Schema(description = "重大问题线索版本id")
     private String fileVersionId;
+
+    @Schema(description = "签名文件ID")
+    private String signFileId;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipescheduling/EquipPipeSchedulingMapper.xml

@@ -638,7 +638,8 @@
     <select id="selectPlanPipesPage">
         select rownum,a.* from (
         select id,unit_code,unit_id,unit_name,equip_street ,equip_district ,CONTACT,CONTACT_PHONE,
-        NEXT_LEGAL_CHECK_DATE,NEXT_YEAR_CHECK_DATE,project_no,project_name,pipe_category
+        NEXT_LEGAL_CHECK_DATE,NEXT_YEAR_CHECK_DATE,project_no,project_name,pipe_category,
+        RELATION_DEPT,RELATION_DEPT_NAME
         ,(select a.PLAN_DATE from PRESSURE2_EQUIP_PIPE_SCHEDULING a
         left join PRESSURE2_EQUIP_PIPE_SCHEDULING_ITEM b on a.ID = b.SCHEDULING_ID
         where b.equip_id = eb.id and a.DELETED = 0 and b.DELETED = 0 and a.type = 100 order by a.CREATE_TIME DESC limit 1) plan_legal_check_date
@@ -719,7 +720,8 @@
     <select id="selectPlanPipesPageCount">
         select count(*) from (
         select id,unit_code,unit_name,equip_street ,equip_district ,CONTACT,CONTACT_PHONE,
-        NEXT_LEGAL_CHECK_DATE,NEXT_YEAR_CHECK_DATE
+        NEXT_LEGAL_CHECK_DATE,NEXT_YEAR_CHECK_DATE,
+        RELATION_DEPT,RELATION_DEPT_NAME
         ,(select a.PLAN_DATE from PRESSURE2_EQUIP_PIPE_SCHEDULING a
         left join PRESSURE2_EQUIP_PIPE_SCHEDULING_ITEM b on a.ID = b.SCHEDULING_ID
         where b.equip_id = eb.id and a.DELETED = 0 and b.DELETED = 0 and a.type = 100 order by a.CREATE_TIME limit 1) plan_legal_check_date