From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
index a8bed84..6fcbd75 100644
--- a/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
@@ -48,16 +48,16 @@
and (sj.id = #{coinspect.jurisdiction} or sj.parent_id = #{coinspect.jurisdiction})
</if>
<if test="coinspect.realName!=null and coinspect.realName!=''">
- bu.real_name like concat('%',#{coinspect.realName},'%')
+ and bu.real_name like concat('%',#{coinspect.realName},'%')
</if>
<if test="coinspect.examinerDeptName!=null and coinspect.examinerDeptName!=''">
- bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
+ and bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
</if>
<if test="coinspect.reviewedDeptName!=null and coinspect.reviewedDeptName!=''">
- bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
+ and bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
</if>
<if test="coinspect.results!=null and coinspect.results!=''">
- sc.results like concat('%',#{coinspect.results},'%')
+ and sc.results like concat('%',#{coinspect.results},'%')
</if>
<if test="coinspect.startTime!=null and coinspect.startTime!=''">
and sc.reviewTime >= #{coinspect.startTime}
@@ -77,8 +77,8 @@
bd1.dept_name reviewedDeptName,
bd.dept_name examinerDeptName,
sc.reviewTime reviewtime,
- sc.content,
- sc.result
+ sc.insid content,
+ sc.results result
from
sys_coinspect sc
left join
@@ -93,18 +93,29 @@
blade_dept bd1
on
bd1.id = sc.reviewed_dept_id
+ left join
+ sys_information si
+ on
+ si.departmentid = bu.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
where 1 = 1
+ <if test="coinspect.jurisdiction!=null and coinspect.jurisdiction!='' and coinspect.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{coinspect.jurisdiction} or sj.parent_id = #{coinspect.jurisdiction})
+ </if>
<if test="coinspect.realName!=null and coinspect.realName!=''">
- bu.real_name like concat('%',#{coinspect.realName},'%')
+ and bu.real_name like concat('%',#{coinspect.realName},'%')
</if>
<if test="coinspect.examinerDeptName!=null and coinspect.examinerDeptName!=''">
- bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
+ and bd.dept_name like concat('%',#{coinspect.examinerDeptName},'%')
</if>
<if test="coinspect.reviewedDeptName!=null and coinspect.reviewedDeptName!=''">
- bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
+ and bd1.dept_name like concat('%',#{coinspect.reviewedDeptName},'%')
</if>
<if test="coinspect.results!=null and coinspect.results!=''">
- sc.results like concat('%',#{coinspect.results},'%')
+ and sc.results like concat('%',#{coinspect.results},'%')
</if>
<if test="coinspect.startTime!=null and coinspect.startTime!=''">
and sc.reviewTime >= #{coinspect.startTime}
--
Gitblit v1.9.3