From 501d6ef20e73ad52912705f7aa8b86fd63df322c Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 3 Feb 2024 18:09:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5-=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2-=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88/=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsAssessResultsServiceImpl.java    | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
index 30a9e7da..78bdbd00 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
@@ -118,7 +118,6 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
 			assessResults.setStandardEnglishName(standardEnglishName);
 			assessResults.setStandardState(standardState);
 			assessResults.setSource(source);
-			assessResults.setSource(source);
 		}
 		return pageList;
     }
@@ -197,27 +196,42 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
 			LawsAssess assess = lawsAssessService.getById(id);
 			LambdaQueryWrapper<LawsAssessResults> wrapper = new LambdaQueryWrapper<>();
 			wrapper.eq(LawsAssessResults::getProjectId,assess.getProjectId())
-					.eq(LawsAssessResults::getStandardId,assess.getStandardId())
-					.groupBy(LawsAssessResults::getTermNumber)
-					.groupBy(LawsAssessResults::getAssessorId);
+					.eq(LawsAssessResults::getStandardId,assess.getStandardId());
 			wrapper.orderByDesc(LawsAssessResults::getCreateTime);
 			wrapper.last("limit 1");
 			assessResults = this.getOne(wrapper);
+
+			LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper
+					.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())
+					.eq(LawsAssessResults::getStandardId,assessResults.getStandardId())
+					.eq(LawsAssessResults::getProcessInstanceId,assessResults.getProcessInstanceId());
+			List<LawsAssessResults> assessResultsList = this.list(queryWrapper);
+			Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
+			MetNotMetVO metNotMetVO = new MetNotMetVO();
+			metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));
+			metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT));
+			metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED));
+			metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
+			return metNotMetVO;
+		}else {
+			LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper
+					.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())
+					.eq(LawsAssessResults::getStandardId,assessResults.getStandardId())
+					.eq(LawsAssessResults::getAssessorId,assessResults.getAssessorId())
+					.eq(LawsAssessResults::getTermNumber,assessResults.getTermNumber());
+			List<LawsAssessResults> assessResultsList = this.list(queryWrapper);
+			Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
+			MetNotMetVO metNotMetVO = new MetNotMetVO();
+			metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));
+			metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT));
+			metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED));
+			metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
+			return metNotMetVO;
 		}
 
-		LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper
-				.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())
-				.eq(LawsAssessResults::getStandardId,assessResults.getStandardId())
-				.eq(LawsAssessResults::getTermNumber,assessResults.getTermNumber());
-		List<LawsAssessResults> assessResultsList = this.list(queryWrapper);
-		Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
-		MetNotMetVO metNotMetVO = new MetNotMetVO();
-		metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));
-		metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT));
-		metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED));
-		metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
-		return metNotMetVO;
+
     }
 
 }