From b5dd4841100d8d5d34fb0ff91caa7c77396d4d29 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 31 May 2023 16:36:46 +0800
Subject: [PATCH] 责任人管理列表sql修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 19 +++++++++++++------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 9 +++------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java | 4 ++--
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
index 0f85dbe..caf020e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -27,12 +27,12 @@
/**
* 获取水库对应责任人分页数据
* @param params 条件查询参数对象
- * @param list 行政区code集合
+ * @param ad_code 行政区like条件
* @param page 分页查询参数对象
* @return
*/
List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
- @Param("list") List<String> list,
+ @Param("ad_code") String ad_code,
@Param("params") Map<String, Object> params);
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index 1a9e03d..12d866f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -34,7 +34,7 @@
trmp4."user_unit" technologyUnitName,trmp4."user_name" technologyUsername,trmp4."user_phone" technologyPhone,trmp4."position" technologyPosition,trmp4."guid" technologyUserGuid,
trmp5."user_unit" patrolUnitName,trmp5."user_name" patrolUsername,trmp5."user_phone" patrolPhone,trmp5."position" patrolPosition,trmp5."guid" patrolUserGuid
from SJZT_MD."att_res_base" arb
- left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000')
+ left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
left join (
select "res_guid",WM_Concat("guid") "guid",WM_Concat("user_unit") "user_unit",WM_Concat("user_name") "user_name",WM_Concat("user_phone") "user_phone",WM_Concat("position") "position"
from "SJZT_MD"."att_res_manage_person" where "type"=1 GROUP BY "res_guid"
@@ -97,11 +97,8 @@
)
)
</if>
- <if test="list != null and list.size()>0">
- and aab."ad_code" in
- <foreach collection="list" item="adCode" separator ="," open="(" close=")">
- #{adCode}
- </foreach>
+ <if test="ad_code != null and ad_code !='' ">
+ and aab."ad_code" like CONCAT(#{ad_code},'%')
</if>
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index 4c91e94..f239444 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -55,17 +55,24 @@
*/
@Override
public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
- List<String> list = new ArrayList<>();
+
Object adCode = params.get("adCode");
- Object isExport = params.get("isExport");
- if (null != adCode && !adCode.equals("")) {
- list = callTaskMapper.getAllChildrenAreaByAreaCode(adCode.toString());
+ String ad_code = "";
+ String code = adCode.toString();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ ad_code = adCode.toString().substring(0,2);
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ ad_code = adCode.toString().substring(0,4);
+ } else {
+ ad_code = adCode.toString().substring(0,6);
}
+ Object isExport = params.get("isExport");
+
// 判断是否导出，导出不分页
if (null != isExport && !isExport.equals("")) {
- return baseMapper.getAttResBaseUserPage(null,list,params);
+ return baseMapper.getAttResBaseUserPage(null,ad_code,params);
}
- List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,list,params);
+ List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,params);
// 返回数据
return page.setRecords(attResBaseUserDTOList);
}
--
Gitblit v1.9.3