三期差了一个接口
This commit is contained in:
@@ -99,22 +99,35 @@ public class SysOaCostController extends BaseController {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
// /**
|
||||
// * 查询所有项目成本
|
||||
// */
|
||||
// @SaCheckPermission("oa:oaCost:list")
|
||||
// @GetMapping("/list")
|
||||
// public TableDataInfo<SysOaCostAllVo> AllList(@RequestParam(required = false) String projectName) {
|
||||
// return iSysOaCostService.AllList(projectName);
|
||||
// }
|
||||
|
||||
/**
|
||||
* 查询所有项目成本
|
||||
*/
|
||||
@SaCheckPermission("oa:oaCost:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysOaCostAllVo> AllList(@RequestParam(required = false) String projectName, @RequestParam(required = false)String createTime) {
|
||||
return iSysOaCostService.AllList(projectName, createTime);
|
||||
public TableDataInfo<SysOaCostAllVo> AllList(SysOaCostBo bo,PageQuery pageQuery) {
|
||||
return iSysOaCostService.calcProjectCostList(bo,pageQuery);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询详情
|
||||
*/
|
||||
@SaCheckPermission("oa:oaCost:query")
|
||||
@GetMapping("/{projectId}")
|
||||
public TableDataInfo<SysOaCostRow> getDetail(@NotNull(message = "项目id不能为空")
|
||||
public R<SysOaCostRow> getDetail(@NotNull(message = "项目id不能为空")
|
||||
@PathVariable Long projectId) {
|
||||
return iSysOaCostService.getDetail(projectId);
|
||||
return R.ok(iSysOaCostService.getDetail(projectId));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user