From 8ec364949c81cf421cc98d3bbad6848ab032e14e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 04 Aug 2023 16:02:45 +0800
Subject: [PATCH] 日志输出修改
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index 0177ebd..02fc93a 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -10,7 +10,6 @@
<result column="time" property="time"/>
<result column="province" property="province"/>
<result column="city" property="city"/>
- <result column="county" property="county"/>
<result column="jnum" property="jnum"/>
<result column="line" property="line"/>
<result column="rtype" property="rtype"/>
@@ -119,17 +118,29 @@
select qd.* from sys_taskqd qd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1 AND
<if test="type==0">
(qd.rtype = "2" or qd.rtype = "0") AND
- find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
+ <if test="serid != '1123598821738675201'">
+ find_in_set(#{serid}, serid) and
+ </if>
+ qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
FROM
- sys_taskfk WHERE
- serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
+ sys_taskfk WHERE 1 = 1
+ <if test="serid != '1123598821738675201'">
+ and serid=#{serid}
+ </if>
+ GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==2">
qd.rtype = "1" AND
- find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
+ <if test="serid != '1123598821738675201'">
+ find_in_set(#{serid}, serid) and
+ </if>
+ qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
FROM
- sys_taskfk WHERE
- serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
+ sys_taskfk WHERE 1 = 1
+ <if test="serid != '1123598821738675201'">
+ and serid=#{serid}
+ </if>
+ GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
<if test="jurisdiction!='1372091709474910209'">
@@ -138,7 +149,9 @@
</if>
qd.rtype = "2"
and qd.tasktype=#{tasktype}
- and (!find_in_set(#{serid}, serid) OR serid IS NULL )
+ <if test="serid != '1123598821738675201'">
+ and (!find_in_set(#{serid}, serid) OR serid IS NULL )
+ </if>
and
((j.id =#{jurisdiction} or
j.parent_id = #{jurisdiction}) or (j.id =#{workjurisdiction} or
@@ -196,4 +209,37 @@
FROM sys_taskqd
WHERE id = #{hdid}
</select>
+
+ <!--自定义分页查询-->
+ <select id="selectTaskQdPage" resultType="org.springblade.modules.taskqd.vo.TaskqdVO">
+ select * from sys_taskqd where 1=1
+ </select>
+
+ <!--导出任务数据-->
+ <select id="selectTaskList" resultType="org.springblade.modules.taskqd.excel.TaskExcel">
+ select
+ st.id,st.rname,st.time,st.endtime,st.content,st.gathername,st.fname,st.integral,
+ sr.role_name as trainName,
+ case when rtype='0' then '正在进行'
+ when rtype='1' then '已结束'
+ when rtype='2' then '任务未开始'
+ end as rtypeName,
+ sj.dept_name as jurisdictionName
+ from sys_taskqd st
+ left join sys_jurisdiction sj on sj.id = st.jurisdiction
+ left join blade_role sr on sr.id = st.train
+ where 1=1
+ <if test="task.tasktype!=null and task.tasktype!=''">
+ and st.tasktype = #{task.tasktype}
+ </if>
+ <if test="task.rtype!=null and task.rtype!='' and task.rtype!='undefined'">
+ and st.rtype = #{task.rtype}
+ </if>
+ <if test="task.rname!=null and task.rname!='' and task.rname!='undefined'">
+ and st.rname like concat('%',#{task.rname},'%')
+ </if>
+ <if test="task.jurisdiction!=null and task.jurisdiction!='' and task.jurisdiction!='undefined'">
+ and st.jurisdiction = #{task.jurisdiction}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3