From 031c3f247dc71727f74f26cf835e065fad500e08 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 10 Sep 2024 11:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java
index d829d16..e05e975 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java
@@ -5,7 +5,7 @@
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.CaseInfoWechatDTO;
+import cn.huge.module.cases.domain.dto.CaseInfoWeChatDTO;
import cn.huge.module.cases.domain.dto.RegisterSaveDTO;
import cn.huge.module.cases.service.CaseInfoService;
import cn.huge.module.client.api.impl.UtilsClientImpl;
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -64,19 +65,7 @@
// 办理进度，1：待受理，2：办理中，3：已结案，4：不予受理
String processStatus = request.getParameter("processStatus");
if (StringUtils.isNotBlank(processStatus)){
- if("1".equals(processStatus)){
- List<Integer> processList = Arrays.asList(1,2);
- terms.put("processList", processList);
- }else if("2".equals(processStatus)){
- List<Integer> processList = Arrays.asList(3,4);
- terms.put("processList", processList);
- }else if("3".equals(processStatus)){
- List<Integer> processList = Arrays.asList(5,6);
- terms.put("processList", processList);
- }else{
- List<Integer> processList = Arrays.asList(7);
- terms.put("processList", processList);
- }
+ terms.put("infoProcess", processStatus);
}
return terms;
@@ -91,13 +80,12 @@
* @CurrentUser String userId,
*/
@GetMapping("/pageCard")
- public Object pageCard(@CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ public Object pageCard( @CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
-// String userId = "2408301111391000";
Map<String, Object> terms = getParameter();
Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- Page<CaseInfoWechatDTO> caseInfoPage = service.pageQueryWechat(userId,pageRequest, terms);
+ Page<CaseInfoWeChatDTO> caseInfoPage = service.pageQueryWechat(userId,pageRequest, terms);
return ReturnSucUtils.getRepInfo( "处理成功", caseInfoPage);
} catch (Exception e) {
log.error("Controller接口[CaseInfoWechatController.pageCard]请求异常："+e, e);
@@ -134,7 +122,7 @@
/**
* 小程序端-查看案件详情
- * @url {ctx}/api/v1/caseInfo/getCaseInfo
+ * @url {ctx}/api/wechat/caseInfo/getCaseInfo
*/
@GetMapping("/getCaseInfo")
public Object getCaseInfo(@RequestParam(value = "id") String id) {
--
Gitblit v1.8.0