From c2bf4ed2478aa57dddf865f440005f0ed133b110 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 27 Sep 2024 12:01:32 +0800
Subject: [PATCH] 1、自行受理流程优化 2、更新组织的地域编码 3、结案归档节点优化
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
index 006669a..11a3b5e 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
@@ -1,5 +1,6 @@
package cn.huge.module.ctuser.controller.client;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.base.config.CurrentUser;
@@ -7,18 +8,20 @@
import cn.huge.module.ctuser.domain.po.CtUser;
import cn.huge.module.ctuser.service.CtUnitService;
import cn.huge.module.ctuser.service.CtUserService;
-import com.google.common.collect.Maps;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import cn.huge.module.cust.dto.CtUnitDTO;
+import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.region.domain.po.SyRegionGrid;
+import cn.huge.module.region.service.SyRegionGridService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
-import java.util.Map;
/**
* @title: 客户组织信息表接口api-微服务调用
@@ -50,7 +53,89 @@
@PostMapping("/saveCtUnitList")
public Object saveCtUnitList(@RequestBody List<CtUnit> targetCtUnitList) {
try {
- service.saveBatch(targetCtUnitList);
+ service.saveBatch(targetCtUnitList,1000);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据id查询组织信息
+ * @url {ctx}/api/client/ctUnit/getUnitById
+ * @param unitId 组织编号
+ * @return Object
+ */
+ @GetMapping("/getUnitById")
+ public Object getUnitById(@RequestParam(value = "unitId") String unitId) {
+ try {
+ CtUnit ctUnit = service.getById(unitId);
+ if (ObjectUtils.isNotEmpty(ctUnit)){
+ CtUnitDTO ctUnitDTO = new CtUnitDTO();
+ BeanUtils.copyProperties(ctUnit, ctUnitDTO);
+ return ReturnSucUtils.getRepInfo(ctUnitDTO);
+ }else {
+ return ReturnFailUtils.getRepInfo("查询组织不存在！");
+ }
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 获取上级综治中心
+ * @url {ctx}/api/client/ctUnit/getParentZzzxUnit
+ * @param unitId 组织编号
+ * @return Object
+ */
+ @GetMapping("/getParentZzzxUnit")
+ public Object getParentZzzxUnit(@RequestParam(value = "unitId") String unitId) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.getParentZzzx(unitId));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ @Autowired
+ private SyRegionGridService syRegionGridService;
+ /**
+ * 更新组织的地域编码
+ * @url {ctx}/api/client/ctUnit/update1
+ * @return Object
+ */
+ @GetMapping("/update1")
+ public Object update1() {
+ try {
+ List<CtUnit> ctUnitList = service.list();
+ for (CtUnit ctUnit: ctUnitList){
+ ctUnit.setArea("440111");
+ // 镇街级
+ if (StringUtils.isNotEmpty(ctUnit.getRoad())){
+ QueryWrapper<SyRegionGrid> syRegionGridQueryWrapper = new QueryWrapper<>();
+ syRegionGridQueryWrapper.eq("region_id", ctUnit.getRoad());
+ SyRegionGrid syRegionGrid = syRegionGridService.getOne(syRegionGridQueryWrapper);
+ if (ObjectUtils.isNotEmpty(syRegionGrid)){
+ ctUnit.setRoad(syRegionGrid.getThirdCode());
+ }
+ }
+ // 村社级
+ if (UserBaseConsts.UNIT_GRADE_4 == ctUnit.getUnitGrade()){
+ try{
+ QueryWrapper<SyRegionGrid> syRegionGridQueryWrapper = new QueryWrapper<>();
+ String thirdName = ctUnit.getUnitName().replace("居委会", "").replace("人民调解委员会", "");
+ syRegionGridQueryWrapper.like("third_name", thirdName);
+ SyRegionGrid syRegionGrid = syRegionGridService.getOne(syRegionGridQueryWrapper);
+ if (ObjectUtils.isNotEmpty(syRegionGrid)){
+ ctUnit.setVillage(syRegionGrid.getThirdCode());
+ ctUnit.setVillageName(syRegionGrid.getThirdName());
+ }
+ }catch (Exception e){
+ log.error("报错村社：id-"+ctUnit.getId()+"，name-"+ctUnit.getUnitName());
+ }
+ }
+ service.updateCtUnit(ctUnit);
+ }
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
--
Gitblit v1.8.0