From 7e5796e4813bb1f4d2696a0fd05f408147c3b96e Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 11 六月 2025 15:16:01 +0800 Subject: [PATCH] 所有项目必填判断 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java index 5df6c32..f20de1f 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java @@ -1,16 +1,25 @@ package com.mes.largenscreen.service.impl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mes.largenscreen.entity.DailyProductionData; import com.mes.largenscreen.entity.DailyProductionVO; import com.mes.largenscreen.entity.DateRequest; 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; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -24,6 +33,8 @@ @Resource private LargenScreenMapper largenScreenMapper; + @Resource + private HttpServletResponse response; @Override public Page<DailyProductionVO> queryDailyProduction(DateRequest query) { @@ -37,14 +48,50 @@ } @Override - public DailyProductionVO querySameDayProduction(DateRequest query) { + public List<DailyProductionVO> querySameDayProduction(DateRequest query) { if (StringUtils.isEmpty(query.getBeginDate())) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - query.setBeginDate(sdf.format(new Date())); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH, -6); + query.setBeginDate(sdf.format(calendar.getTime())); query.setEndDate(sdf.format(new Date())); } List<DailyProductionVO> list = largenScreenMapper.queryDailyProduction(query.getBeginDate(), query.getEndDate()); - return list.get(0); + return list; + } + + @Override + public void exportDailyProduction() { + try { + + 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)) + .registerWriteHandler(new CustomCellWriteWidthConfig()) + .excelType(ExcelTypeEnum.XLSX).sheet("鐢熶骇璁板綍").doWrite(providerList); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public List<DailyProductionData> queryProduction(DateRequest query) { + 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())); + } + return largenScreenMapper.exportDailyProduction(query.getBeginDate(), query.getEndDate()); + + } -- Gitblit v1.8.0