Merge remote-tracking branch 'origin/master'

wangfei

2025-05-13 0b41a5c59028a61bff22f60e74cb1d6d53a40e61

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java

@@ -9,6 +9,7 @@
import com.mes.largenscreen.mapper.LargenScreenMapper;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.tools.PageUtil;
import com.mes.utils.excel.CustomCellWriteWidthConfig;
import com.mes.utils.excel.ExcelMergeStrategy;
import com.mes.utils.excel.ExcelUtil;
import org.springframework.stereotype.Service;
@@ -60,21 +61,20 @@
    }

    @Override
    public void exportDailyProduction(DateRequest query) {
    public void exportDailyProduction() {
        try {
            if (StringUtils.isEmpty(query.getBeginDate())) {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                Calendar calendar = Calendar.getInstance();
                calendar.add(Calendar.DAY_OF_MONTH, -6);
                query.setBeginDate(sdf.format(calendar.getTime()));
                query.setEndDate(sdf.format(new Date()));
            }
            ExcelUtil.setExcelResponseProp(response, "供应商列表-合并");
            List<DailyProductionData> providerList = largenScreenMapper.exportDailyProduction(query.getBeginDate(), query.getEndDate());

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            Calendar calendar = Calendar.getInstance();
            calendar.add(Calendar.DAY_OF_MONTH, -10);

            ExcelUtil.setExcelResponseProp(response, "MES试生产记录" + sdf.format(new Date()));
            List<DailyProductionData> providerList = largenScreenMapper.exportDailyProduction(sdf.format(calendar.getTime()), sdf.format(new Date()));
            EasyExcel.write(response.getOutputStream())
                    .head(DailyProductionData.class)
                    .registerWriteHandler(new ExcelMergeStrategy(DailyProductionData.class))
                    .excelType(ExcelTypeEnum.XLSX).sheet().doWrite(providerList);
                    .registerWriteHandler(new CustomCellWriteWidthConfig())
                    .excelType(ExcelTypeEnum.XLSX).sheet("生产记录").doWrite(providerList);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }