From 024afbfeb399c4d800b4fa088149d92da4d8bbbf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 26 Sep 2024 16:03:08 +0800
Subject: [PATCH] 普查统计水库柱状图数据接口支持季节查询
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 416a840..8232b5d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -96,11 +96,17 @@
LEFT JOIN ywxt.sg_report_user userR ON report.id = userR.report_id
WHERE
1 = 1 and report."STATUS" != 4
- <if test="dto.userUnit != null and dto.userUnit != ''">
- and si.CONTROL_UNIT=#{dto.userUnit}
+ <if test="dto.userUnit != null and dto.userUnit.size>0">
+ and si.CONTROL_UNIT in
+ <foreach collection="dto.userUnit" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
- <if test="dto.countryUnit != null and dto.countryUnit != ''">
- and dria."county_cd"=#{dto.countryUnit}
+ <if test="dto.countryUnit != null and dto.countryUnit.size>0">
+ and dria."county_cd" in
+ <foreach collection="dto.countryUnit" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="dto.roleUnit != null and dto.roleUnit != ''">
and userR.role_id=#{dto.roleUnit}
@@ -240,4 +246,7 @@
</foreach>
</if>
</select>
+ <select id="getSgEngineerRole" resultType="java.lang.Long">
+ select id from "YWXT"."BLADE_ROLE" where parent_id = 1800818080896073730;
+ </select>
</mapper>
--
Gitblit v1.9.3