Merge remote-tracking branch 'origin/dev' into dev

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

@@ -33,4 +33,8 @@ public class AppointmentRefuseVO {
     @Schema(description = "单据类型 1 约检单 2 受理单 3任务单",defaultValue ="1")
     private Integer orderType;
 
+    /**
+     * 拒绝来源(1=窗口拒检,2=检验员拒检,3=客户拒检)
+     */
+    private Integer rejectionSource;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/AppointmentConfirmOrderServiceImpl.java

@@ -581,7 +581,11 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
 
             appointmentConfirmOrderRefuseItemDO.setCheckType(100); //锅炉的都是定检
             appointmentConfirmOrderRefuseItemDO.setEquipMainType(200);
-            appointmentConfirmOrderRefuseItemDO.setRejectionSource(1); //窗口拒检
+            if (appointmentRefuseVO.getRejectionSource() == null){
+                appointmentConfirmOrderRefuseItemDO.setRejectionSource(1); //窗口拒检
+            } else {
+                appointmentConfirmOrderRefuseItemDO.setRejectionSource(appointmentRefuseVO.getRejectionSource());
+            }
             appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentRefuseVO.getOrderNo());
             appointmentConfirmOrderRefuseItemDO.setReasonDict(appointmentRefuseVO.getReasonDict());
             appointmentConfirmOrderRefuseItemDO.setOrderType(appointmentRefuseVO.getOrderType());
@@ -925,6 +929,7 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
         refuseVO.setReason(appointmentRefuseVO.getReason());
         refuseVO.setReasonDict(appointmentRefuseVO.getReasonDict());
         refuseVO.setOrderType(1);
+        refuseVO.setRejectionSource(3);
         refuseCheck(refuseVO);
     }
 }

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

@@ -195,8 +195,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
@@ -275,8 +275,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

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

@@ -195,8 +195,8 @@
             <if test="equipCode != null and equipCode != ''">
                 AND eb.equip_code LIKE CONCAT('%',#{equipCode},'%')
             </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
@@ -265,8 +265,8 @@
             <if test="equipCode != null and equipCode != ''">
                 AND eb.equip_code LIKE CONCAT('%',#{equipCode},'%')
             </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