xuzhancheng 4 днів тому
батько
коміт
a20920ffb3

+ 1 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/ConfirmOrderPageVO.java

@@ -39,7 +39,7 @@ public class ConfirmOrderPageVO extends PageParam {
     private List<Integer> equipStreet;
 
     @Schema(description = "部门")
-    private String deptId;
+    private String relateDepartment;
 
     @Schema(description = "容器类型")
     private List<String> typeList;

+ 4 - 4
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equipboiler/EquipBoilerMapper.xml

@@ -38,8 +38,8 @@
             <if test="equipCode != null and equipCode != ''">
                 AND eb.equip_code LIKE CONCAT('%',#{equipCode},'%')
             </if>
-            <if test="deptId != null and deptId != ''">
-                AND eb.RELATED_DEPARTMENT = #{deptId}
+            <if test="relateDepartment != null and relateDepartment != ''">
+                AND eb.RELATED_DEPARTMENT = #{relateDepartment}
             </if>
             <if test="equipStreet != null and equipStreet.size() > 0">
                 AND eb.equip_street IN
@@ -115,8 +115,8 @@
             <if test="equipCode != null and equipCode != ''">
                 AND eb.equip_code LIKE CONCAT('%',#{equipCode},'%')
             </if>
-            <if test="deptId != null and deptId != ''">
-                AND eb.RELATED_DEPARTMENT = #{deptId}
+            <if test="relateDepartment != null and relateDepartment != ''">
+                AND eb.RELATED_DEPARTMENT = #{relateDepartment}
             </if>
             <if test="equipStreet != null and equipStreet.size() > 0">
                 AND eb.equip_street IN

+ 4 - 4
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipe/EquipPipeMapper.xml

@@ -44,8 +44,8 @@
             <if test="unitAddress != null and unitAddress != ''">
                 AND eb.unit_address LIKE CONCAT('%',#{unitAddress},'%')
             </if>
-            <if test="deptId != null and deptId != ''">
-                AND eb.RELATION_DEPT = #{deptId}
+            <if test="relateDepartment != null and relateDepartment != ''">
+                AND eb.RELATION_DEPT = #{relateDepartment}
             </if>
             <if test="equipStreet != null and equipStreet.size() > 0">
                 AND eb.equip_street IN
@@ -107,8 +107,8 @@
             <if test="unitAddress != null and unitAddress != ''">
                 AND eb.unit_address LIKE CONCAT('%',#{unitAddress},'%')
             </if>
-            <if test="deptId != null and deptId != ''">
-                AND eb.RELATION_DEPT = #{deptId}
+            <if test="relateDepartment != null and relateDepartment != ''">
+                AND eb.RELATION_DEPT = #{relateDepartment}
             </if>
             <if test="equipStreet != null and equipStreet.size() > 0">
                 AND eb.equip_street IN