diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java index fe86de6..f70fddc 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java @@ -52,6 +52,8 @@ public class DownLoadController { @Resource(name = "OriginalRecordService") private OriginalRecordService originalRecordService; + @Resource(name = "CreateSheetUtil") + private CreateSheetUtil createSheetUtil; /** * 下载原始记录 @@ -101,7 +103,7 @@ public class DownLoadController { rowNum++; } sheet = handleNineRow(vo, sheet, commonStyle2, rowNum++, hbNum); - sheet = handleTenRow(vo, sheet, commonStyle, rowNum++, hbNum); + sheet = handleTenRow(wb,vo, sheet, commonStyle, rowNum++, hbNum); //导出 response.setContentType("application/vnd.ms-excel"); String fileName = vo.getDevTypeName() + "检测原始记录.xlsx"; @@ -240,7 +242,7 @@ public class DownLoadController { rowNum++; } sheet = handleNineRow(vo, sheet, commonStyle2, rowNum++, hbNum); - sheet = handleTenRow(vo, sheet, commonStyle, rowNum++, hbNum); + sheet = handleTenRow(wb,vo, sheet, commonStyle, rowNum++, hbNum); String fileName = uploadPath + vo.getDevTypeName() + "检测原始记录_" + System.currentTimeMillis() + ".xlsx"; File file = new File(fileName); //生成文件夹 @@ -688,17 +690,21 @@ public class DownLoadController { * @author cwchen * @date 2024/7/28 12:21 */ - private Sheet handleTenRow(TestVo vo, Sheet sheet, CellStyle commonStyle, int rowNum, int hbNum) { + private Sheet handleTenRow(XSSFWorkbook workbook,TestVo vo, Sheet sheet, CellStyle commonStyle, int rowNum, int hbNum) { // 试验员、审核员 Row checkRow = sheet.createRow(rowNum); - checkRow.setHeight((short) 500); + checkRow.setHeight((short) 800); int sharingNum = (hbNum - 2) / 2; - checkRow.createCell(0).setCellValue("试验员:" + vo.getExperUserName()); - checkRow.createCell(sharingNum + 1).setCellValue("审核员:" + vo.getAuditUserName()); + checkRow.createCell(0).setCellValue("试验员:" ); + checkRow.createCell(1); + createSheetUtil.handlePicture(workbook, sheet, checkRow, checkRow.getCell(1), vo.getSyUrl()); + checkRow.createCell(sharingNum + 1).setCellValue("审核员:" ); + checkRow.createCell(sharingNum + 2); + createSheetUtil.handlePicture(workbook, sheet, checkRow, checkRow.getCell(sharingNum + 2), vo.getShUrl()); // checkRow.createCell(hbNum - 1).setCellValue("第 页 共 页"); checkRow.createCell(hbNum - 1).setCellValue(""); - sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), 0, sharingNum)); - sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), sharingNum + 1, hbNum - 2)); + sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), 2, sharingNum)); + sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), sharingNum + 3, hbNum - 2)); sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), hbNum - 1, hbNum)); return sheet; } diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java index 171e9ae..c1e5b54 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java @@ -443,4 +443,13 @@ public interface ExperimentalMapper { * @date 2024/9/4 12:46 */ void updateExperStatus2(ExperimentalDetailVo detailVo); + + /** + * 获取审核员签名 + * @param id + * @return String + * @author cwchen + * @date 2024/9/28 15:43 + */ + String getSignUrl(Long id); } diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java index b461f60..2028398 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java @@ -233,6 +233,14 @@ public class TestVo { private String allMoney; + /** + * 试验员签名 + */ + private String syUrl; + /** + * 审核员签名 + */ + private String shUrl; /** * 查询条件限制 diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java index f21c087..4b6737d 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java @@ -322,6 +322,9 @@ public class ExperimentalServiceImpl implements ExperimentalService { } // 试验数据详情 testVo = mapper.viewTestData(dto); + // 获取审核员签名 + String shUrl = mapper.getSignUrl(dto.getId()); + testVo.setShUrl(shUrl); List numList = mapper.getRecordNum(testVo); int recordNum = 0; for (int i = 0; i < numList.size(); i++) { diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml index c398cbc..d4f6685 100644 --- a/src/main/resources/mappers/basis/ExperimentalMapper.xml +++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml @@ -437,7 +437,8 @@ te.exper_conclu AS experConclu, te.remarsk AS remarsk, su.user_name AS experUserName, - te.audit_user_name AS auditUserName + te.audit_user_name AS auditUserName, + su.sign_img AS syUrl FROM tb_exper te LEFT JOIN tb_custom tc ON te.submit_unit = tc.id AND tc.del_flag = 0 LEFT JOIN sys_user su ON te.update_user = su.id AND su.del_flag = 0 @@ -591,4 +592,13 @@ LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{experId} WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL + +