From b311ca2f01e9602c1bf8caab04b4d641b314e341 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 29 Sep 2024 12:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java
index 6307b5d..1dcca18 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java
@@ -3,9 +3,12 @@
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;
import cn.huge.module.cases.domain.dto.CaseRegisterDTO;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.cases.service.CaseInfoService;
+import cn.huge.module.client.api.impl.CustClientImpl;
+import cn.huge.module.cust.dto.CtUserDTO;
import com.google.common.collect.Maps;
import dm.jdbc.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -106,6 +109,11 @@
if (org.apache.commons.lang3.StringUtils.isNotBlank(mediResultName)) {
terms.put("mediResultName", mediResultName);
}
+ // 事项状态名称
+ String mediResult = request.getParameter("mediResult");
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(mediResult)) {
+ terms.put("mediResult", mediResult);
+ }
// 登记时间区间
String createStart = request.getParameter("createStart");
String createEnd = request.getParameter("createEnd");
@@ -118,10 +126,12 @@
@Autowired
private CaseInfoService service;
+ @Autowired
+ private CustClientImpl custClient;
@GetMapping("/pageQuery")
public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size
- ) {
+ , @CurrentUser String userId) {
try {
Map<String, Object> terms = getParameter();
// 排序
@@ -161,6 +171,9 @@
}
PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ log.info("xsd:user{}",loginUser.getUnitId());
+ terms.put("inputUnitId", loginUser.getUnitId());
Page<CaseRegisterDTO> caseInfoPage = service.pageQueryRegister(pageRequest, terms);
return ReturnSucUtils.getRepInfo("处理成功", caseInfoPage);
} catch (Exception e) {
--
Gitblit v1.8.0