bug修改

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();

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;