From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +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/AttResBaseServiceImpl.java | 81 ++++++++++++----------------------------
1 files changed, 25 insertions(+), 56 deletions(-)
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 6587f8a..4726595 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
@@ -5,10 +5,12 @@
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
+import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
@@ -53,64 +55,31 @@
* @return
*/
@Override
- public IPage<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
- List<String> list = new ArrayList<>();
- Object adCode = params.get("adCode");
- if (null != adCode && !adCode.equals("")) {
- list = callTaskMapper.getAllChildrenAreaByAreaCode(adCode.toString());
+ public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
+
+ Object isExport = params.get("isExport");
+ // 判断是否导出，导出不分页
+ if (null != isExport && !isExport.equals("")) {
+ return baseMapper.getAttResBaseUserPage(null,params);
}
- List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,list,params);
- // 遍历查询所在地点和其它责任人信息
- for (AttResBaseUserDTO attResBaseUserDTO : attResBaseUserDTOList) {
- // 查询各类型责任人
- List<ManagePersonVO> userList = baseMapper.getUserByResBaseGuid(attResBaseUserDTO.getGuid());
- // 组装数据
- if (userList.size() > 0){
- // 责任人类型 1:行政责任人 2:主管部门责任人 3:管理单位责任人 4:技术责任人 5:巡查责任人
- for (ManagePersonVO person : userList) {
- // 1:行政责任人
- if (person.getType().equals(1)) {
- attResBaseUserDTO.setAreaUsername(person.getUsername());
- attResBaseUserDTO.setAreaUnitName(person.getUnitName());
- attResBaseUserDTO.setAreaPosition(person.getPosition());
- attResBaseUserDTO.setAreaPhone(person.getPhone());
- }
-
- // 2:主管部门责任人
- if (person.getType().equals(2)) {
- attResBaseUserDTO.setCustomsUsername(person.getUsername());
- attResBaseUserDTO.setCustomsUnitName(person.getUnitName());
- attResBaseUserDTO.setCustomsPosition(person.getPosition());
- attResBaseUserDTO.setCustomsPhone(person.getPhone());
- }
-
- // 3:管理单位责任人
- if (person.getType().equals(3)) {
- attResBaseUserDTO.setManageUnitUsername(person.getUsername());
- attResBaseUserDTO.setManageUnitUnitName(person.getUnitName());
- attResBaseUserDTO.setManageUnitPosition(person.getPosition());
- attResBaseUserDTO.setManageUnitPhone(person.getPhone());
- }
-
- // 4:技术责任人
- if (person.getType().equals(4)) {
- attResBaseUserDTO.setTechnologyUsername(person.getUsername());
- attResBaseUserDTO.setTechnologyUnitName(person.getUnitName());
- attResBaseUserDTO.setTechnologyPosition(person.getPosition());
- attResBaseUserDTO.setTechnologyPhone(person.getPhone());
- }
-
- // 5:巡查责任人
- if (person.getType().equals(5)) {
- attResBaseUserDTO.setPatrolUsername(person.getUsername());
- attResBaseUserDTO.setPatrolUnitName(person.getUnitName());
- attResBaseUserDTO.setPatrolPosition(person.getPosition());
- attResBaseUserDTO.setPatrolPhone(person.getPhone());
- }
- }
- }
- }
+ List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,params);
// 返回数据
return page.setRecords(attResBaseUserDTOList);
}
+
+ @Override
+ public Boolean updateResBaseByGuid(AttResBase attResBase) {
+ attResBase.setUpdateTime(DateUtil.now());
+ return baseMapper.updateResBaseByGuid(attResBase);
+ }
+
+ /**
+ * 查询当前水库对应的市级编号和县区编号
+ * @param res_cd
+ * @return
+ */
+ @Override
+ public AttResBaseVO getCityCountyCodeByResGuid(String res_cd) {
+ return baseMapper.getCityCountyCodeByResGuid(res_cd);
+ }
}
--
Gitblit v1.9.3