From d651a004647ed5ce63c79e56616d9ba961f10b00 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 14 Oct 2024 18:12:09 +0800
Subject: [PATCH] Merge branch 'release/release_20241014' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index b795812..36af820 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -23,6 +23,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -331,10 +332,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
szbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
qzzzxList.add(unitSelectTerm);
}
}
@@ -382,7 +383,7 @@
if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
qzbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_3 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
zjzzzxList.add(unitSelectTerm);
}
}
@@ -429,7 +430,7 @@
}
// 查询村社数组
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+ ctUnitQueryWrapper.eq("parent_id", loginUnit.getId()).eq("unit_grade", UserBaseConsts.UNIT_GRADE_4);
List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
List<SelectTermDTO> csList = new ArrayList<>();
for (CtUnit ctUnit: ctUnitList){
@@ -467,12 +468,26 @@
result.add(firstSelectTermDTO);
return result;
}else {
- return new ArrayList<>();
+ // todo
+ QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
+ ctUnitQueryWrapper.eq("parent_id", loginUnit.getParentId());
+ List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
+ //
+ List<SelectTermDTO> unitList = new ArrayList<>();
+ for (CtUnit ctUnit: ctUnitList){
+ SelectTermDTO unitSelectTerm = new SelectTermDTO();
+ unitSelectTerm.setValue(ctUnit.getId());
+ unitSelectTerm.setLabel(ctUnit.getUnitName());
+ unitSelectTerm.setParentId(ctUnit.getParentId());
+ unitSelectTerm.setCheckable(true);
+ unitList.add(unitSelectTerm);
+ }
+ return unitList;
}
}
/**
- * 交办-选择组织
+ * 联合处置申请-选择组织
* @param userId
* @return
*/
@@ -483,11 +498,11 @@
CtUnit loginUnit = mapper.selectById(loginUser.getUnitId());
QueryWrapper<CtUnit> ctUnitQueryWrapper1 = new QueryWrapper<>();
ctUnitQueryWrapper1.eq("id", loginUnit.getParentId());
- CtUnit superiorUnit = mapper.selectOne(ctUnitQueryWrapper1);
+ CtUnit superiorUnit = mapper.selectById(loginUnit.getParentId());
// 市级
- if (UserBaseConsts.UNIT_GRADE_1 == loginUnit.getUnitGrade()){
+ if (UserBaseConsts.UNIT_GRADE_1 == superiorUnit.getUnitGrade()){
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+ ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId());
List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
// 定义市直部门数组
List<SelectTermDTO> szbmList = new ArrayList<>();
@@ -532,10 +547,10 @@
firstSelectTermDTO.setChildren(firstChildren);
result.add(firstSelectTermDTO);
return result;
- }else if (UserBaseConsts.UNIT_GRADE_2 == loginUnit.getUnitGrade()){
+ }else if (UserBaseConsts.UNIT_GRADE_2 == superiorUnit.getUnitGrade()){
// 区级
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+ ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId());
List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
// 定义市区直部门数组
List<SelectTermDTO> qzbmList = new ArrayList<>();
@@ -580,24 +595,24 @@
firstSelectTermDTO.setChildren(firstChildren);
result.add(firstSelectTermDTO);
return result;
- }else if (UserBaseConsts.UNIT_GRADE_3 == loginUnit.getUnitGrade()){
+ }else if (UserBaseConsts.UNIT_GRADE_3 == superiorUnit.getUnitGrade()){
// 镇街
// 查询镇街部门数组
QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>();
- ctDeptQueryWrapper.eq("unit_id", loginUnit.getId());
+ ctDeptQueryWrapper.eq("unit_id", superiorUnit.getId());
List<CtDept> deptList = ctDeptService.list(ctDeptQueryWrapper);
List<SelectTermDTO> zjbmList = new ArrayList<>();
for (CtDept ctDept: deptList){
SelectTermDTO unitSelectTerm = new SelectTermDTO();
unitSelectTerm.setValue(ctDept.getId());
unitSelectTerm.setLabel(ctDept.getName());
- unitSelectTerm.setParentId(loginUnit.getId());
+ unitSelectTerm.setParentId(superiorUnit.getId());
unitSelectTerm.setCheckable(true);
zjbmList.add(unitSelectTerm);
}
// 查询村社数组
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("parent_id", loginUnit.getId());
+ ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId()).eq("unit_grade", UserBaseConsts.UNIT_GRADE_4);
List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper);
List<SelectTermDTO> csList = new ArrayList<>();
for (CtUnit ctUnit: ctUnitList){
@@ -611,10 +626,6 @@
// 封装返回数据
List<SelectTermDTO> result = new ArrayList<>();
// 创建第一级
- SelectTermDTO firstSelectTermDTO = new SelectTermDTO();
- firstSelectTermDTO.setValue(loginUser.getUnitId());
- firstSelectTermDTO.setLabel(loginUser.getUnitName());
- firstSelectTermDTO.setCheckable(false);
List<SelectTermDTO> firstChildren = new ArrayList<>();
// 村社
SelectTermDTO zjbmSelectTermDTO = new SelectTermDTO();
@@ -631,8 +642,7 @@
csSelectTermDTO.setChildren(csList);
firstChildren.add(csSelectTermDTO);
// 第一级子级
- firstSelectTermDTO.setChildren(firstChildren);
- result.add(firstSelectTermDTO);
+ result.addAll(firstChildren);
return result;
}else {
return new ArrayList<>();
@@ -661,4 +671,34 @@
throw new ServiceException("CtUnitService.getParentZzzx", e);
}
}
+
+ /**
+ * 获取本级综治中心
+ * @param unitId 当前单位编号
+ * @return
+ */
+ public CtUnitDTO getBjZzzx(String unitId){
+ try{
+ CtUnitDTO ctUnitDTO = new CtUnitDTO();
+ // 查询自己是否是综治中心
+ CtUnit loginCtUnit = mapper.selectById(unitId);
+ if (UserBaseConsts.UNIT_TYPE_1 == loginCtUnit.getUnitType()){
+ BeanUtils.copyProperties(loginCtUnit, ctUnitDTO);
+ }else {
+ // 查询当前单位的上级综治中心
+ QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
+ ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1);
+ CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper);
+ BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO);
+ }
+ return ctUnitDTO;
+ }catch (Exception e){
+ log.error("[CtUnitService.getParentZzzx]调用失败，异常信息："+e, e);
+ throw new ServiceException("CtUnitService.getParentZzzx", e);
+ }
+ }
+
+ public CtUnit selectUnitByGridId(String gridUnitId){
+ return mapper.selectUnitByGridId(gridUnitId);
+ }
}
--
Gitblit v1.8.0