|
@@ -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));
|
|
|
}
|
|
|
|