From cdb4df5b86eefa7c36e4746b7fc00d7d15b52ce6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 19:53:34 +0800
Subject: [PATCH] 数据权限优化，执法内容添加
---
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index 8878a5b..1eb759b 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -15,6 +15,7 @@
<result property="companyAddress" column="company_address" />
<result property="regionCode" column="region_code" />
<result property="regionName" column="region_name" />
+ <result property="enforceContent" column="enforce_content" />
<result property="enforceReason" column="enforce_reason" />
<result property="enforceType" column="enforce_type" />
<result property="applyId" column="apply_id" />
@@ -59,7 +60,9 @@
parameterType="EnforceOrderQueryBo"
resultMap="EnforceOrderResult">
<include refid="selectEnforceOrderVo"/>
- <where>
+ where 1=1
+ and check_status !=2
+ and check_status!=-1
<if test="orderNo != null and orderNo != ''">
AND order_no like concat('%', #{orderNo}, '%')
</if>
@@ -72,14 +75,44 @@
<if test="checkIds != null and checkIds != '' ">
AND check_ids like concat('%', #{checkIds}, '%')
</if>
+ <if test="enforceReason != null and enforceReason != '' ">
+ AND enforce_reason like concat('%', #{enforceReason}, '%')
+ </if>
<if test="applyDeptIds != null and applyDeptIds !='' ">
AND apply_dept_id in
<foreach collection="applyDeptIds" item="applyDeptId" open="(" separator="," close=")">
#{applyDeptId}
</foreach>
</if>
- </where>
+
+ </select>
+
+ <select id="selectCheckedList"
+ parameterType="OrderCheckedQueryBo"
+ resultMap="EnforceOrderResult">
+ select t2.*
+ from enforce_check_log t1 join enforce_order t2 on t1.order_id = t2.order_id
+ where t2.del_flag = 0
+ and t1.check_id = #{userId}
+ <if test="checkStatus != null">
+ AND t2.check_status = #{checkStatus}
+ </if>
+ <if test="enforceReason != null and enforceReason != '' ">
+ AND t2.enforce_reason like concat('%', #{enforceReason}, '%')
+ </if>
+
</select>
+ <select id="selectScanList"
+ resultMap="EnforceOrderResult">
+ select t2.*
+ from enforce_peer t1 join enforce_order t2 on t1.order_id = t2.order_id
+ where
+ t2.del_flag = 0
+ and t2.order_status=2
+ AND t1.peer_id = #{userId}
+ AND t2.company_code = #{companyCode}
+
+ </select>
</mapper>
--
Gitblit v1.9.1