Forráskód Böngészése

修改swagger响应

qianxb 2 éve
szülő
commit
a26cedd960
13 módosított fájl, 117 hozzáadás és 40 törlés
  1. 13 0
      blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ProjectProcessVO.java
  2. 13 5
      blade-service/blade-control/src/main/java/org/springblade/control/controller/AnnualBudgetController.java
  3. 9 5
      blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractInfoController.java
  4. 3 2
      blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractReturnedInfoController.java
  5. 7 3
      blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentMonthPlanController.java
  6. 3 3
      blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentPlanLogController.java
  7. 2 1
      blade-service/blade-control/src/main/java/org/springblade/control/controller/PlanInformController.java
  8. 10 6
      blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java
  9. 13 7
      blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetStatsController.java
  10. 13 7
      blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectInfoController.java
  11. 20 1
      blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectProcessController.java
  12. 3 0
      blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectProcessService.java
  13. 8 0
      blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectProcessServiceImpl.java

+ 13 - 0
blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ProjectProcessVO.java

@@ -16,4 +16,17 @@ import org.springblade.control.entity.ProjectProcess;
 public class ProjectProcessVO extends ProjectProcess {
     @ApiModelProperty(value = "进程状态值")
     private String statusValue;
+
+    @ApiModelProperty(value = "是否参与")
+    private String isParticipate;
+
+    @ApiModelProperty(value = "成本支出")
+    private String costIncome;
+
+    @ApiModelProperty(value = "时间成本")
+    private String timeCost;
+
+    @ApiModelProperty(value = "人员投入")
+    private String staffTotal;
+
 }

+ 13 - 5
blade-service/blade-control/src/main/java/org/springblade/control/controller/AnnualBudgetController.java

@@ -1,5 +1,6 @@
 package org.springblade.control.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -9,13 +10,20 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.dto.AnnualBudgetDTO;
 import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.AnnualBudget;
 import org.springblade.control.entity.DepartmentMonthPlan;
 import org.springblade.control.service.IAnnualBudgetService;
 import org.springblade.control.service.IDepartmentMonthPlanService;
+import org.springblade.control.vo.AnnualBudgetVO;
+import org.springblade.control.vo.AnnualBudgetVO2;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.control.vo.DictInfoVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -45,7 +53,7 @@ public class AnnualBudgetController {
     @GetMapping("/getAnnualBudget")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取单个年度经营预算")
-    public R getAnnualBudget(Long id) {
+    public R<AnnualBudgetVO> getAnnualBudget(Long id) {
         return R.data(budgetService.getAnnualBudget(id));
     }
 
@@ -82,7 +90,7 @@ public class AnnualBudgetController {
             @ApiImplicitParam(name = "current", value = "当前页", required = true),
             @ApiImplicitParam(name = "size", value = "每页的数量", required = true),
     })
-    public R page(Query query) {
+    public R<IPage<AnnualBudget>> page(Query query) {
         return R.data(budgetService.page(new Page<>(query.getCurrent(), query.getSize())));
     }
 
@@ -92,7 +100,7 @@ public class AnnualBudgetController {
     @GetMapping("/preview")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "查询预览")
-    public R preview(Long id) {
+    public R<AnnualBudgetVO2> preview(Long id) {
         return R.data(budgetService.preview(id));
     }
 
@@ -102,7 +110,7 @@ public class AnnualBudgetController {
     @GetMapping("/getProjectList")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "获取项目列表")
-    public R getProjectList() {
+    public R<List<ControlProjectInfoVO>> getProjectList() {
         return R.data(budgetService.getProjectList());
     }
 
@@ -112,7 +120,7 @@ public class AnnualBudgetController {
     @GetMapping("/getSecondSubject")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "获取二级科目")
-    public R getSecondSubject() {
+    public R<List<DictInfoVO>> getSecondSubject() {
         return R.data(budgetService.getSecondSubject());
     }
 

+ 9 - 5
blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractInfoController.java

@@ -9,6 +9,8 @@ import lombok.AllArgsConstructor;
 import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.dto.ControlProjectInfoDTO;
 import org.springblade.control.entity.ControlContractInfo;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.entity.DictInfo;
 import org.springblade.control.service.IContractInfoService;
 import org.springblade.control.service.IProjectInfoService;
 import org.springblade.control.vo.ControlContractInfoVO;
@@ -16,6 +18,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -73,7 +77,7 @@ public class ContractInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "合同id", required = true),
     })
-    public R getContractInfoById(Long id) {
+    public R<ControlContractInfoVO> getContractInfoById(Long id) {
         return R.data(contractInfoService.getContractInfoById(id));
     }
 
@@ -83,7 +87,7 @@ public class ContractInfoController {
     @GetMapping("/getPage")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "合同列表,分页查询")
-    public R getPage(ControlContractInfoDTO dto,Query query) {
+    public R<List<ControlContractInfoVO>> getPage(ControlContractInfoDTO dto, Query query) {
         return R.data(contractInfoService.getPage(dto,query));
     }
 
@@ -93,7 +97,7 @@ public class ContractInfoController {
     @GetMapping("/getList")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "合同列表,回款更新")
-    public R getList() {
+    public R<List<ControlContractInfo>> getList() {
         return R.data(contractInfoService.getList());
     }
 
@@ -103,7 +107,7 @@ public class ContractInfoController {
     @GetMapping("/getContractTypeDict")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取合同类型字典")
-    public R getContractTypeDict() {
+    public R<List<DictInfo>> getContractTypeDict() {
         return R.data(contractInfoService.getContractTypeDict());
     }
 
@@ -113,7 +117,7 @@ public class ContractInfoController {
     @GetMapping("getNoConnectionProject")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取未被关联的项目")
-    public R getNoConnectionProject(Integer type){
+    public R<List<ControlProjectInfo>> getNoConnectionProject(Integer type){
         return R.data(contractInfoService.getNoConnectionProject(type));
     }
 

+ 3 - 2
blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractReturnedInfoController.java

@@ -12,6 +12,7 @@ import org.springblade.control.entity.ContractReturnedInfo;
 import org.springblade.control.entity.ControlContractInfo;
 import org.springblade.control.service.IContractInfoService;
 import org.springblade.control.service.IContractReturnedInfoService;
+import org.springblade.control.vo.ContractReturnedInfoVO;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,7 +53,7 @@ public class ContractReturnedInfoController {
     @GetMapping("/getListByContractId")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "根据合同ID获取合同回款列表")
-    public R getListByContractId(Long contractId){
+    public R<List<ContractReturnedInfoVO>> getListByContractId(Long contractId){
         return R.data(contractReturnedInfoService.getListByContractId(contractId));
     }
 
@@ -62,7 +63,7 @@ public class ContractReturnedInfoController {
     @GetMapping("/getListByProjectId")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "根据项目ID获取合同回款列表")
-    public R getListByProjectId(Long projectId){
+    public R<List<ContractReturnedInfoVO>> getListByProjectId(Long projectId){
         return R.data(contractReturnedInfoService.getListByProjectId(projectId));
     }
 }

+ 7 - 3
blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentMonthPlanController.java

@@ -11,10 +11,14 @@ import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.entity.DepartmentMonthPlan;
 import org.springblade.control.entity.ProjectReimbursement;
 import org.springblade.control.service.IDepartmentMonthPlanService;
+import org.springblade.control.vo.DepartmentMonthPlanVO;
+import org.springblade.control.vo.ProjectCostBudgetVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -35,7 +39,7 @@ public class DepartmentMonthPlanController {
     @GetMapping("/getPage")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "部门月计划分页")
-    public R getPage(ControlContractInfoDTO dto, Query query) {
+    public R<List<DepartmentMonthPlanVO>> getPage(ControlContractInfoDTO dto, Query query) {
         return R.data(planService.getPage(dto,query));
     }
 
@@ -45,7 +49,7 @@ public class DepartmentMonthPlanController {
     @PostMapping("/addDepartmentPlan")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "新增部门月计划")
-    public R addDepartmentPlan(@RequestBody DepartmentMonthPlan plan) {
+    public R<List<ProjectCostBudgetVO>> addDepartmentPlan(@RequestBody DepartmentMonthPlan plan) {
         return R.data(planService.addDepartmentPlan(plan));
     }
 
@@ -59,7 +63,7 @@ public class DepartmentMonthPlanController {
             @ApiImplicitParam(name = "departmentType", value = "部门名称", required = true),
             @ApiImplicitParam(name = "planDate", value = "计划日期", required = true),
     })
-    public R getDepartmentPlan(@RequestBody DepartmentMonthPlan plan) {
+    public R<List<ProjectCostBudgetVO>> getDepartmentPlan(@RequestBody DepartmentMonthPlan plan) {
         return R.data(planService.getDepartmentPlan(plan));
     }
 

+ 3 - 3
blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentPlanLogController.java

@@ -49,7 +49,7 @@ public class DepartmentPlanLogController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "计划的id", required = true),
     })
-    public R getPlanInPause(Long id) {
+    public R<DepartmentPlanLog> getPlanInPause(Long id) {
         return R.data(logService.getPlanInPause(id));
     }
 
@@ -74,7 +74,7 @@ public class DepartmentPlanLogController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "计划的id", required = true),
     })
-    public R getPlanInOpen(Long id) {
+    public R<DepartmentPlanLog> getPlanInOpen(Long id) {
         return R.data(logService.getPlanInOpen(id));
     }
 
@@ -95,7 +95,7 @@ public class DepartmentPlanLogController {
     @PostMapping("/updateOpenTime")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "修改开启计划时间")
-    public R updateOpenTime(@RequestBody DepartmentPlanLog log) {
+    public R<DepartmentPlanLog> updateOpenTime(@RequestBody DepartmentPlanLog log) {
         return R.data(logService.updateOpenTime(log));
     }
 

+ 2 - 1
blade-service/blade-control/src/main/java/org/springblade/control/controller/PlanInformController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.dto.AnnualBudgetDTO;
 import org.springblade.control.dto.LogHistoryInfoDTO;
+import org.springblade.control.entity.PlanInform;
 import org.springblade.control.service.IAnnualBudgetService;
 import org.springblade.control.service.IPlanInformService;
 import org.springblade.control.vo.LogHistoryInfoVO;
@@ -39,7 +40,7 @@ public class PlanInformController {
     @GetMapping("/getUserInform")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取用户计划通知", notes = "获取用户计划通知")
-    public R getUserInform() {
+    public R<List<PlanInform>> getUserInform() {
         return R.data(informService.getUserInform());
     }
 }

+ 10 - 6
blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java

@@ -10,13 +10,17 @@ import org.springblade.control.dto.ControlProjectInfoDTO;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.entity.ProjectCostBudget;
 import org.springblade.control.service.IProjectCostBudgetService;
+import org.springblade.control.vo.ControlProjectInfoVO;
 import org.springblade.control.vo.ProjectCostBudgetVO;
+import org.springblade.control.vo.ProjectCostBudgetVO3;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Param
@@ -40,7 +44,7 @@ public class ProjectCostBudgetController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "queryValue", value = "搜索值", required = false),
     })
-    public R page(ControlProjectInfoDTO dto, Query query){
+    public R<ControlProjectInfoVO> page(ControlProjectInfoDTO dto, Query query){
         return R.data(budgetService.page(dto,query));
     }
 
@@ -53,7 +57,7 @@ public class ProjectCostBudgetController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "项目id", required = true),
     })
-    public R getPlanByProjectId(Long id){
+    public R<ProjectCostBudgetVO> getPlanByProjectId(Long id){
         return R.data(budgetService.getPlanByProjectId(id));
     }
 
@@ -106,7 +110,7 @@ public class ProjectCostBudgetController {
     @GetMapping("/planOverview")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "门户普通权限总计划统计")
-    public R planOverview(){
+    public R<ProjectCostBudgetVO3> planOverview(){
         return R.data(budgetService.planOverview());
     }
 
@@ -116,7 +120,7 @@ public class ProjectCostBudgetController {
     @GetMapping("/postponePlan")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "门户普通权限预警")
-    public R postponePlan(){
+    public R<List<ProjectCostBudgetVO3>> postponePlan(){
         return R.data(budgetService.postponePlan());
     }
 
@@ -126,7 +130,7 @@ public class ProjectCostBudgetController {
     @GetMapping("/MonthPlanOverview")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "门户普通权限单月计划统计")
-    public R MonthPlanOverview(String planDate){
+    public R<ProjectCostBudgetVO3> MonthPlanOverview(String planDate){
         return R.data(budgetService.MonthPlanOverview(planDate));
     }
 
@@ -136,7 +140,7 @@ public class ProjectCostBudgetController {
     @GetMapping("/MonthOfYearPlanOverview")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "门户普通权限计划统计图")
-    public R MonthOfYearPlanOverview(){
+    public R<List<Map<String,List<Integer>>>> MonthOfYearPlanOverview(){
         return R.data(budgetService.MonthOfYearPlanOverview());
     }
 

+ 13 - 7
blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetStatsController.java

@@ -8,13 +8,19 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.dto.ProjectCostBudgetStatsDTO;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.entity.DictInfo;
 import org.springblade.control.entity.ProjectCostBudget;
+import org.springblade.control.entity.ProjectProcess;
 import org.springblade.control.service.IProjectCostBudgetService;
 import org.springblade.control.service.IProjectCostBudgetStatsService;
+import org.springblade.control.vo.ProjectCostBudgetStatsVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -51,7 +57,7 @@ public class ProjectCostBudgetStatsController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "成本预算统计id", required = true),
     })
-    public R getBudgetStatsById(Long id) {
+    public R<ProjectCostBudgetStatsVO> getBudgetStatsById(Long id) {
         return R.data(budgetStatsService.getBudgetStatsById(id));
     }
 
@@ -78,7 +84,7 @@ public class ProjectCostBudgetStatsController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "queryValue", value = "搜索值", required = false),
     })
-    public R page(String queryValue, Query query){
+    public R<List<ProjectCostBudgetStatsVO>> page(String queryValue, Query query){
         return R.data(budgetStatsService.page(queryValue,query));
     }
 
@@ -93,7 +99,7 @@ public class ProjectCostBudgetStatsController {
             @ApiImplicitParam(name = "costType", value = "费用类型", required = false),
             @ApiImplicitParam(name = "unitType", value = "单位类型1施工2监理3建设", required = false),
     })
-    public R budgetList(ProjectCostBudget costBudget) {
+    public R<ProjectCostBudgetStatsVO> budgetList(ProjectCostBudget costBudget) {
         return R.data(budgetStatsService.budgetList(costBudget));
     }
 
@@ -103,7 +109,7 @@ public class ProjectCostBudgetStatsController {
     @GetMapping("/getProjectList")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取未做预算的项目列表")
-    public R getProjectList(Integer type) {
+    public R<List<ControlProjectInfo>> getProjectList(Integer type) {
         return R.data(budgetStatsService.getProjectList(type));
     }
 
@@ -113,7 +119,7 @@ public class ProjectCostBudgetStatsController {
     @GetMapping("/getCostTypeDict")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取费用分类")
-    public R getCostTypeDict() {
+    public R<List<DictInfo>> getCostTypeDict() {
         return R.data(budgetStatsService.getCostTypeDict());
     }
 
@@ -123,7 +129,7 @@ public class ProjectCostBudgetStatsController {
     @GetMapping("/getProcessList")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取项目环节")
-    public R getProcessList(Long projectId) {
+    public R<List<ProjectProcess>> getProcessList(Long projectId) {
         return R.data(budgetStatsService.getProcessList(projectId));
     }
 
@@ -133,7 +139,7 @@ public class ProjectCostBudgetStatsController {
     @GetMapping("/getPostDict")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取岗位字典")
-    public R getPostDict() {
+    public R<List<DictInfo>> getPostDict() {
         return R.data(budgetStatsService.getPostDict());
     }
 

+ 13 - 7
blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectInfoController.java

@@ -1,5 +1,6 @@
 package org.springblade.control.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -9,11 +10,16 @@ import lombok.AllArgsConstructor;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.control.dto.ControlProjectInfoDTO;
 import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.entity.DictInfo;
 import org.springblade.control.service.IProjectInfoService;
+import org.springblade.control.vo.AllProjectStatsVO;
+import org.springblade.control.vo.ControlProjectInfoVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -36,7 +42,7 @@ public class ProjectInfoController {
             @ApiImplicitParam(name = "current", value = "当前页", required = true),
             @ApiImplicitParam(name = "size", value = "每页的数量", required = true),
     })
-    public R page(ControlProjectInfoDTO dto, Query query) {
+    public R<IPage<ControlProjectInfoVO>> page(ControlProjectInfoDTO dto, Query query) {
         return R.data(projectInfoService.page(dto, query));
     }
 
@@ -85,7 +91,7 @@ public class ProjectInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "项目id", required = true),
     })
-    public R getProjectInfoById(Long id) {
+    public R<ControlProjectInfoVO> getProjectInfoById(Long id) {
         return R.data(projectInfoService.getProjectInfoById(id));
     }
 
@@ -95,7 +101,7 @@ public class ProjectInfoController {
     @GetMapping("/getProjectTypeDict")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取项目类型字典")
-    public R getProjectTypeDict() {
+    public R<List<DictInfo>> getProjectTypeDict() {
         return R.data(projectInfoService.getProjectTypeDict());
     }
 
@@ -105,7 +111,7 @@ public class ProjectInfoController {
     @GetMapping("/getProjectServerTypeDict")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取项目服务类型字典")
-    public R getProjectServerTypeDict() {
+    public R<List<DictInfo>> getProjectServerTypeDict() {
         return R.data(projectInfoService.getProjectServerTypeDict());
     }
 
@@ -115,7 +121,7 @@ public class ProjectInfoController {
     @GetMapping("/allProjectStats")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "项目统计总金额成本")
-    public R allProjectStats() {
+    public R<AllProjectStatsVO> allProjectStats() {
         return R.data(projectInfoService.allProjectStats());
     }
 
@@ -125,7 +131,7 @@ public class ProjectInfoController {
     @GetMapping("/ProjectListStats")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "项目统计列表统计")
-    public R ProjectListStats() {
+    public R<List<AllProjectStatsVO>> ProjectListStats() {
         return R.data(projectInfoService.ProjectListStats());
     }
 
@@ -135,7 +141,7 @@ public class ProjectInfoController {
     @GetMapping("/ProjectCostTypeStats")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "项目统计费用分类")
-    public R ProjectCostTypeStats(Long id) {
+    public R<List<AllProjectStatsVO>> ProjectCostTypeStats(Long id) {
         return R.data(projectInfoService.ProjectCostTypeStats(id));
     }
 

+ 20 - 1
blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectProcessController.java

@@ -4,14 +4,19 @@ package org.springblade.control.controller;
 import cn.hutool.core.util.ReUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.service.IProjectProcessService;
+import org.springblade.control.vo.ProjectProcessVO;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -27,7 +32,21 @@ public class ProjectProcessController {
     @GetMapping("/getBaseProcess")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "新增项目获取项目流程")
-    public R getBaseProcess() {
+    public R<List<ProjectProcessVO>> getBaseProcess() {
         return R.data(processService.getBaseProcess());
     }
+
+    /**
+     * 项目统计-环节费用
+     */
+    @GetMapping("/projectLinkCost")
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "项目统计-环节费用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectId", value = "项目id", required = true),
+            @ApiImplicitParam(name = "costType", value = "费用分类", required = true),
+    })
+    public R<List<ProjectProcessVO>> projectLinkCost(Long projectId,Integer costType) {
+        return R.data(processService.processService(projectId, costType));
+    }
 }

+ 3 - 0
blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectProcessService.java

@@ -22,4 +22,7 @@ public interface IProjectProcessService extends BaseService<ProjectProcess> {
     List<ProjectProcessVO> getBaseProcess();
 
     List<ProjectProcessVO> getProjectProcess(Long id);
+
+    List<ProjectProcessVO> processService(Long projectId, Integer costType);
+
 }

+ 8 - 0
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectProcessServiceImpl.java

@@ -103,4 +103,12 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessMap
         });
         return list;
     }
+
+    /**
+     * 项目统计-环节费用
+     */
+    @Override
+    public List<ProjectProcessVO> processService(Long projectId, Integer costType) {
+        return null;
+    }
 }