From addedb6e27a0eff756ff3cabdd7dd2295ade5414 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 14:41:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/resources/mapper/AllocationMapper.xml | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index bf5816e..6753aa6 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -60,25 +60,6 @@
</select>
- <select id="selectSmallRoutine" resultType="com.moral.api.pojo.vo.allocation.AllocationFindVo">
- SELECT
- <include refid="Allocation_Column_List"/>
- FROM allocation as a
- <where>
- and is_del = 0 and is_invalid =0
- <if test="allocation.state != null and allocation.id != 0">
- and a.state = #{state}
- </if>
- <if test="allocation.startTime != null and allocation.startTime != '' ">
- and date(escalation_time) <![CDATA[>=]]> #{startTime}
- </if>
- <if test="allocation.endTime != null and allocation.endTime !='' ">
- and date(escalation_time) <![CDATA[<=]]> #{endTime}
- </if>
- </where>
- order by escalation_time desc,allocation_id desc
- </select>
-
<select id="extPage" resultType="com.moral.api.pojo.ext.allocation.AllocationPageExt">
SELECT
<include refid="Allocation_Column_List"/>,t1.id as applyState
@@ -123,4 +104,33 @@
</where>
order by allocation.escalation_time desc,allocation.allocation_id desc
</select>
+
+ <select id="extAppPage" resultType="com.moral.api.pojo.ext.allocation.AllocationPageExt">
+ SELECT
+ <include refid="Allocation_Column_List"/>
+ FROM allocation allocation
+ <where>
+ 1 = 1 and allocation.is_del = 0
+ <if test="allocation.startTime != null and allocation.startTime != '' ">
+ and date(allocation.escalation_time) <![CDATA[>=]]> #{allocation.startTime}
+ </if>
+ <if test="allocation.endTime != null and allocation.endTime !='' ">
+ and date(allocation.escalation_time) <![CDATA[<=]]> #{allocation.endTime}
+ </if>
+ <if test="allocation.stateList != null and allocation.stateList.size !=0">
+ and allocation.state in
+ <foreach collection="allocation.stateList" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+
+ </if>
+ <if test="allocation.unitList != null and allocation.unitList.size !=0">
+ and allocation.unit_id in
+ <foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ order by allocation.escalation_time desc,allocation.allocation_id desc
+ </select>
</mapper>
--
Gitblit v1.8.0