fix(任务转交): 新旧拆分单对比

This commit is contained in:
yjz
2024-01-18 15:29:34 +08:00
parent 13e536daec
commit 012f045f13
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.common.util.MinioUtil;
import com.jero.modules.compare.entity.*;
import com.jero.modules.compare.enums.AssessConsistencyEnum;
@@ -279,7 +280,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
response.setContentType("application/force-download");
//创建工作表对象
String sheetName = "对比结果";
if (LanguageEnum.CN.getValue().equals(cut)) {
if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) {
sheetName = "对比结果";
} else {
sheetName = "Comparing results";
@@ -288,7 +289,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
HSSFPatriarch patriarch = (HSSFPatriarch) sheet.createDrawingPatriarch();
// 创建头部
String header = "";
if (LanguageEnum.CN.getValue().equals(cut)) {
if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) {
header = "所选标准,条款号,条款名称,条款内容,所选标准,条款号,条款名称,条款内容,评论";
} else {
header = "Selected Standard,Number,Title,Content,Selected Standard,Number,Title,Content,Comment";
@@ -418,7 +419,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
}
if (includeComments || MyStringUtils.isEmpty(selectIds)) {
Row row = sheet.createRow(i);
if (LanguageEnum.CN.getValue().equals(cut)) {
if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) {
row.createCell(0).setCellValue("全文评论");
} else {
row.createCell(0).setCellValue("The full text comments");
@@ -474,7 +475,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
os.flush();
} catch (IOException e) {
e.printStackTrace();
if (LanguageEnum.CN.getValue().equals(cut)) {
if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) {
throw new JeroBootException("下载文件失败");
} else {
throw new JeroBootException("Failed to download file");