diff --git a/pom.xml b/pom.xml index 22e2925..24f1ac1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,42 @@ + + + net.coobird + thumbnailator + 0.4.20 + + + commons-io + commons-io + 2.11.0 + + + org.apache.poi + poi + 5.2.3 + + + org.apache.poi + poi-ooxml + 5.2.3 + + + org.apache.poi + poi-ooxml-schemas + 4.1.2 + + + org.apache.poi + poi-scratchpad + 3.17 + + + com.deepoove + poi-tl + 1.12.2 + com.jjb.saas jjb-saas-system-client diff --git a/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java b/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java index 50959be..05ef29c 100644 --- a/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java +++ b/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java @@ -83,6 +83,12 @@ public class ArchivesController { archivesService.downloadClassArchives(qry); return Response.buildSuccess(); } + @ApiOperation("单独下载教材会审表") + @PostMapping("/downloadReviewRevision") + public Response downloadReviewRevision(@RequestBody ArchivesQry qry) { + archivesService.downloadReviewRevision(qry); + return Response.buildSuccess(); + } } 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 dc89d91..8d1a5da 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 @@ -12,6 +12,7 @@ import com.zcloud.edu.command.convertor.archives.ArchivesPdfFileCoConvertor; import com.zcloud.edu.command.convertor.archives.ArchivesReviewCoConvertor; import com.zcloud.edu.command.convertor.archives.ArchivesReviewRecordCoConvertor; import com.zcloud.edu.command.convertor.study.*; +import com.zcloud.edu.config.FileUrlConfig; import com.zcloud.edu.domain.model.archives.ArchivesPdfFileE; import com.zcloud.edu.domain.model.archives.ClassArchivesE; import com.zcloud.edu.domain.model.archives.PersonArchivesE; @@ -43,6 +44,7 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -88,17 +90,10 @@ public class ArchivesQueryExe { private final ClassExamPaperRepository classExamPaperRepository; private final QuestionRepository questionRepository; private final StudentSignCoConvertor studentSignCoConvertor; + @Autowired + private FileUrlConfig fileUrlConfig; - private static String prefixUrl; - // = "https://jpfz.qhdsafety.com/gbsFileTest/"; -// public static Integer corePoolSize; - @Value("${file.url}") - public void setPrefixUrl(String prefixUrlProperties) { - System.out.println("prefixUrlProperties-----"+prefixUrlProperties); - prefixUrl = prefixUrlProperties; - } - @DubboReference private ZcloudImgFilesFacade zcloudImgFilesFacade; /** @@ -253,9 +248,7 @@ public class ArchivesQueryExe { public byte[] execteStudentRecord(PersonArchivesDTO params){ try { Map workItem = PropertyUtils.describe( params); - String url = "https://jpfz.qhdsafety.com/gbsFileTest/"; - System.out.println("prefixUrl-----"+prefixUrl); - PictureRenderData picture = Pictures.ofUrl(url + params.getUserAvatarUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 + PictureRenderData picture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + params.getUserAvatarUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 workItem.put("img", picture); String templatePath = "templates/template/studentInfo.docx"; ByteArrayOutputStream outputStream = Tools.renderTemplate(templatePath, workItem); @@ -271,17 +264,13 @@ public class ArchivesQueryExe { try { Map workItem = PropertyUtils.describe( params); if(!ObjectUtils.isEmpty(params.getSignFaceUrl())){ - PictureRenderData signFacePicture = Pictures.ofUrl(prefixUrl + params.getSignFaceUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 + PictureRenderData signFacePicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + params.getSignFaceUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 workItem.put("signFacePicture", signFacePicture); } -// if(!ObjectUtils.isEmpty(params.getExamSignFlag())){ -// PictureRenderData examSignFacePicture = Pictures.ofUrl(prefixUrl + params.getExamSignFaceUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 -// workItem.put("examSignFacePicture", examSignFacePicture); -// } if (!ObjectUtils.isEmpty(params.getExamSignFlag())) { - String imageUrl = prefixUrl + params.getExamSignFaceUrl(); + String imageUrl = fileUrlConfig.getPrefixUrl() + params.getExamSignFaceUrl(); try (InputStream is = new URL(imageUrl).openStream()) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -349,7 +338,7 @@ public class ArchivesQueryExe { workItem.put("name", params.getName()); workItem.put("className", params.getClassName()); if(!ObjectUtils.isEmpty(params.getStudentExamRecord().getSignUrl())){ - PictureRenderData signPicture = Pictures.ofUrl(prefixUrl + params.getStudentExamRecord().getSignUrl(), PictureType.JPEG).size(50, 15).create();//网络图片地址 + PictureRenderData signPicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + params.getStudentExamRecord().getSignUrl(), PictureType.JPEG).size(50, 15).create();//网络图片地址 workItem.put("signPicture", signPicture); } String templatePath = "templates/template/exam.docx"; @@ -560,7 +549,6 @@ public class ArchivesQueryExe { List byteArrayList = new ArrayList<>(); byteArrayList.add(word); byte[] pdf = WordToPdfUtil.mergeWordToPdf(byteArrayList); -// String filepath = zcloudImgFilesFacade.saveFile(pdf, item.getCurriculumName()+"-教材会审表-"+ DateUtil.getSdfTimes()+".pdf","classArchives", params.getCorpinfoId()); byteArrayMap.put(item.getCurriculumName()+"-教材会审表-"+ DateUtil.getSdfTimes()+".pdf", pdf); } @@ -595,6 +583,8 @@ public class ArchivesQueryExe { + + /** * 安全培训教材或课程讲义 * @param params @@ -610,7 +600,6 @@ public class ArchivesQueryExe { List byteArrayList = new ArrayList<>(); byteArrayList.add(word); byte[] pdf = WordToPdfUtil.mergeWordToPdf(byteArrayList); -// String filepath = zcloudImgFilesFacade.saveFile(pdf, item.getCurriculumName()+"-教材会审表-"+ DateUtil.getSdfTimes()+".pdf","classArchives", params.getCorpinfoId()); byteArrayMap.put(item.getCurriculumName()+"-安全培训教材或课程讲义-"+ DateUtil.getSdfTimes()+".pdf", pdf); } @@ -666,14 +655,12 @@ public class ArchivesQueryExe { public byte[] execteSign(ClassArchivesDTO params){ try { Map workItem = PropertyUtils.describe( params); - String url = "https://jpfz.qhdsafety.com/gbsFileTest/"; -// String url = "http://192.168.20.240:9787/mnt/"; ArrayList workList = CollUtil.newArrayList(); if (params.getSignList() != null && params.getSignList().size() > 0){ AtomicInteger atomicIndex = new AtomicInteger(1); for (StudentSignCO item : params.getSignList()){ Map itemMap = PropertyUtils.describe(item); - PictureRenderData picture = Pictures.ofUrl(url + item.getSignUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 + PictureRenderData picture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + item.getSignUrl(), PictureType.JPEG).size(100, 100).create();//网络图片地址 itemMap.put("picture", picture); int index = atomicIndex.getAndIncrement(); itemMap.put("index", index); @@ -697,8 +684,6 @@ public class ArchivesQueryExe { public byte[] exectePicture(ClassArchivesDTO params){ try { Map workItem = PropertyUtils.describe( params); -// String url = "https://jpfz.qhdsafety.com/gbsFileTest/"; - String url = "http://192.168.20.240:9787/mnt/"; ArrayList workList = CollUtil.newArrayList(); if (params.getSignList() != null && params.getSignList().size() > 0){ AtomicInteger atomicIndex = new AtomicInteger(1); @@ -708,15 +693,15 @@ public class ArchivesQueryExe { item.setUserIdCard(userIdCardString); Map itemMap = PropertyUtils.describe(item); if(!ObjectUtils.isEmpty(item.getSignFaceUrl())){ - PictureRenderData signPicture = Pictures.ofUrl(url + item.getSignFaceUrl(), PictureType.JPEG).size(50, 50).create();//网络图片地址 + PictureRenderData signPicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + item.getSignFaceUrl(), PictureType.JPEG).size(50, 50).create();//网络图片地址 itemMap.put("signPicture", signPicture); } if(!ObjectUtils.isEmpty(item.getExamFaceUrl())){ - PictureRenderData examPicture = Pictures.ofUrl(url + item.getExamFaceUrl(), PictureType.JPEG).size(50, 50).create();//网络图片地址 + PictureRenderData examPicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + item.getExamFaceUrl(), PictureType.JPEG).size(50, 50).create();//网络图片地址 itemMap.put("examPicture", examPicture); } if(!ObjectUtils.isEmpty(item.getExamFaceUrl())){ - PictureRenderData facePicture = Pictures.ofUrl(url + item.getUserAvatarUrl(), PictureType.JPEG).size(50, 50).create();//网络图片地址 + PictureRenderData facePicture = Pictures.ofUrl(fileUrlConfig.getPrefixUrl() + item.getUserAvatarUrl(), PictureType.JPEG).size(50, 50).create();//网络图片地址 itemMap.put("facePicture", facePicture); } int index = atomicIndex.getAndIncrement(); @@ -844,5 +829,65 @@ public class ArchivesQueryExe { return "男"; } } + + + public ClassArchivesDTO downloadReviewInfoById(ArchivesQry qry){ + HashMap params = new HashMap(); + List reviewCOList = new ArrayList<>(); + params.put("classId", qry.getClassId()); + params.put("classCurriculumId", qry.getClassCurriculumId()); + // 教材会审表 + ArchivesReviewDO reviewInfo = archivesReviewRepository.getInfoByClassCur(params); + ArchivesReviewCO reviewInfoCO = new ArchivesReviewCO(); + BeanUtils.copyProperties(reviewInfo, reviewInfoCO); + reviewCOList.add(reviewInfoCO); + ClassDO classDO = classRepository.getByClassId(qry.getClassId()); + if (reviewInfo != null && !ObjectUtils.isEmpty(reviewInfo.getArchivesReviewId())){ + + params.put("eqArchivesReviewId", reviewInfo.getArchivesReviewId()); + List reviewRecordList = archivesReviewRecordRepository.listAll(params); + if(reviewRecordList != null && reviewRecordList.size() > 0){ + List reviewRecordCOList = archivesReviewRecordCoConvertor.converDOsToCOs(reviewRecordList); + // 子表放到主表下 + Map> reviewRecordCOMap = reviewRecordCOList.stream().collect(Collectors.groupingBy(ArchivesReviewRecordCO::getArchivesReviewId)); + reviewCOList.forEach(reviewCO -> { + reviewCO.setArchivesReviewRecordList(reviewRecordCOMap.get(reviewCO.getArchivesReviewId())); + }); + } + } + // 查询子表 + + ClassArchivesDTO classArchivesDTO = new ClassArchivesDTO(); + classArchivesDTO.setClassName(classDO.getName()); + SSOUser ssoUser = AuthContext.getCurrentUser(); + classArchivesDTO.setCorpinfoId(ssoUser.getTenantId()); + classArchivesDTO.setArchivesReviewList(reviewCOList); + // 新增档案下载记录 + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.init("archives_review", qry.getClassCurriculumId(), 2, ssoUser.getTenantId(), classDO.getName()+"-"+reviewInfo.getCurriculumName()+"教材会审表-"); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.save(archivesPdfFileDO); + classArchivesDTO.setArchivesPdfFileId(archivesPdfFileDO.getId()); + return classArchivesDTO; + } + @Async("archivesAsyncExecutor") + public void execteDownloadReviewInfo(ClassArchivesDTO params){ + try { + byte[] word = execteReviewInfo(params.getArchivesReviewList().get(0)); + List byteArrayList = new ArrayList<>(); + byteArrayList.add(word); + byte[] pdf = WordToPdfUtil.mergeWordToPdf(byteArrayList); + String filepath = zcloudImgFilesFacade.saveFile(pdf, params.getClassName()+"-"+params.getArchivesReviewList().get(0).getCurriculumName()+"-教材会审表-"+ DateUtil.getSdfTimes()+".pdf","classArchives", params.getCorpinfoId()); + ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); + archivesPdfFileE.initEdit(params.getArchivesPdfFileId(), filepath, 1, null); + ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); + BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); + archivesPdfFileRepository.updateById(archivesPdfFileDO); + } catch (Exception e){ + e.printStackTrace(); + throw new RuntimeException(e); + } + } } diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java index d443515..5fe68ca 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java @@ -62,7 +62,7 @@ public class StudentSignQueryExe { public MultiResponse executeListAll(ClassAppSignQry qry) { Map params = PageQueryHelper.toHashMap(qry); - List list = studentSignRepository.listAll(params); + List list = studentSignRepository.listAllByStudent(params); List studentSignCOS = studentSignCoConvertor.converDOsToCOs(list); return MultiResponse.of(studentSignCOS); } diff --git a/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java index 193fa09..6348126 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/study/StudentSignAddExe.java @@ -1,6 +1,7 @@ package com.zcloud.edu.command.study; import com.alibaba.cola.exception.BizException; +import com.zcloud.edu.config.FileUrlConfig; import com.zcloud.edu.domain.gateway.study.StudentSignGateway; import com.zcloud.edu.domain.model.study.StudentSignE; import com.zcloud.edu.dto.clientobject.study.StudentSignCO; @@ -13,6 +14,7 @@ import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import lombok.AllArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -33,6 +35,8 @@ public class StudentSignAddExe { private final StudentRepository studentRepository; @DubboReference private ZcloudImgFilesFacade zcloudImgFilesFacade; + @Autowired + private FileUrlConfig fileUrlConfig; @Transactional(rollbackFor = Exception.class) public StudentSignCO execute(StudentSignAddCmd cmd) { @@ -47,7 +51,7 @@ public class StudentSignAddExe { String faceUrl = null; try { faceUrl = Base64Util.getBase64String(studentSignE.getFiles()[0]); - studentSignE.compareFace(student.getUserAvatarUrl(), faceUrl); + studentSignE.compareFace(student.getUserAvatarUrl(), faceUrl, fileUrlConfig.getPrefixUrl()); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java index 1685a93..2602805 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java @@ -61,5 +61,12 @@ public class ArchivesServiceImpl implements ArchivesServiceI { archivesQueryExe.execteClassGeneratePdf(qry,classArchivesDTO); System.out.println("下载成功"); } + + @Override + public void downloadReviewRevision(ArchivesQry qry) { + ClassArchivesDTO classArchivesDTO = archivesQueryExe.downloadReviewInfoById(qry); + archivesQueryExe.execteDownloadReviewInfo(classArchivesDTO); + System.out.println("下载成功"); + } } diff --git a/web-client/src/main/java/com/zcloud/edu/api/archives/ArchivesServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/archives/ArchivesServiceI.java index 88df469..3a2fced 100644 --- a/web-client/src/main/java/com/zcloud/edu/api/archives/ArchivesServiceI.java +++ b/web-client/src/main/java/com/zcloud/edu/api/archives/ArchivesServiceI.java @@ -17,5 +17,6 @@ import com.zcloud.edu.dto.clientobject.archives.ArchivesReviewCO; public interface ArchivesServiceI { void downloadPersonArchives(ArchivesQry qry); void downloadClassArchives(ArchivesQry qry); + void downloadReviewRevision(ArchivesQry qry); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/config/ArchivesAsyncConfig.java b/web-client/src/main/java/com/zcloud/edu/config/ArchivesAsyncConfig.java similarity index 99% rename from web-infrastructure/src/main/java/com/zcloud/edu/config/ArchivesAsyncConfig.java rename to web-client/src/main/java/com/zcloud/edu/config/ArchivesAsyncConfig.java index 3de3f07..03207c1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/config/ArchivesAsyncConfig.java +++ b/web-client/src/main/java/com/zcloud/edu/config/ArchivesAsyncConfig.java @@ -7,6 +7,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.Executor; import java.util.concurrent.ThreadPoolExecutor; + /** * @author zhangyue * @date 2026/2/2 17:24 diff --git a/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java b/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java new file mode 100644 index 0000000..52596db --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java @@ -0,0 +1,20 @@ +package com.zcloud.edu.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author zhangyue + * @date 2026/2/11 10:05 + */ +@Configuration +public class FileUrlConfig { + private String prefixUrl; + @Value("${file.url}") + public void setPrefixUrl(String prefixUrlProperties) { + prefixUrl = prefixUrlProperties; + } + public String getPrefixUrl() { + return prefixUrl; + } +} diff --git a/web-client/src/main/java/com/zcloud/edu/dto/archives/ArchivesQry.java b/web-client/src/main/java/com/zcloud/edu/dto/archives/ArchivesQry.java index f11bc72..80044ae 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/archives/ArchivesQry.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/archives/ArchivesQry.java @@ -29,6 +29,7 @@ public class ArchivesQry { private String studentId; private Long stuId; private String classId; + private String classCurriculumId; } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java index 7d06058..2419113 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java @@ -5,19 +5,11 @@ import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Base64Util; import com.zcloud.gbscommon.utils.FaceUtil; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.dubbo.config.annotation.DubboReference; -import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.InputStream; -import java.net.URL; import java.time.LocalDateTime; -import java.util.Base64; /** * web-domain @@ -71,22 +63,9 @@ public class StudentSignE extends BaseE { private Long createId; //修改人id private Long updateId; - private static String prefixUrl; -// = "https://jpfz.qhdsafety.com/gbsFileTest/"; -// public static Integer corePoolSize; - @Value("${file.url}") - public void setPrefixUrl(String prefixUrlProperties) { - System.out.println("prefixUrlProperties-----"+prefixUrlProperties); - prefixUrl = prefixUrlProperties; - } - @DubboReference - private ZcloudImgFilesFacade zcloudImgFilesFacade; - - public void compareFace(String templateFaceUrl, String faceUrl) throws Exception { - - System.out.println("prefixUrl-----"+prefixUrl); - String templateFace = Base64Util.urlToBase64("https://jpfz.qhdsafety.com/gbsFileTest/" + templateFaceUrl); + public void compareFace(String templateFaceUrl, String faceUrl, String prefixUrl) throws Exception { + String templateFace = Base64Util.urlToBase64(prefixUrl + templateFaceUrl); String confidence = FaceUtil.compareFace(templateFace, faceUrl); if (Double.valueOf(confidence) < 75) { diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesReviewMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesReviewMapper.java index 8b0448c..6691e03 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesReviewMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/archives/ArchivesReviewMapper.java @@ -24,5 +24,6 @@ public interface ArchivesReviewMapper extends BaseMapper { ArchivesReviewDO getInfoById(@Param("id") Long id); List listAll(@Param("params") Map params); + ArchivesReviewDO getInfoByClassCur(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/archives/ArchivesReviewRepository.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/archives/ArchivesReviewRepository.java index 943e3f0..936ba0c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/archives/ArchivesReviewRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/archives/ArchivesReviewRepository.java @@ -19,5 +19,8 @@ public interface ArchivesReviewRepository extends BaseRepository listAll(Map params); + + + ArchivesReviewDO getInfoByClassCur(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesReviewRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesReviewRepositoryImpl.java index f8ff826..0ac12cc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesReviewRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/archives/ArchivesReviewRepositoryImpl.java @@ -47,5 +47,10 @@ public class ArchivesReviewRepositoryImpl extends BaseRepositoryImpl listAll(Map params) { return archivesReviewMapper.listAll(params); } + + @Override + public ArchivesReviewDO getInfoByClassCur(Map params) { + return archivesReviewMapper.getInfoByClassCur(params); + } } diff --git a/web-infrastructure/src/main/resources/mapper/archives/ArchivesReviewMapper.xml b/web-infrastructure/src/main/resources/mapper/archives/ArchivesReviewMapper.xml index 68cdc92..d938997 100644 --- a/web-infrastructure/src/main/resources/mapper/archives/ArchivesReviewMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/archives/ArchivesReviewMapper.xml @@ -28,13 +28,13 @@ + +