From aa9f73abcf4b730aa04afcdee94dd31358e4cde6 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 8 Jan 2024 18:01:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080250=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=8F=90=E7=A4=BA=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsAssessResultsServiceImpl.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 7206efc7..167e787c 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
@@ -195,6 +195,18 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
 	@Override
     public MetNotMetVO getMetNotMetVOById(String id) {
 		LawsAssessResults assessResults = getById(id);
+		if (assessResults == null){
+			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);
+			wrapper.orderByDesc(LawsAssessResults::getCreateTime);
+			wrapper.last("limit 1");
+			assessResults = this.getOne(wrapper);
+		}
+
 		LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper
 				.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())