Merge remote-tracking branch 'origin/pim_yys'

maven

6 天以前 cf7478fa2339196ffd88d24f1149c192c3f0f0e3

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

@@ -22,9 +22,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -67,6 +69,12 @@
                .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));
        }
        boolean save = laborIssueService.save(laborIssue);
        return save ? AjaxResult.success() : AjaxResult.error();
    }
@@ -118,4 +126,14 @@
        util.exportExcel(response, list , "劳保台账");
    }

    /**
     * 劳保发放-导出
     */
    @Log(title = "劳保发放-导出", businessType = BusinessType.EXPORT)
    @PostMapping("/exportCopy")
    @ApiOperation("劳保发放-导出")
    public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
        laborIssueService.exportCopy(response,laborIssue);
    }

}