yys 1.劳保修改

maven

2025-11-20 c45065da360f03dca30a62cb352559a94cb69b1a

 src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java

@@ -12,6 +12,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.dto.LaborIssueDto;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
@@ -20,6 +21,7 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -27,9 +29,12 @@

import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * @author :yys
@@ -57,26 +62,47 @@
        return AjaxResult.success(listPage);
    }

    @GetMapping("/statisticsList")
    @Log(title = "劳保发放-统计查询", businessType = BusinessType.OTHER)
    @ApiOperation("劳保发放-统计查询")
    public AjaxResult statisticsList(LaborIssue laborIssue){
        List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
        return AjaxResult.success(listPage);
    }

    @PostMapping("/add")
    @Log(title = "劳保发放-添加", businessType = BusinessType.INSERT)
    @ApiOperation("劳保发放-添加")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(@RequestBody LaborIssue laborIssue){
        String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
        StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
        Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
                .gt(LaborIssue::getCreateTime, dateTime.getStartDate())
                .lt(LaborIssue::getCreateTime, dateTime.getEndDate()));
        String formattedCount = String.format("%03d", approveId + 1);
        laborIssue.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());
            laborIssue.setOrderNo(String.format("%03d", l + 1));
        for (LaborIssueDto issue : laborIssue.getLaborIssueList()) {
            LaborIssue  laborIssue1 = new LaborIssue();
            BeanUtils.copyProperties(laborIssue, laborIssue1);
            BeanUtils.copyProperties(issue, laborIssue1);
            String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
            StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
            Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
                    .gt(LaborIssue::getCreateTime, dateTime.getStartDate())
                    .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)
                    .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);
        }
        boolean save = laborIssueService.save(laborIssue);
        return save ? AjaxResult.success() : AjaxResult.error();
        return AjaxResult.success();
    }

    @PostMapping("/update")