DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加报工记录代码

Browse Source 
修复报工的排序问题
This commit is contained in:
86156
2025-06-19 15:43:57 +08:00
parent ec425b2b36
commit 213488feb6
13 changed files with 366 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java
View File

@@ -1,14 +1,18 @@
package com.ruoyi.oa.controller;
import java.time.LocalDate;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.domain.vo.ProjectReportCardVo;
import com.ruoyi.oa.domain.vo.ProjectReportPieVo;
import com.ruoyi.oa.domain.vo.ProjectReportTrendVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -49,6 +53,16 @@ public class OaProjectReportController extends BaseController {
return iOaProjectReportService.queryPageList(bo, pageQuery);
}
/**
* 查询项目报工列表
*/
@SaCheckPermission("oa:projectReport:list")
@GetMapping("/report")
public R<List<OaProjectReportVo>> clearList( @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end) {
return R.ok(iOaProjectReportService.clearList(start,end));
}
/**
* 导出项目报工列表
*/
@@ -108,6 +122,19 @@ public class OaProjectReportController extends BaseController {
}
/**
* 数据统计接口
*/
@GetMapping("/rank")
public R<List<OaProjectReportVo>> getRankData(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end
){
return R.ok(iOaProjectReportService.getRankData(start,end));
}
/**
* 数据统计接口
*/
@@ -116,4 +143,39 @@ public class OaProjectReportController extends BaseController {
return R.ok(iOaProjectReportService.getCardData());
}
/**
* GET /api/reports/trend?start=2025-06-01&end=2025-06-07
*/
@GetMapping("/trend")
public R<List<ProjectReportTrendVo>> trend(
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end
) {
return R.ok(iOaProjectReportService.getTrend(start, end));
}
/**
* GET /api/reports/distribution
*/
@GetMapping("/distribution")
public R<List<ProjectReportPieVo>> distribution(
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end
) {
return R.ok(iOaProjectReportService.getDistribution(start,end));
}
@GetMapping("/projects")
public R<List<OaProjectReportVo>> getProjects( @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end) {
return R.ok(iOaProjectReportService.getProjects(start,end));
}
@GetMapping("/summary")
public R<List<OaProjectReportVo>> summary( @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end) {
return R.ok(iOaProjectReportService.getSummaryData(start,end));
}
}