diff --git a/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrModulePlaceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrModulePlaceServiceImpl.java index 9efd7ce31..3cb9d50b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrModulePlaceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrModulePlaceServiceImpl.java @@ -1,26 +1,24 @@ package com.zhgd.xmgl.modules.ocr.service.impl; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.ocr.entity.OcrModulePlace; -import com.zhgd.xmgl.modules.ocr.entity.vo.OcrModulePlaceVo; -import com.zhgd.xmgl.modules.ocr.entity.dto.OcrModulePlaceDto; -import com.zhgd.xmgl.modules.ocr.mapper.OcrModulePlaceMapper; -import com.zhgd.xmgl.modules.ocr.service.IOcrModulePlaceService; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.ocr.entity.OcrModulePlace; +import com.zhgd.xmgl.modules.ocr.entity.dto.OcrModulePlaceDto; +import com.zhgd.xmgl.modules.ocr.entity.vo.OcrModulePlaceVo; +import com.zhgd.xmgl.modules.ocr.mapper.OcrModulePlaceMapper; +import com.zhgd.xmgl.modules.ocr.service.IOcrModulePlaceService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - /** * @Description: ocr识别模块位置 * @author： pds @@ -49,7 +47,7 @@ public class OcrModulePlaceServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(OcrModulePlaceVo.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(OcrModulePlaceVo::getId)); + queryWrapper.orderByAsc(RefUtil.fieldNameUlc(OcrModulePlaceVo::getCreateTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java index e69625d3e..005d7d6db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java @@ -63,7 +63,7 @@ public class OcrZonePlaceServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(OcrZonePlaceVo.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(OcrZonePlaceVo::getId)); + queryWrapper.orderByAsc(RefUtil.fieldNameUlc(OcrZonePlaceVo::getCreateTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java index 6498258dc..506b7be70 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java @@ -1037,8 +1037,7 @@ public class WorkerDailyAttendanceStatisticsV2Controller { root.put(1, sheetMap2); sheetNames.add(enterpriseName + "考勤报表"); templateUrl = Fileutils.getExportTemplateFile("excel/workerDailyAttendanceStatisticsV2/" + tempSheetName).getAbsolutePath(); - String outputTemplateFilePath = PathUtil.getBasePath() + "/temp/" + IdUtil.randomUUID() + ".xlsx"; - TemplateExportParams params = new TemplateExportParams(outputTemplateFilePath, true); + TemplateExportParams params = new TemplateExportParams(templateUrl, true); params.setSheetName(sheetNames.toArray(new String[]{})); Workbook workbook = ExcelExportUtil.exportExcel(root, params); ExcelUtils.downLoadExcel(tempSheetName, response, workbook); @@ -1155,10 +1154,10 @@ public class WorkerDailyAttendanceStatisticsV2Controller { root.put(0, sheetMap); sheetNames.add(project.getProjectName()); templateUrl = Fileutils.getExportTemplateFile("excel/workerDailyAttendanceStatisticsV2/" + tempSheetName).getAbsolutePath(); - String outputTemplateFilePath = PathUtil.getBasePath() + "/temp/" + IdUtil.randomUUID() + ".xlsx"; - TemplateExportParams params = new TemplateExportParams(outputTemplateFilePath, true); + TemplateExportParams params = new TemplateExportParams(templateUrl, true); params.setSheetName(sheetNames.toArray(new String[]{})); Workbook workbook = ExcelExportUtil.exportExcel(root, params); + ExcelUtils.downLoadExcel(tempSheetName, response, workbook); } } catch (IOException e) { diff --git a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java index a91aae557..285120760 100644 --- a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java @@ -15,7 +15,10 @@ import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.core.io.ClassPathResource; import javax.servlet.http.HttpServletResponse; @@ -131,7 +134,7 @@ public class ExcelUtils { * @param column 列下标 * @return */ - public static boolean isMergedRegion(Sheet sheet, int row, int column) { + private static boolean isMergedRegion(Sheet sheet, int row, int column) { int sheetMergeCount = sheet.getNumMergedRegions(); for (int i = 0; i < sheetMergeCount; i++) { CellRangeAddress range = sheet.getMergedRegion(i); @@ -288,7 +291,7 @@ public class ExcelUtils { for (int i = 0; i < enterpriseInfoList.size(); i++) { XSSFRow row1 = sheet3.createRow(i); XSSFCell cell1 = row1.createCell(0); - cell1.setCellType(CellType.STRING); + cell1.setCellType(CellType.STRING); cell1.setCellValue(enterpriseInfoList.get(i).getEnterpriseName()); } } @@ -307,7 +310,7 @@ public class ExcelUtils { map.put("sex", MapUtils.getIntValue(map, "sex") == 1 ? "男" : "女"); Map placeholderMap = new HashMap<>(16); for (String s : map.keySet()) { - placeholderMap.put("${" + s +"}", map.get(s)); + placeholderMap.put("${" + s + "}", map.get(s)); } placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime()); placeholderMap.put("${score}", workerSafeEducationWorker.getScore()); diff --git a/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按项目.xlsx b/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按项目.xlsx index 4c07e80b3..2b9262dfb 100644 Binary files a/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按项目.xlsx and b/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按项目.xlsx differ