admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-08-21 18:53:35 +08:00
parent 933f6ebb41
commit d015d534f1
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrModulePlaceServiceImpl.java
View File

@ -1,26 +1,24 @@
package com.zhgd.xmgl.modules.ocr.service.impl; 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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.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.HashMap;
import java.util.List; 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识别模块位置 * @Description: ocr识别模块位置
* @author： pds * @author： pds
@ -49,7 +47,7 @@ public class OcrModulePlaceServiceImpl extends ServiceImpl<OcrModulePlaceMapper,
private QueryWrapper<OcrModulePlaceVo> getQueryWrapper(HashMap<String, Object> param) { private QueryWrapper<OcrModulePlaceVo> getQueryWrapper(HashMap<String, Object> param) {
QueryWrapper<OcrModulePlaceVo> queryWrapper = QueryGenerator.initPageQueryWrapper(OcrModulePlaceVo.class, param, true); QueryWrapper<OcrModulePlaceVo> queryWrapper = QueryGenerator.initPageQueryWrapper(OcrModulePlaceVo.class, param, true);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(OcrModulePlaceVo::getId)); queryWrapper.orderByAsc(RefUtil.fieldNameUlc(OcrModulePlaceVo::getCreateTime));
return queryWrapper; return queryWrapper;
} }

2
src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java
View File

@ -63,7 +63,7 @@ public class OcrZonePlaceServiceImpl extends ServiceImpl<OcrZonePlaceMapper, Ocr
private QueryWrapper<OcrZonePlaceVo> getQueryWrapper(HashMap<String, Object> param) { private QueryWrapper<OcrZonePlaceVo> getQueryWrapper(HashMap<String, Object> param) {
QueryWrapper<OcrZonePlaceVo> queryWrapper = QueryGenerator.initPageQueryWrapper(OcrZonePlaceVo.class, param, true); QueryWrapper<OcrZonePlaceVo> queryWrapper = QueryGenerator.initPageQueryWrapper(OcrZonePlaceVo.class, param, true);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(OcrZonePlaceVo::getId)); queryWrapper.orderByAsc(RefUtil.fieldNameUlc(OcrZonePlaceVo::getCreateTime));
return queryWrapper; return queryWrapper;
} }

7
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java
View File

@ -1037,8 +1037,7 @@ public class WorkerDailyAttendanceStatisticsV2Controller {
root.put(1, sheetMap2); root.put(1, sheetMap2);
sheetNames.add(enterpriseName + "考勤报表"); sheetNames.add(enterpriseName + "考勤报表");
templateUrl = Fileutils.getExportTemplateFile("excel/workerDailyAttendanceStatisticsV2/" + tempSheetName).getAbsolutePath(); templateUrl = Fileutils.getExportTemplateFile("excel/workerDailyAttendanceStatisticsV2/" + tempSheetName).getAbsolutePath();
String outputTemplateFilePath = PathUtil.getBasePath() + "/temp/" + IdUtil.randomUUID() + ".xlsx"; TemplateExportParams params = new TemplateExportParams(templateUrl, true);
TemplateExportParams params = new TemplateExportParams(outputTemplateFilePath, true);
params.setSheetName(sheetNames.toArray(new String[]{})); params.setSheetName(sheetNames.toArray(new String[]{}));
Workbook workbook = ExcelExportUtil.exportExcel(root, params); Workbook workbook = ExcelExportUtil.exportExcel(root, params);
ExcelUtils.downLoadExcel(tempSheetName, response, workbook); ExcelUtils.downLoadExcel(tempSheetName, response, workbook);
@ -1155,10 +1154,10 @@ public class WorkerDailyAttendanceStatisticsV2Controller {
root.put(0, sheetMap); root.put(0, sheetMap);
sheetNames.add(project.getProjectName()); sheetNames.add(project.getProjectName());
templateUrl = Fileutils.getExportTemplateFile("excel/workerDailyAttendanceStatisticsV2/" + tempSheetName).getAbsolutePath(); templateUrl = Fileutils.getExportTemplateFile("excel/workerDailyAttendanceStatisticsV2/" + tempSheetName).getAbsolutePath();
String outputTemplateFilePath = PathUtil.getBasePath() + "/temp/" + IdUtil.randomUUID() + ".xlsx"; TemplateExportParams params = new TemplateExportParams(templateUrl, true);
TemplateExportParams params = new TemplateExportParams(outputTemplateFilePath, true);
params.setSheetName(sheetNames.toArray(new String[]{})); params.setSheetName(sheetNames.toArray(new String[]{}));
Workbook workbook = ExcelExportUtil.exportExcel(root, params); Workbook workbook = ExcelExportUtil.exportExcel(root, params);
ExcelUtils.downLoadExcel(tempSheetName, response, workbook); ExcelUtils.downLoadExcel(tempSheetName, response, workbook);
} }
} catch (IOException e) { } catch (IOException e) {

11
src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
View File

@ -15,7 +15,10 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.IOUtils; 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 org.springframework.core.io.ClassPathResource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -131,7 +134,7 @@ public class ExcelUtils {
* @param column 列下标 * @param column 列下标
* @return * @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(); int sheetMergeCount = sheet.getNumMergedRegions();
for (int i = 0; i < sheetMergeCount; i++) { for (int i = 0; i < sheetMergeCount; i++) {
CellRangeAddress range = sheet.getMergedRegion(i); CellRangeAddress range = sheet.getMergedRegion(i);
@ -288,7 +291,7 @@ public class ExcelUtils {
for (int i = 0; i < enterpriseInfoList.size(); i++) { for (int i = 0; i < enterpriseInfoList.size(); i++) {
XSSFRow row1 = sheet3.createRow(i); XSSFRow row1 = sheet3.createRow(i);
XSSFCell cell1 = row1.createCell(0); XSSFCell cell1 = row1.createCell(0);
cell1.setCellType(CellType.STRING); cell1.setCellType(CellType.STRING);
cell1.setCellValue(enterpriseInfoList.get(i).getEnterpriseName()); cell1.setCellValue(enterpriseInfoList.get(i).getEnterpriseName());
} }
} }
@ -307,7 +310,7 @@ public class ExcelUtils {
map.put("sex", MapUtils.getIntValue(map, "sex") == 1 ? "男" : "女"); map.put("sex", MapUtils.getIntValue(map, "sex") == 1 ? "男" : "女");
Map<String, Object> placeholderMap = new HashMap<>(16); Map<String, Object> placeholderMap = new HashMap<>(16);
for (String s : map.keySet()) { for (String s : map.keySet()) {
placeholderMap.put("${" + s +"}", map.get(s)); placeholderMap.put("${" + s + "}", map.get(s));
} }
placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime()); placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime());
placeholderMap.put("${score}", workerSafeEducationWorker.getScore()); placeholderMap.put("${score}", workerSafeEducationWorker.getScore());

BIN
src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按项目.xlsx
View File

Binary file not shown.