From 818541dff508e6269583cb920464cc12eb07dbbf Mon Sep 17 00:00:00 2001 From: ls Date: Fri, 8 Nov 2024 22:32:30 +0800 Subject: [PATCH] update --- .../impl/ExperimentDocServiceImpl.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index 44fdad2..c600617 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.service.impl; import cn.hutool.core.io.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.deepoove.poi.XWPFTemplate; import lombok.extern.slf4j.Slf4j; @@ -14,8 +15,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * @Description: 试验文档 @@ -73,12 +73,18 @@ public class ExperimentDocServiceImpl extends ServiceImpl()); + public ExperimentDoc generate(String experimentId, String type) { + String filePath = generateExperimentDoc(experimentId, type, new HashMap<>()); if (StringUtils.isNotBlank(filePath)) { - ExperimentDoc experimentDoc = new ExperimentDoc(); - experimentDoc.setExperimentId(experimentalId); - experimentDoc.setDocType(type); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentDoc::getExperimentId, experimentId); + queryWrapper.eq(ExperimentDoc::getDocType, type); + ExperimentDoc experimentDoc = this.getOne(queryWrapper); + if (Objects.isNull(experimentDoc)) { + experimentDoc = new ExperimentDoc(); + experimentDoc.setDocType(type); + experimentDoc.setExperimentId(experimentId); + } experimentDoc.setFilePath(filePath); this.saveOrUpdate(experimentDoc); return experimentDoc;