From 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:37 +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 | 149 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 141 insertions(+), 8 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 727eb67..b7f027e 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,13 +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.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.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@@ -20,9 +19,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @ClassName AttResManagePersonServiceImpl
@@ -162,9 +160,10 @@
// 查询当前水库对应的市级编号和县区编号
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", "区县水库管理业务人员");
+ List<PersonVO> cityPerson = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCityCode(), "sdglywuser", "市州水库管理业务人员");
+
// 和
personVOList.addAll(cityPerson);
personVOList.addAll(countyPerson);
@@ -188,4 +187,138 @@
public Set<Scene> getPatrolPersonListByWaterCodeList(List<String> stringList) {
return baseMapper.getPatrolPersonListByWaterCodeList(stringList);
}
+
+ @Override
+ public String getCompetentDepart(String resCd) {
+ return baseMapper.getCompetentDepart(resCd);
+ }
+
+ @Override
+ public List<AttResManagePerson> getPersonList(String resCd) {
+ return baseMapper.getPersonList(resCd);
+ }
+
+ @Override
+ @DS("zt")
+ public List<ChargePersonVO> getManagePersonList(String resId, String findType) {
+ List<ChargePersonVO> result = new ArrayList<>();
+ if (StringUtil.isEmpty(resId)){
+ throw new ServiceException("水库id为空");
+ }
+
+ //查四个责任人
+ AttResManagePerson attResManagePerson = new AttResManagePerson();
+ attResManagePerson.setResGuid(resId);
+ List<AttResManagePerson> list = baseMapper.getList(attResManagePerson);
+
+ //过滤数据
+ if (StringUtil.isNotBlank(findType)){
+ list = list.stream().filter(e->findType.indexOf(e.getType())>-1).collect(Collectors.toList());
+ }
+
+ //赋值
+ list.forEach(p->{
+ List<User> userList = userClient.userInfoByPhone("000000", p.getUserPhone()).getData();
+ if (userList.size() > 0) {
+
+ 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":
+ chargePersonVO.setRoleName("行政责任人");
+ break;
+ case "2":
+ chargePersonVO.setRoleName("主管部门责任人");
+ break;
+ case "3":
+ chargePersonVO.setRoleName("管理单位责任人");
+ break;
+ case "4":
+ chargePersonVO.setRoleName("技术责任人");
+ break;
+ case "5":
+ chargePersonVO.setRoleName("巡查责任人");
+ break;
+ default:
+ break;
+ }
+ result.add(chargePersonVO);
+ }
+
+ });
+
+ AttResAdVO resAd = attResBaseService.getResAd(resId);
+
+ String cityName = resAd.getCityName();
+ String countyName = resAd.getCountyName();
+ String townName = resAd.getTownName();
+
+ if (StringUtil.isBlank(findType) || findType.indexOf("9")>-1){
+
+ List<ChargePersonVO> deptUser = new ArrayList<>();
+
+ if (cityName != null && cityName.equals("省直管")){
+ //如果是省直管，找省厅管理员
+ String provinceCode = resAd.getProvinceCode();
+
+ deptUser = baseMapper.getPersonByRoleAndAd("stgly",provinceCode);
+ deptUser.forEach(p->{
+ p.setRoleName("省厅管理员");
+ });
+ } else if (countyName != null && countyName.equals("市直管")) {
+ //如果是市直管，找市州管理员
+ String cityCode = resAd.getCityCode();
+
+ deptUser = baseMapper.getPersonByRoleAndAd("dsswjgly",cityCode);
+ deptUser.forEach(p->{
+ p.setRoleName("市州管理员");
+ });
+ }else if (townName != null &&(townName.equals("县直管") || townName.equals("区直管"))){
+ //如果是区直管，找区县管理员
+ String townCode = resAd.getTownCode();
+
+ deptUser = baseMapper.getPersonByRoleAndAd("qxswjgly",townCode);
+ deptUser.forEach(p->{
+ p.setRoleName("区县管理员");
+ });
+ }
+
+
+ else if (StringUtil.isNotBlank(townName)){
+ //镇不是空的，找乡镇管理员
+ String townCode = resAd.getTownCode();
+ deptUser = baseMapper.getPersonByRoleAndAd("xzgly",townCode);
+ deptUser.forEach(p->{
+ p.setRoleName("乡镇管理员");
+ });
+ }else if (StringUtil.isNotBlank(countyName)){
+ //区不是空的找区县管理员
+ String countyCode = resAd.getCountyCode();
+ deptUser = baseMapper.getPersonByRoleAndAd("qxswjgly",countyCode);
+ deptUser.forEach(p->{
+ p.setRoleName("区县管理员");
+ });
+ }else if (StringUtil.isNotBlank(cityName)){
+ //市不是空的找市州管理员
+ String cityCode = resAd.getCityCode();
+ deptUser = baseMapper.getPersonByRoleAndAd("dsswjgly",cityCode);
+ deptUser.forEach(p->{
+ p.setRoleName("市州管理员");
+ });
+ }else{
+ String provinceCode = resAd.getProvinceCode();
+ deptUser = baseMapper.getPersonByRoleAndAd("stgly",provinceCode);
+ deptUser.forEach(p->{
+ p.setRoleName("省厅管理员");
+ });
+ }
+
+ result.addAll(deptUser);
+ }
+
+ return result;
+ }
}
--
Gitblit v1.9.3