From bc531bac2ad8aeb15723b2ee16fac5b74827f2b6 Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Sun, 15 Sep 2024 13:33:14 +0800 Subject: [PATCH] 联合处置查询组织接口 首页查询-待分派接口修改 案件登记接口添加默认属地 申请记录接口添加附件查询 --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java | 81 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 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 ca19698..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; @@ -203,7 +208,7 @@ if (StringUtils.isNotBlank(dispStatus)){ terms.put("dispStatus", dispStatus); } - // 删除状态,0:已删除,1:未删除 + // 删除状态,0:未删除,1:已删除 String deleteStatus = request.getParameter("deleteStatus"); if (StringUtils.isNotBlank(deleteStatus)){ terms.put("deleteStatus", deleteStatus); @@ -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 */ @@ -347,4 +352,74 @@ return ReturnFailUtils.getRepInfo( "查询失败", null); } } + + /** + * 根据主键编号删除单位 + * @url {ctx}/api/web/ctUnit/removeByIds + * @param ids 主键编号 + * @return Object + * @throws Exception + */ + @GetMapping("/removeByIds") + public Object removeByIds(@RequestParam(value = "ids") String ids) { + try { + service.removeById(ids); + return ReturnSucUtils.getRepInfo(); + } catch (Exception e) { + log.error("Controller接口[CtUnitController.removeByIds]请求异常:"+e, e); + 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