From de9369d2c8056e2bb723247b0e877fe9d96f8def Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 15 Sep 2024 15:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
index a396678..d205bea 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
@@ -1,12 +1,17 @@
package cn.huge.module.ctuser.controller.web;
+import cn.huge.base.common.dto.SelectTermDTO;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.base.config.CurrentUser;
import cn.huge.module.ctuser.domain.po.CtUnit;
import cn.huge.module.ctuser.domain.po.CtUser;
+import cn.huge.module.ctuser.dto.AppearUnitDTO;
import cn.huge.module.ctuser.service.CtUnitService;
import cn.huge.module.ctuser.service.CtUserService;
+import cn.huge.module.cust.dto.CtUnitDTO;
+import cn.huge.module.cust.dto.CtUserDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -314,7 +319,7 @@
/**
* 获取所有组织（包含所有下级子组织）树形结构
- * @url {ctx}/api/v1/ctUnit/listUnitTree
+ * @url {ctx}/api/web/ctUnit/listUnitTree
* @param userId 登录用户标识称
* @return Object
*/
@@ -333,7 +338,7 @@
/**
* 获取组织详情（包含组织下的部门详情）
- * @url {ctx}/api/v1/ctUnit/getUnitAndDept?id=
+ * @url {ctx}/api/web/ctUnit/getUnitAndDept?id=
* @param id 组织编号
* @return Object
*/
@@ -350,7 +355,7 @@
/**
* 根据主键编号删除单位
- * @url {ctx}/api/v1/ctUnit/removeByIds
+ * @url {ctx}/api/web/ctUnit/removeByIds
* @param ids 主键编号
* @return Object
* @throws Exception
@@ -365,4 +370,56 @@
return ReturnFailUtils.getRepInfo();
}
}
+
+ /**
+ * 交办-选择组织
+ * @url {ctx}/api/web/ctUnit/unitChoose
+ * @param userId 组织编号
+ * @return Object
+ */
+ @GetMapping("/unitChoose")
+ public Object unitChoose(@CurrentUser String userId) {
+ try {
+ List<SelectTermDTO> unitSelectTerms = service.unitChoose(userId);
+ return ReturnSucUtils.getRepInfo(unitSelectTerms);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 联合处置申请-选择组织
+ * @url {ctx}/api/web/ctUnit/assistApplyUnitChoose
+ * @param userId 组织编号
+ * @return Object
+ */
+ @GetMapping("/assistApplyUnitChoose")
+ public Object assistApplyUnitChoose(@CurrentUser String userId) {
+ try {
+ List<SelectTermDTO> unitSelectTerms = service.assistApplyUnitChoose(userId);
+ return ReturnSucUtils.getRepInfo(unitSelectTerms);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * web端任务处理-上报-查询上报的目标组织
+ * @url {ctx}/api/web/ctUnit/getAppearToUnit
+ * @return Object
+ */
+ @GetMapping("/getAppearToUnit")
+ public Object getAppearToUnit(@CurrentUser String userId) {
+ try {
+ // 获取当前登录用户
+ CtUserDTO loginUser = ctUserService.clientGetUserAll(userId);
+ CtUnitDTO ctUnitDTO = service.getParentZzzx(loginUser.getUnitId());
+ AppearUnitDTO appearUnitDTO = new AppearUnitDTO();
+ appearUnitDTO.setAuditUnitId(ctUnitDTO.getId());
+ appearUnitDTO.setAuditUnitName(ctUnitDTO.getUnitName());
+ return ReturnSucUtils.getRepInfo(appearUnitDTO);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0