From e0af0f4f834f3a5ad8b3f77817abc4dd8cf1f33c Mon Sep 17 00:00:00 2001
From: yjq <yjq@qq.com>
Date: Wed, 1 Feb 2023 15:01:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86--?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=AF=A6=E6=83=85=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 33 ++++++++++++++++++-
 .../impl/SarFileCompareInfoServiceImpl.java   |  4 +--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 15d3aac78..082dd9bbd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -1725,7 +1725,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			// 变更标识
 			boolean changeFlag = false;
 
-			// 添加配置数据
+			String configNameCn = "";
+			String configNameEn = "";
+
+			// 添加配置数据*****循环同一个配置里的内容
 			for (Map.Entry<String, Object> entry : map.entrySet()) {
 				String key = entry.getKey();
 				if ("id".equals(key)) {
@@ -1753,8 +1756,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
 					paramsReportConfigDataEO.setId(oldConfigDataEO.getId());
 				}
+				//******************配置2被添加了**********************
 				logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
 				logEnContent.append(paramsReportConfigEO.getConfigName());
+				configNameCn = paramsReportConfigEO.getConfigName()+"的";
+				configNameEn = paramsReportConfigEO.getConfigName();
 
 				paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
 				paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
@@ -1867,7 +1873,27 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				}
 				newConfigDataEOList.add(paramsReportConfigDataEO);
 
+				//******************这里是当前配置的循环结束了******************
+				//判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字
+				//configNameCn = paramsReportConfigEO.getConfigName()+"的";
+				//configNameEn = paramsReportConfigEO.getConfigName();
+				String cnContent = logCnContent.toString();
+				String enContent = logEnContent.toString();
+					if(!configNameCn.isEmpty() && !configNameEn.isEmpty()
+							&& cnContent.contains(configNameCn) && enContent.contains(configNameEn)){
+						int cnStar = cnContent.length() - configNameCn.length();
+						int enStar = enContent.length()-configNameEn.length();
+						String logCnContentLast = logCnContent.substring(cnStar, logCnContent.length());
+						String logEnContentLast = logEnContent.substring(enStar, logEnContent.length());
+
+						//logCnContent的最后是configName时
+						if(logCnContentLast.equals(configNameCn) && logEnContentLast.equals(configNameEn)) {
+							logCnContent.delete(cnStar, cnContent.length() + 1);
+							logEnContent.delete(enStar,enContent.length()+1);
+						}
+					}
 			}
+
 			ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
 			/*if (logCnContent.toString().endsWith("，")) {
 				String ramarks = "";
@@ -1886,8 +1912,12 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				if(map.get("remarks") != null){
 					ramarks = map.get("remarks").toString();
 				}
+				int i = logCnContent.lastIndexOf("，");
 				insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，")));
 				insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(",")));
+//				insertLogEO.setLogCnContent(cnContent.substring(0, logCnContent.lastIndexOf("，")));
+//				insertLogEO.setLogEnContent(enContent.substring(0, logEnContent.lastIndexOf(",")));
+
 				insertLogEO.setParamsReportId(paramsManifestId);
 				insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
 				insertLogEO.setRemarks(ramarks);
@@ -1906,6 +1936,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	}
 
 
+
 	private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsReportConfigDataEO> paramsReportConfigDataEOList) {
 		List<ParamsReportConfigDataEO> configDataEOList = paramsReportConfigDataEOList.stream()
 				.filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId()))
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
index c97fca666..52e1937bc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
@@ -132,14 +132,14 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
      */
     public String fullTextComparison(String leftStandard, String rightStandard, String remark) throws Exception {
         SarFileCompareInfo sfcInfo = addStandCompareHis(leftStandard, rightStandard, remark);
-
+        //文档对比信息目录
         List<SarFileSplitMenuEO> leftMenuEOList = sarFileSplitMenuEOService.queryByInfoId(leftStandard);
         Map<String, SarFileCompareMenu> leftMenuMap = wrapperMenuMap(leftMenuEOList, sfcInfo.getId(), CompareConst.POS_LEFT);
         sarFileCompareMenuService.saveBatch(leftMenuMap.values());
         List<SarFileSplitMenuEO> rightMenuEOList = sarFileSplitMenuEOService.queryByInfoId(rightStandard);
         Map<String, SarFileCompareMenu> rightMenuMap = wrapperMenuMap(rightMenuEOList, sfcInfo.getId(), CompareConst.POS_RIGHT);
         sarFileCompareMenuService.saveBatch(rightMenuMap.values());
-
+        //文档对比信息条款
         List<SarFileSplitItemsEO> leftItemEOList = sarFileSplitItemsEOService.selectByInfoId(leftStandard);
         List<SarFileCompareItem> leftItemList = wrapperItemList(leftItemEOList, sfcInfo.getId(), leftMenuMap, CompareConst.POS_LEFT);
         List<SarFileSplitItemsEO> rightItemEOList = sarFileSplitItemsEOService.selectByInfoId(rightStandard);