From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
index 43c08ca..d3c8c79 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
@@ -6,16 +6,12 @@
import cn.gistack.sm.sjztmd.mapper.AttResManagePersonMapper;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
-import cn.gistack.sm.sjztmd.vo.AttResAdVO;
-import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
-import cn.gistack.sm.sjztmd.vo.PersonVO;
-import cn.gistack.sm.sjztmd.vo.UserPersonVO;
+import cn.gistack.sm.sjztmd.vo.*;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@@ -165,11 +161,8 @@
AttResBaseVO attResBaseVO = attResBaseService.getCityCountyCodeByResGuid(res_cd);
if (null!= attResBaseVO) {
// 通过编号查询对应的人员
- List<PersonVO> cityPerson = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCityCode(), "sdglywuser", "市州水库管理业务人员");
- List<PersonVO> countyPerson = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCountyCode(), "qxglywuser", "区县水库管理业务人员");
- // 和
- personVOList.addAll(cityPerson);
- personVOList.addAll(countyPerson);
+ List<PersonVO> personListByResGuid = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCountyCode(), attResBaseVO.getCityCode(), "");
+ personVOList.addAll(personListByResGuid);
}
// 返回
return personVOList;
@@ -203,8 +196,8 @@
@Override
@DS("zt")
- public List<PersonVO> getManagePersonList(String resId,String findType) {
- List<PersonVO> result = new ArrayList<>();
+ public List<ChargePersonVO> getManagePersonList(String resId, String findType) {
+ List<ChargePersonVO> result = new ArrayList<>();
if (StringUtil.isEmpty(resId)){
throw new ServiceException("水库id为空");
}
@@ -224,31 +217,31 @@
List<User> userList = userClient.userInfoByPhone("000000", p.getUserPhone()).getData();
if (userList.size() > 0) {
- PersonVO personVO = new PersonVO();
- personVO.setUserId(userList.get(0).getId().toString());
- personVO.setUserName(userList.get(0).getRealName());
- personVO.setType(p.getType());
+ ChargePersonVO chargePersonVO = new ChargePersonVO();
+ chargePersonVO.setUserId(userList.get(0).getId().toString());
+ chargePersonVO.setUserName(userList.get(0).getRealName());
+ chargePersonVO.setType(p.getType());
//1.政府行政责任人,2.主管部门责任人,3.管理单位责任人,4.技术责任人,5.巡查责任人，6.行政责任人
switch (p.getType()){
case "1":
- personVO.setRoleName("行政责任人");
+ chargePersonVO.setRoleName("行政责任人");
break;
case "2":
- personVO.setRoleName("主管部门责任人");
+ chargePersonVO.setRoleName("主管部门责任人");
break;
case "3":
- personVO.setRoleName("管理单位责任人");
+ chargePersonVO.setRoleName("管理单位责任人");
break;
case "4":
- personVO.setRoleName("技术责任人");
+ chargePersonVO.setRoleName("技术责任人");
break;
case "5":
- personVO.setRoleName("巡查责任人");
+ chargePersonVO.setRoleName("巡查责任人");
break;
default:
break;
}
- result.add(personVO);
+ result.add(chargePersonVO);
}
});
@@ -261,7 +254,7 @@
if (StringUtil.isBlank(findType) || findType.indexOf("9")>-1){
- List<PersonVO> deptUser = new ArrayList<>();
+ List<ChargePersonVO> deptUser = new ArrayList<>();
if (cityName != null && cityName.equals("省直管")){
//如果是省直管，找省厅管理员
--
Gitblit v1.9.3