From bd3a568910df3fa0cc90a627349ec0a4c158d7b3 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 11 Mar 2026 09:00:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=A3=E6=A1=88=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=B8=AD=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=92=8C=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/template/exam.docx | Bin 14779 -> 14657 bytes .../main/resources/templates/template/jc.docx | Bin 16161 -> 16147 bytes .../templates/template/studyRecord.docx | Bin 13605 -> 13532 bytes .../query/archives/ArchivesQueryExe.java | 57 ++++++++++++++++-- .../domain/model/archives/ClassArchivesE.java | 2 +- .../model/archives/PersonArchivesE.java | 2 + .../resources/mapper/study/StudentMapper.xml | 3 + 7 files changed, 57 insertions(+), 7 deletions(-) diff --git a/start/src/main/resources/templates/template/exam.docx b/start/src/main/resources/templates/template/exam.docx index 58550a92545dd208788dfa69616e865b3d2ec451..f6ae2746f99aba2fc69f5141d8dba243b528be24 100644 GIT binary patch delta 5617 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 LLW>vr&*1+9;uoWM diff --git a/start/src/main/resources/templates/template/jc.docx b/start/src/main/resources/templates/template/jc.docx index f1f0531c8b235984963d1ab65c3c9f1ac41baf7d..b112e923880fa93ba465c5c79c6e86f172366d15 100644 GIT binary patch delta 6850 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 delta 5162 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 UV|+y=frgk0QEt$w(7)RJ4+2)afB*mh diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java index a3340be..9b10a22 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java @@ -62,6 +62,7 @@ import java.io.InputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Paths; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -126,12 +127,14 @@ public class ArchivesQueryExe { // 学员信息 StudentDO studentDO = studentRepository.getById(qry.getStuId()); + System.out.println(studentDO.getState()+"-------------------------------------------------ccc-1--"); byte[] userIdCardBytes = Base64.getDecoder().decode(studentDO.getUserIdCard()); String userIdCardString = new String(userIdCardBytes); studentDO.setUserIdCard(userIdCardString); StudentE studentE = new StudentE(); BeanUtils.copyProperties(studentDO, studentE); + System.out.println(studentE.getState()+"-------------------------------------------------ccc2"); // 班级信息 ClassDO classDO = classRepository.getByClassId(studentDO.getClassId()); classE = new ClassE(); @@ -218,7 +221,11 @@ public class ArchivesQueryExe { System.out.println("4-------------------------------------------------------------"); } if (qry.getTypeList().contains(5)){ - byteArrayList.add(execteExamRecord(params)); + + byte[] examRecord = execteExamRecord(params); + if(examRecord != null){ + byteArrayList.add(examRecord); + } System.out.println("5-------------------------------------------------------------"); } @@ -233,6 +240,11 @@ public class ArchivesQueryExe { BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.updateById(archivesPdfFileDO); } catch (Exception e) { + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.initEdit(params.getArchivesPdfFileId(), null, -1, null); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.updateById(archivesPdfFileDO); throw new RuntimeException(e); } } @@ -350,7 +362,10 @@ public class ArchivesQueryExe { System.out.println("4-------------------------------------------------------------"); } if (qry.getTypeList().contains(5)){ - byteArrayList.add(execteExamRecord(params)); + byte[] examRecord = execteExamRecord(params); + if(examRecord != null){ + byteArrayList.add(examRecord); + } System.out.println("5-------------------------------------------------------------"); } @@ -372,6 +387,11 @@ public class ArchivesQueryExe { BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.updateById(archivesPdfFileDO); } catch (Exception e) { + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.initEdit(personArchivesDTOList.get(0).getArchivesPdfFileId(), null, -1, null); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.updateById(archivesPdfFileDO); e.printStackTrace(); log.error("execteGeneratePdfList,失败", e); // throw new BizException("导出失败"); @@ -425,8 +445,6 @@ public class ArchivesQueryExe { PictureRenderData signFacePicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + params.getSignFaceUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 workItem.put("signFacePicture", signFacePicture); } - - if (!ObjectUtils.isEmpty(params.getExamSignFaceUrl())) { PictureRenderData examSignFacePicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + params.getExamSignFaceUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 workItem.put("examSignFacePicture", examSignFacePicture); @@ -650,7 +668,6 @@ public class ArchivesQueryExe { @Async("archivesAsyncExecutor") public void execteClassGeneratePdf(ArchivesQry qry, ClassArchivesDTO params) { params.setArchivesDate(DateUtil.getSdfTimes()); - String tempDir = System.getProperty("java.io.tmpdir"); List stringList = new ArrayList<>(); try { @@ -704,6 +721,11 @@ public class ArchivesQueryExe { BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.updateById(archivesPdfFileDO); } catch (Exception e) { + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.initEdit(params.getArchivesPdfFileId(), null, -1, null); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.updateById(archivesPdfFileDO); e.printStackTrace(); throw new RuntimeException(e); // } finally { @@ -742,7 +764,20 @@ public class ArchivesQueryExe { public byte[] execteReviewInfo(ArchivesReviewCO params) throws Exception { + params.getAuditDate(); + // 创建格式化器 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + // 转换为字符串 Map workItem = PropertyUtils.describe(params); + if(params.getWriteDate() != null){ + workItem.put("writeDate", params.getWriteDate().format(formatter)); + } + if(params.getAuditDate() != null){ + workItem.put("auditDate", params.getAuditDate().format(formatter)); + } + + ArrayList workList = CollUtil.newArrayList(); String templatePath = "templates/template/review.docx"; if (params.getArchivesReviewRecordList() != null && params.getArchivesReviewRecordList().size() > 0){ @@ -941,7 +976,7 @@ public class ArchivesQueryExe { }); workItem.put("question_list", workList); workItem.put("className", params.getClassName()); - String templatePath = "templates/template/class_paper.docx"; + String templatePath = "templates/template/class_paper_answer.docx"; ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem); return outputStream.toByteArray(); } catch (Exception e) { @@ -1067,6 +1102,11 @@ public class ArchivesQueryExe { BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.updateById(archivesPdfFileDO); } catch (Exception e){ + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.initEdit(params.getArchivesPdfFileId(), null, -1, null); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.updateById(archivesPdfFileDO); e.printStackTrace(); throw new RuntimeException(e); } @@ -1119,6 +1159,11 @@ public class ArchivesQueryExe { BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.updateById(archivesPdfFileDO); } catch (Exception e){ + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.initEdit(params.getArchivesPdfFileId(), null, -1, null); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.updateById(archivesPdfFileDO); e.printStackTrace(); // throw new RuntimeException(e); } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java index 1f49a05..b9e69bb 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java @@ -116,7 +116,7 @@ public class ClassArchivesE extends BaseE { } setClassName(classE.getName()); - + setSignCount(Long.valueOf(signCount)); setStudentCount(studentCount); setClzId(classE.getId()); } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/PersonArchivesE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/PersonArchivesE.java index f2f6eec..a2da0e6 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/PersonArchivesE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/PersonArchivesE.java @@ -249,6 +249,8 @@ public class PersonArchivesE extends BaseE { List studentSignEList){ BeanUtils.copyProperties(studentE, this); setStuId(studentE.getId()); + + System.out.println(studentE.getState()+"-------------------------------------------------ccc2"); if (!ObjectUtils.isEmpty(studentE.getState())){ setStateName(studentE.getState() == 1 ? "已完成" : "未完成"); } diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml index 11ca046..4b76e72 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml @@ -327,6 +327,9 @@ and s.project_names like concat('%',#{params.likeProjectNames},'%') + + and s.interested_ids like concat('%',#{params.likeInterestedIds},'%') + and c.name like concat('%',#{params.likeClassName},'%')