From 3467fa64f4be6efc9b742913419e7c3a501c541b Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 20 六月 2024 16:52:21 +0800
Subject: [PATCH] 云片短信对接,审批流程优化

---
 project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index fd174aa..ab4be13 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -23,6 +23,8 @@
         <result property="applyDeptId"    column="apply_dept_id"    />
         <result property="applyDeptName"    column="apply_dept_name"    />
         <result property="applyTime"    column="apply_time"    />
+        <result property="planTime"    column="plan_time"    />
+        <result property="inTime"    column="in_time"    />
         <result property="userNum"    column="user_num"    />
         <result property="warnStatus"    column="warn_status"    />
         <result property="warnReason"    column="warn_reason"    />
@@ -60,7 +62,9 @@
         from sys_job_log
     </sql>
 
-    <select id="selectCheckList" parameterType="EnforceOrderQueryBo" resultMap="EnforceOrderResult">
+    <select id="selectCheckList"
+            parameterType="EnforceOrderQueryBo"
+            resultMap="EnforceOrderResult">
         <include refid="selectEnforceOrderVo"/>
         <where>
             <if test="orderNo != null and orderNo != ''">
@@ -69,29 +73,20 @@
             <if test="companyName != null and companyName != ''">
                 AND company_name like concat('%', #{companyName}, '%')
             </if>
-
             <if test="orderStatus != null and orderStatus != ''">
                 AND order_status = #{orderStatus}
             </if>
-
-            <if test="checkDeptId != null ">
-                AND check_dept_id = #{checkDeptId}
+            <if test="checkIds != null and checkIds != '' ">
+                AND check_ids like concat('%', #{checkIds}, '%')
             </if>
-
-            <if test="checkLevel != null ">
-                AND check_level = #{checkLevel}
-            </if>
-
             <if test="applyDeptIds != null ">
                 AND apply_dept_id in
                 <foreach collection="applyDeptIds" item="applyDeptId" open="(" separator="," close=")">
                     #{applyDeptId}
                 </foreach>
             </if>
-
-
-
         </where>
     </select>
 
+
 </mapper>

--
Gitblit v1.9.1