Merge branch 'dev-2.8.0' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/projectManagement/modular/analysisInfo/controller/AnalysisController.java

@@ -1,5 +1,6 @@
 package com.unis.projectManagement.modular.analysisInfo.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -9,14 +10,18 @@ import com.unis.projectManagement.modular.analysisInfo.entity.AnalysisPageListPa
 import com.unis.projectManagement.modular.analysisInfo.entity.AnalysisPageParam;
 import com.unis.projectManagement.modular.analysisInfo.service.AnalysisService;
 import com.unis.projectManagement.modular.pmApplication.entity.PmApplication;
+import com.unis.projectManagement.modular.projectInfoPlan.entity.ProjectInfoPlan;
+import com.unis.projectManagement.modular.projectInfoPlan.service.ProjectInfoPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author qingsong.han
@@ -31,6 +36,8 @@ import javax.annotation.Resource;
 public class AnalysisController {
     @Resource
     private AnalysisService analysisService;
+    @Resource
+    private ProjectInfoPlanService projectInfoPlanService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取分页")
@@ -39,7 +46,16 @@ public class AnalysisController {
         return CommonResult.data(analysisService.getPage(param));
     }
 
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("详情列表数据")
+    @GetMapping("/getDetailList/{pmApplicationId}")
+    public CommonResult<List<ProjectInfoPlan>> getDetailList(@PathVariable("pmApplicationId") String pmApplicationId) {
+        QueryWrapper<ProjectInfoPlan> wrapper = new QueryWrapper<>();
+        wrapper.eq("pm_application_id", pmApplicationId);
+        return CommonResult.data(projectInfoPlanService.list(wrapper));
+    }
+
+    @ApiOperationSupport(order = 3)
     @ApiOperation("获取统计(项目类型,资金来源)")
     @GetMapping("/getCount")
     public CommonResult<AnalysisCountParam> getCount() {