From d6c07c838abeabdd23c4fdcfc69e08a9aaa9725f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 02 三月 2026 17:52:04 +0800
Subject: [PATCH] yys 劳保报表开发
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index d94cb1a..2fbb16f 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -86,12 +86,20 @@
.lt(LaborIssue::getCreateTime, dateTime.getEndDate()));
String formattedCount = String.format("%03d", approveId + 1);
laborIssue1.setOrderNo(today + formattedCount);
-// List<LaborIssue> laborIssues = lavorIssueMapper.selectList(new LambdaQueryWrapper<LaborIssue>()
-// .like(LaborIssue::getOrderNo, today));
-// if(!CollectionUtils.isEmpty(laborIssues)){
-// long l = Long.parseLong(laborIssues.get(laborIssues.size() - 1).getOrderNo());
-// issue.setOrderNo(String.format("%03d", l + 1));
-// }
+ List<LaborIssue> laborIssues = lavorIssueMapper.selectList(new LambdaQueryWrapper<LaborIssue>()
+ .like(LaborIssue::getOrderNo, today)
+ .orderByDesc(LaborIssue::getOrderNo)
+ .last("LIMIT 1"));
+ if(!CollectionUtils.isEmpty(laborIssues)){
+ LaborIssue laborIssue2 = laborIssues.get(0);
+ // 褰搇aborIssue2鐨勭紪鍙峰ぇ浜巐aborIssue1鐨勭紪鍙凤紝鍒欎娇鐢╨aborIssue2鐨勭紪鍙峰姞1
+ long l = Long.parseLong(laborIssue2.getOrderNo());
+ long l1 = Long.parseLong(laborIssue1.getOrderNo());
+ if(l >= l1){
+ laborIssue1.setOrderNo(l + 1 + "");
+ }
+
+ }
laborIssueService.save(laborIssue1);
}
return AjaxResult.success();
@@ -122,6 +130,27 @@
return AjaxResult.success(statisticsLaborIssue);
}
+ @ApiOperation("鍙戞斁杩涘害-鎬昏")
+ @GetMapping("/progressTotal")
+ public AjaxResult progressTotal(LaborIssue laborIssue) throws Exception {
+ Map<String, Object> list = laborIssueService.progressTotal(laborIssue);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation("棰嗗彇杩涘害鍗犳瘮")
+ @GetMapping("/progressPercent")
+ public AjaxResult progressPercent(LaborIssue laborIssue) throws Exception {
+ Map<String, Object> list = laborIssueService.progressPercent(laborIssue);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation("杩涘害鍒嗗竷")
+ @GetMapping("/progressDistribution")
+ public AjaxResult progressDistribution(LaborIssue laborIssue) throws Exception {
+ Map<String, Object> list = laborIssueService.progressDistribution(laborIssue);
+ return AjaxResult.success(list);
+ }
+
/**
--
Gitblit v1.9.3