From f0f50b4d7f3a92532e7c462de3085708cc7e62f2 Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Mon, 1 Jul 2024 15:43:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/busiz/web/ComplexApiController.java | 15 ++++++++++-----
.../mortals/xhx/common/code/EventObjectType.java | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java b/complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java
index dacea95..1bf0914 100644
--- a/complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java
+++ b/complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java
@@ -23,6 +23,7 @@ import com.mortals.xhx.busiz.rsp.material.ComplexMaterialInfo;
import com.mortals.xhx.busiz.rsp.situation.ComplexStituationInfo;
import com.mortals.xhx.busiz.rsp.work.ComplexWorkInfo;
import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.common.code.EventObjectType;
import com.mortals.xhx.module.matter.model.ApplyMatterEntity;
import com.mortals.xhx.module.matter.model.ApplyMatterQuery;
import com.mortals.xhx.module.matter.model.EventImplementationEntity;
@@ -42,10 +43,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collector;
import java.util.stream.Collectors;
@@ -90,8 +88,15 @@ public class ComplexApiController {
int currentPage = req.getCurrentPage()==null?1:req.getCurrentPage();
PageInfo pageInfo = new PageInfo(pageSize);
pageInfo.setCurrPage(currentPage);
- ApplyMatterEntity query = new ApplyMatterEntity();
+ ApplyMatterQuery query = new ApplyMatterQuery();
BeanUtils.copyProperties(req, query);
+ if(com.mortals.framework.util.StringUtils.isNotEmpty(req.getEventObjectType())) {
+ query.setEventObjectType(null);
+ List<String> eventObjectTypeList = new ArrayList<>();
+ eventObjectTypeList.add(EventObjectType.涓汉浠ュ強浼佷笟.getValue());
+ eventObjectTypeList.add(req.getEventObjectType());
+ query.setEventObjectTypeList(eventObjectTypeList);
+ }
Result<ApplyMatterEntity> result = applyMatterService.find(query,pageInfo,null);
Map<String, Object> model = new HashMap();
diff --git a/complex-window-manager/src/main/java/com/mortals/xhx/common/code/EventObjectType.java b/complex-window-manager/src/main/java/com/mortals/xhx/common/code/EventObjectType.java
index 6fe9b89..3ee9353 100644
--- a/complex-window-manager/src/main/java/com/mortals/xhx/common/code/EventObjectType.java
+++ b/complex-window-manager/src/main/java/com/mortals/xhx/common/code/EventObjectType.java
@@ -6,7 +6,7 @@ import java.util.Map;
public enum EventObjectType {
涓汉("P", "涓汉"),
浼佷笟("O", "浼佷笟"),
- 涓汉浠ュ強浼佷笟("O", "涓汉浠ュ強浼佷笟");
+ 涓汉浠ュ強浼佷笟("O/P", "涓汉浠ュ強浼佷笟");
private String value;
private String desc;
--
2.24.3