yys 劳保报表开发

maven

2026-03-02 d6c07c838abeabdd23c4fdcfc69e08a9aaa9725f

 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);
                // 当laborIssue2的编号大于laborIssue1的编号，则使用laborIssue2的编号加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);
    }



    /**