11/1

src/main/java/cn/cslg/pas/controller/CommonController.java

@@ -10,6 +10,7 @@ import cn.cslg.pas.common.vo.EntityVO;
 import cn.cslg.pas.common.vo.PersonSelfFieldVO;
 import cn.cslg.pas.common.vo.business.ScenarioVO;
 import cn.cslg.pas.domain.business.AssoScenarioMatter;
+import cn.cslg.pas.domain.business.Matter;
 import cn.cslg.pas.domain.business.SystemDict;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
 import cn.cslg.pas.service.business.AssoScenarioMatterService;
@@ -95,14 +96,16 @@ public class CommonController {
     @GetMapping("/scenario")
     @Operation(summary = "查询应用场景")
     public Response queryAllScenario(){
-        Records records =new Records();
+        Records records = new Records();
         records.setData(scenarioService.queryAll());
         return Response.success(records);
     }
 
     @PostMapping("/matter")
     @Operation(summary = "查询处理事项")
-    public List<Integer> queryMatter(@RequestBody List<Integer> scenarioIds){
-        return assoScenarioMatterService.queryMatterIds(scenarioIds);
+    public Response queryMatter(@RequestBody List<Integer> scenarioIds){
+        Records records = new Records();
+        records.setData(assoScenarioMatterService.queryMatterIds(scenarioIds));
+        return Response.success(records);
     }
 }

src/main/java/cn/cslg/pas/service/business/AssoScenarioMatterService.java

@@ -1,11 +1,13 @@
 package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.domain.business.AssoScenarioMatter;
+import cn.cslg.pas.domain.business.Matter;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.AssoScenarioMatterMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -19,21 +21,28 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class AssoScenarioMatterService extends ServiceImpl<AssoScenarioMatterMapper, AssoScenarioMatter> {
+    @Autowired
+    private MatterService matterService;
+
     /**
      * 根据应用场景id查询处理事项id集合
      * @param scenarioIds
      * @return
      */
-    public List<Integer> queryMatterIds(List<Integer> scenarioIds){
+    public List<Matter> queryMatterIds(List<Integer> scenarioIds){
         List<Integer> matterIds = new ArrayList<>();
+        List<Matter> matters = new ArrayList<>();
         if(scenarioIds != null && scenarioIds.size() != 0){
             LambdaQueryWrapper<AssoScenarioMatter> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(AssoScenarioMatter::getScenarioId, scenarioIds);
             List<AssoScenarioMatter> assoScenarioMatters = this.list(queryWrapper);
             matterIds = assoScenarioMatters.stream().map(AssoScenarioMatter::getMatterId).distinct().collect(Collectors.toList());
+            LambdaQueryWrapper<Matter> matterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            matterLambdaQueryWrapper.in(Matter::getId, matterIds);
+            matters = matterService.list(matterLambdaQueryWrapper);
         } else {
             throw new XiaoShiException("scenarioIds不能为空");
         }
-        return matterIds;
+        return matters;
     }
 }

src/test/java/cn/cslg/pas/service/CommonServiceTests.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.business.ScenarioVO;
 import cn.cslg.pas.controller.CommonController;
 import cn.cslg.pas.controller.EventController;
+import cn.cslg.pas.domain.business.Matter;
 import cn.cslg.pas.service.business.CommonService;
 import cn.cslg.pas.service.permissions.PermissionService;
 import org.assertj.core.internal.Arrays;
@@ -54,8 +55,8 @@ public class CommonServiceTests {
         scenarioIds.add(1);
         scenarioIds.add(2);
 //        scenarioIds.add(3);
-        List<Integer> matterIds = commonController.queryMatter(scenarioIds);
-        System.out.println(matterIds);
+//        List<Matter> matterIds = commonController.queryMatter(scenarioIds);
+//        System.out.println(matterIds);
     }
 
 }