maven
5 天以前 897acda0bb8c0bcd9511d62fad24060609669d35
yys  完善劳保台账导入导出
已修改5个文件
52 ■■■■ 文件已修改
src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/lavorissue/service/LavorIssueService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/lavorissue/LavorIssueMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java
@@ -21,4 +21,17 @@
    @TableField(exist = false)
    private String endDate;
    @ApiModelProperty("开始月份")
    @TableField(exist = false)
    private Integer startMonth;
    @ApiModelProperty("结束月份")
    @TableField(exist = false)
    private Integer endMonth;
    @ApiModelProperty("年份")
    @TableField(exist = false)
    private Integer year;
}
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -132,8 +132,8 @@
    @Log(title = "劳保发放-导出", businessType = BusinessType.EXPORT)
    @PostMapping("/exportCopy")
    @ApiOperation("劳保发放-导出")
    public void exportCopy(HttpServletResponse response) throws UnsupportedEncodingException {
        laborIssueService.exportCopy(response);
    public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
        laborIssueService.exportCopy(response,laborIssue);
    }
}
src/main/java/com/ruoyi/lavorissue/service/LavorIssueService.java
@@ -26,5 +26,5 @@
    StatisticsLaborIssue statistics(StatisticsLaborIssue req) throws  Exception;
    void exportCopy(HttpServletResponse response) throws UnsupportedEncodingException;
    void exportCopy(HttpServletResponse response, LaborIssue laborIssue) throws UnsupportedEncodingException;
}
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
@@ -21,6 +21,7 @@
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -60,22 +61,31 @@
        if(season != null){
            Calendar calendar = Calendar.getInstance();
            int currentYear = calendar.get(Calendar.YEAR);
            startAndEndDateDto.setYear(currentYear);
            switch (season){
                case 1:
                    startAndEndDateDto.setStartDate(currentYear + "-01-01");
                    startAndEndDateDto.setEndDate(currentYear + "-03-31");
                    startAndEndDateDto.setStartMonth(1);
                    startAndEndDateDto.setEndMonth(3);
                    break;
                case 2:
                    startAndEndDateDto.setStartDate(currentYear + "-04-01");
                    startAndEndDateDto.setEndDate(currentYear + "-06-30");
                    startAndEndDateDto.setStartMonth(4);
                    startAndEndDateDto.setEndMonth(6);
                    break;
                case 3:
                    startAndEndDateDto.setStartDate(currentYear + "-07-01");
                    startAndEndDateDto.setEndDate(currentYear + "-09-30");
                    startAndEndDateDto.setStartMonth(7);
                    startAndEndDateDto.setEndMonth(9);
                    break;
                case 4:
                    startAndEndDateDto.setStartDate(currentYear + "-10-01");
                    startAndEndDateDto.setEndDate(currentYear + "-12-31");
                    startAndEndDateDto.setStartMonth(10);
                    startAndEndDateDto.setEndMonth(12);
                    break;
            }
        }
@@ -130,12 +140,14 @@
    private SysDictDataMapper sysDictDataMapper;
    @Override
    public void exportCopy(HttpServletResponse response) throws UnsupportedEncodingException {
    public void exportCopy(HttpServletResponse response, LaborIssue laborIssue) throws UnsupportedEncodingException {
        List<SysDictData> sys_lavor_issue = sysDictDataMapper.selectDictDataByType("sys_lavor_issue");
        if(CollectionUtils.isEmpty(sys_lavor_issue)){
            throw new RuntimeException("字典数据为空");
        }
        List<LaborIssue> laborIssues = lavorIssueMapper.list(new LaborIssue());
        StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
        BeanUtils.copyProperties(startAndEndDateDto, laborIssue);
        List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue);
        if (CollectionUtils.isEmpty(laborIssues)) {
            throw new RuntimeException("数据为空");
        }
@@ -154,7 +166,7 @@
                    .registerWriteHandler(new ConfigurableMergeStrategy(exportExternalPackingListGetMerge(4,sys_lavor_issue.size(),laborIssueMap.size())))
                    .build();
            List<List<List<String>>> data = completeExternalPackingList(laborIssueMap, sys_lavor_issue);
            List<List<List<String>>> data = completeExternalPackingList(laborIssueMap, sys_lavor_issue,laborIssue);
            for (int i = 0; i < data.size(); i++) {
                List<List<String>> list = data.get(i);
@@ -177,7 +189,7 @@
//     处理外部装箱单数据
    private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap,List<SysDictData> sys_lavor_issue) {
    private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap,List<SysDictData> sys_lavor_issue,LaborIssue obj) {
        List<List<List<String>>> data = new ArrayList<>();
        int num = sys_lavor_issue.size();
@@ -187,7 +199,7 @@
        list.add("");
        list.add("企业管理科");
        list.add("");
        list.add("企业管理科2025年1月-2025年3月劳保发放计划表");
        list.add("企业管理科" + obj.getYear() + "年" + obj.getStartMonth() + "月-" + obj.getYear() + "年" + obj.getEndMonth() +"月劳保发放计划表");
        for (int i = 1; i <= num; i++){
            list.add("");
        }
@@ -204,10 +216,10 @@
        item.add(list1);
        List<String> list2 = new ArrayList<>();
        list2.add("2025");
        list2.add("1");
        list2.add("2025");
        list2.add("3");
        list2.add(obj.getYear().toString());
        list2.add(obj.getStartMonth().toString());
        list2.add(obj.getYear().toString());
        list2.add(obj.getEndMonth().toString());
        for (int i = 0; i <= num; i++){
            list.add("");
        }
src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -58,6 +58,9 @@
            <if test="req.staffId != null">
                and t1.staff_id = #{req.staffId}
            </if>
            <if test="req.season != null and req.season != ''">
                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
            </if>
        </where>
    </select>
</mapper>