From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 57 ++++++---------------------------------------------------
1 files changed, 6 insertions(+), 51 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..747ee03 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
@@ -53,63 +53,18 @@
* @return
*/
@Override
- public IPage<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
+ 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());
}
- 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());
- }
- }
- }
+ // 判断是否导出，导出不分页
+ if (null != isExport && !isExport.equals("")) {
+ return baseMapper.getAttResBaseUserPage(null,list,params);
}
+ List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,list,params);
// 返回数据
return page.setRecords(attResBaseUserDTOList);
}
--
Gitblit v1.9.3