From fd3d6d30afb9041c2cc3099833b7683e12c7daff Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Sun, 22 Sep 2024 10:00:36 +0800 Subject: [PATCH] 督办信息兼容新需求 查询待办任务-督办 首页-督办-我发起的 功能兼容 添加督办逻辑修改 新增全部签收接口 首页-待审核-我申请的 新增接口 办理反馈新增承办/配合部门判断 新增查询督办详情接口 查询时限接口bug修复 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java index 8435da6..9e43ec4 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java @@ -177,7 +177,7 @@ } /** - * 根据编号查询单个 + * 根据督办编号查询督办信息 * @url {ctx}/api/web/caseSupervise/getById * @param id 主键编号 * @return Object @@ -256,19 +256,27 @@ } /** - * 督办信息查询 + * 督办信息分页查询 * @url {ctx}/api/web/caseSupervise/pageCaseSupervise + * @param page 页码 + * @param size 每页数量 * @param caseId 主键编号 + * @param type 查询类型 0:与案件相关信息 ,1:与案件和组织相关信息 * @return Object */ @GetMapping("/pageCaseSupervise") public Object pageCaseSupervise(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, - @RequestParam(value = "caseId") String caseId, @RequestParam(value = "supStatus") int supStatus, - @CurrentUser String userId) { + @RequestParam(value = "caseId") String caseId, + @RequestParam(value = "type") int type, @CurrentUser String userId) { try { + // 督办状态,0:未回复,1:已回复 + Integer supStatus = 0; + if(StringUtils.isNotBlank(request.getParameter("supStatus"))){ + supStatus = Integer.valueOf(request.getParameter("supStatus")); + } Sort sort = Sort.by(Sort.Direction.DESC, "create_time"); PageRequest pageRequest = PageRequest.of(page-1, size, sort); - return ReturnSucUtils.getRepInfo(service.pageCaseSupervise(caseId, pageRequest, supStatus, userId)); + return ReturnSucUtils.getRepInfo(service.pageCaseSupervise(caseId, pageRequest, supStatus, userId, type)); } catch (Exception e) { return ReturnFailUtils.getRepInfo(); } -- Gitblit v1.8.0