From 0b597ea4500b3463ac9f0983dbabaca52417226c Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 12:21:37 +0800
Subject: [PATCH] 回退上报流程bug修复2
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 c769797..1dcc517 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
@@ -6,8 +6,12 @@
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;
@@ -370,6 +374,7 @@
/**
* 交办-选择组织
* @url {ctx}/api/web/ctUnit/unitChoose
+ * @param userId 组织编号
* @return Object
*/
@GetMapping("/unitChoose")
@@ -381,4 +386,40 @@
return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
+
+ /**
+ * 联合处置申请-选择组织
+ * @url {ctx}/api/web/ctUnit/unitChoose
+ * @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