This commit is contained in:
ls
2024-11-08 22:32:30 +08:00
parent 16f1087c76
commit 818541dff5

View File

@@ -1,6 +1,7 @@
package org.jeecg.modules.database.service.impl; package org.jeecg.modules.database.service.impl;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.XWPFTemplate;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -14,8 +15,7 @@ import org.springframework.stereotype.Service;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.*;
import java.util.Map;
/** /**
* @Description: 试验文档 * @Description: 试验文档
@@ -73,12 +73,18 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
} }
@Override @Override
public ExperimentDoc generate(String experimentalId, String type) { public ExperimentDoc generate(String experimentId, String type) {
String filePath = generateExperimentDoc(experimentalId, type, new HashMap<>()); String filePath = generateExperimentDoc(experimentId, type, new HashMap<>());
if (StringUtils.isNotBlank(filePath)) { if (StringUtils.isNotBlank(filePath)) {
ExperimentDoc experimentDoc = new ExperimentDoc(); LambdaQueryWrapper<ExperimentDoc> queryWrapper = new LambdaQueryWrapper<>();
experimentDoc.setExperimentId(experimentalId); queryWrapper.eq(ExperimentDoc::getExperimentId, experimentId);
experimentDoc.setDocType(type); 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); experimentDoc.setFilePath(filePath);
this.saveOrUpdate(experimentDoc); this.saveOrUpdate(experimentDoc);
return experimentDoc; return experimentDoc;