上报管理调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorderrefuseitem/AppointmentConfirmOrderRefuseItemController.java

@@ -246,15 +246,7 @@ public class AppointmentConfirmOrderRefuseItemController {
             }
 
             // 处理检验性质
-            if (item.getCheckType() != null) {
-                if (item.getCheckType() == 100) {
-                    item.setCheckTypeStr("定期检验");
-                } else if (item.getCheckType() == 200) {
-                    item.setCheckTypeStr("年度检查");
-                } else if (item.getCheckType() == 300) {
-                    item.setCheckTypeStr("超年限检验");
-                }
-            }
+            item.setCheckTypeStr(item.getCheckTypeName());
 
             // 处理拒绝定检状态
             if (item.getRefuseCheckStatus() != null) {
@@ -286,15 +278,7 @@ public class AppointmentConfirmOrderRefuseItemController {
             }
 
             // 处理运行状态
-            if (item.getEquipStatus() != null) {
-                if (item.getEquipStatus() == 100) {
-                    item.setEquipStatusStr("在用");
-                } else if (item.getEquipStatus() == 200) {
-                    item.setEquipStatusStr("停运");
-                } else if (item.getEquipStatus() == 300) {
-                    item.setEquipStatusStr("注销");
-                }
-            }
+            item.setEquipStatusStr(item.getEquipStatusName());
 
             // 处理拒检原因
             if (item.getReasonDict() != null) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/appointmentconfirmrefuseyearitem/AppointmentConfirmRefuseYearItemMapper.xml

@@ -97,6 +97,12 @@
         <if test="equipMainType != null">
             AND t1.EQUIP_MAIN_TYPE = #{equipMainType}
         </if>
+        <if test="checkTypeName != null">
+            AND t1.CHECK_TYPE_NAME = #{checkTypeName}
+        </if>
+        <if test="equipStatusName != null">
+            AND t1.EQUIP_STATUS_NAME = #{equipStatusName}
+        </if>
     </sql>
 
     <!-- 拒绝年检表查询条件 -->
@@ -183,6 +189,12 @@
         <if test="equipMainType != null">
             AND t2.EQUIP_MAIN_TYPE = #{equipMainType}
         </if>
+        <if test="checkTypeName != null">
+            AND t2.CHECK_TYPE_NAME = #{checkTypeName}
+        </if>
+        <if test="equipStatusName != null">
+            AND t2.EQUIP_STATUS_NAME = #{equipStatusName}
+        </if>
     </sql>
 
     <!--
@@ -230,6 +242,8 @@
                 t1.CONTACT AS contact,
                 t1.CONTACT_PHONE AS contactPhone,
                 t1.EQUIP_MAIN_TYPE AS equipMainType,
+                t1.CHECK_TYPE_NAME AS checkTypeName,
+                t1.EQUIP_STATUS_NAME AS equipStatusName,
                 1 AS scene
                 FROM PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM t1
                 WHERE t1.IS_SUBMIT = 0
@@ -277,6 +291,8 @@
                 t2.CONTACT AS contact,
                 t2.CONTACT_PHONE AS contactPhone,
                 t2.EQUIP_MAIN_TYPE AS equipMainType,
+                t2.CHECK_TYPE_NAME AS checkTypeName,
+                t2.EQUIP_STATUS_NAME AS equipStatusName,
                 0 AS scene
                 FROM PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM t2
                 WHERE t2.DELETED = 0
@@ -322,6 +338,8 @@
                 t1.CONTACT AS contact,
                 t1.CONTACT_PHONE AS contactPhone,
                 t1.EQUIP_MAIN_TYPE AS equipMainType,
+                t1.CHECK_TYPE_NAME AS checkTypeName,
+                t1.EQUIP_STATUS_NAME AS equipStatusName,
                 1 AS scene
                 FROM PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM t1
                 WHERE t1.IS_SUBMIT = 0
@@ -363,6 +381,8 @@
                 t2.CONTACT AS contact,
                 t2.CONTACT_PHONE AS contactPhone,
                 t2.EQUIP_MAIN_TYPE AS equipMainType,
+                t2.CHECK_TYPE_NAME AS checkTypeName,
+                t2.EQUIP_STATUS_NAME AS equipStatusName,
                 0 AS scene
                 FROM PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM t2
                 WHERE t2.DELETED = 0
@@ -466,6 +486,8 @@
         t1.CONTACT AS contact,
         t1.CONTACT_PHONE AS contactPhone,
         t1.EQUIP_MAIN_TYPE AS equipMainType,
+        t1.CHECK_TYPE_NAME AS checkTypeName,
+        t1.EQUIP_STATUS_NAME AS equipStatusName,
         1 AS scene
         FROM PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM t1
         WHERE t1.IS_SUBMIT = 0
@@ -511,6 +533,8 @@
         t2.CONTACT AS contact,
         t2.CONTACT_PHONE AS contactPhone,
         t2.EQUIP_MAIN_TYPE AS equipMainType,
+        t2.CHECK_TYPE_NAME AS checkTypeName,
+        t2.EQUIP_STATUS_NAME AS equipStatusName,
         0 AS scene
         FROM PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM t2
         WHERE t2.DELETED = 0