chenhj
2026-04-22 fa3428b4bb32179a42d5618357c22fe2695716ae
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.excel.ConfigurableMergeStrategy;
import com.ruoyi.common.utils.excel.CustomCellStyleHandler;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
@@ -20,14 +19,14 @@
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
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;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -42,10 +41,13 @@
 */
@Service
@Slf4j
@RequiredArgsConstructor
public class LavorIssueServiceImpl extends ServiceImpl<LavorIssueMapper, LaborIssue> implements LavorIssueService {
    @Autowired
    private LavorIssueMapper lavorIssueMapper;
    private final LavorIssueMapper lavorIssueMapper;
    private final SysDictDataMapper sysDictDataMapper;
    private final SysDeptMapper sysDeptMapper;
    @Override
    public IPage<LaborIssue> listPage(Page page, LaborIssue laborIssue) {
@@ -177,9 +179,6 @@
        return statisticsLaborIssue;
    }
    @Autowired
    private SysDictDataMapper sysDictDataMapper;
    @Override
    public void exportCopy(HttpServletResponse response, LaborIssue laborIssue) throws UnsupportedEncodingException {
        List<SysDictData> sys_lavor_issue = sysDictDataMapper.selectDictDataByType("sys_lavor_issue");
@@ -224,10 +223,6 @@
            throw new RuntimeException("导出失败");
        }
    }
    @Autowired
    private SysDeptMapper sysDeptMapper;
//     处理外部装箱单数据
    private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap,List<SysDictData> sys_lavor_issue,LaborIssue obj) {
@@ -352,6 +347,7 @@
    /**
     * 获取当月第一天
     *
     * @param date
     * @return
     */