From 7c3418c45926b5288b22044d60dbb12fa2c982d0 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 27 Sep 2024 18:02:40 +0800
Subject: [PATCH] 大厅登记接口优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 4 ++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java | 10 +++++++++-
2 files changed, 11 insertions(+), 3 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..f73c427 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;
@@ -118,10 +121,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 +166,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) {
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 00f3fad..7edc11c 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -706,8 +706,8 @@
<sql id="where-register-part">
<if test="terms != null">
<where>
- <if test="terms.inputUnitName != null and terms.inputUnitName !=''">
- and t1.input_unit_mame = #{inputUnitName}
+ <if test="terms.inputUnitId != null and terms.inputUnitId !=''">
+ and t1.input_unit_id = #{terms.inputUnitId}
</if>
<if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
--
Gitblit v1.8.0