diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index 13b48810..b6341c2f 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -7,7 +7,7 @@ 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.common.util.obs.ObsBootUtil; import com.jero.modules.compare.entity.*; import com.jero.modules.compare.enums.AssessConsistencyEnum; import com.jero.modules.compare.mapper.SarFileCompareItemCommentMapper; @@ -409,12 +409,18 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl htmlDiffStrContent = dmp.getHtmlDiffStr(rowDataAndPathLeft, rowDataAndPathRight); - List htmlDiffStrName = dmp.getHtmlDiffStr(itemLeft.getItemsName(), itemRight.getItemsName()); + List htmlDiffStrContent = dmp.getHtmlDiffStr(leftContent, rightContent); + List htmlDiffStrName = dmp.getHtmlDiffStr(leftName, rightName); Font redFont = workbook.createFont(); redFont.setColor(HSSFColor.HSSFColorPredefined.RED.getIndex()); @@ -459,19 +465,19 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl rightNameRedTagIndex = getTagIndex(htmlDiffStrName.get(1), greenTag); + List rightNameGreenTagIndex = getTagIndex(htmlDiffStrName.get(1), greenTag); HSSFRichTextString rightNameRich = new HSSFRichTextString( - htmlDiffStrName.get(0) - .replace(redTag, "") + htmlDiffStrName.get(1) + .replace(greenTag, "") .replace("", "")); - for (String tagIndex : rightNameRedTagIndex) { + for (String tagIndex : rightNameGreenTagIndex) { // 设置单独字体样式 String[] split = tagIndex.split(","); rightNameRich.applyFont(Integer.parseInt(split[0]), Integer.parseInt(split[1]), greenFont); - row.createCell(6).setCellValue(leftRich); + row.createCell(6).setCellValue(rightNameRich); } } @@ -599,8 +605,8 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl