From 64e2649fdf22467e64f381861b25108d35c5bf27 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jan 2024 17:33:39 +0800
Subject: [PATCH] =?UTF-8?q?update=2080891=20=E3=80=90=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E3=80=91=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?-=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98=E9=9C=80=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsEvaluationNotMetController.java        | 6 ++++--
 .../service/impl/LawsEvaluationNotMetServiceImpl.java     | 8 +++++---
 .../src/main/resources/i18n/messages.properties           | 2 +-
 .../src/main/resources/i18n/messages_en.properties        | 2 +-
 .../src/main/resources/i18n/messages_zh.properties        | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
index 741b1c39..43535826 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
@@ -128,8 +128,10 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 				throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT);
 			}
 			String state = notMet.getState();
-			//判断是否是待整改，超期
-			if (!state.equals(AssessCommon.TO_BE_RECTIFIED) && !state.equals(AssessCommon.OVERDUE)) {
+			//判断是否是待整改，超期，警示
+			if (!state.equals(AssessCommon.TO_BE_RECTIFIED)
+					&& !state.equals(AssessCommon.WARNING)
+					&& !state.equals(AssessCommon.OVERDUE)) {
 				return false;
 			}
 
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
index 241ffe5e..4cbd6e4c 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.projectLibrary.service.impl;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,9 +24,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
-import java.util.List;
-import java.util.Date;
-import java.util.Map;
+
+import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.query.QueryGenerator;
@@ -96,6 +96,8 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 							.like(LawsEvaluationNotMet::getStandardName,standardNumberOrName)
 					);
 		}
+		//待整改，超期，警示的数据可以选择
+		queryWrapper.lambda().in(LawsEvaluationNotMet::getState, Arrays.asList(AssessCommon.TO_BE_RECTIFIED, AssessCommon.WARNING, AssessCommon.OVERDUE));
 		Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);
 		return page(page, queryWrapper);
 	}
diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties
index c1a38994..067bbedb 100644
--- a/laws-single-startup/src/main/resources/i18n/messages.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages.properties
@@ -35,7 +35,7 @@ the.job.number.cannot.be.empty.export=Line {0},job number cannot be empty
 the.real.name.cannot.be.empty.export=Line {0},real name cannot be empty
 job.number.does.not.exist.export=Line {0},job number does not exist
 duplicate.job.number.export=Line {0},duplicate job number
-cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u6216\u8D85\u671F\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED
+cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u3001\u8B66\u793A\u6216\u8D85\u671F\u72B6\u6001\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED
 
 no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55
 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties
index bc24614a..8dd03d97 100644
--- a/laws-single-startup/src/main/resources/i18n/messages_en.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties
@@ -37,7 +37,7 @@ the.job.number.cannot.be.empty.export=Line {0},job number cannot be empty
 the.real.name.cannot.be.empty.export=Line {0},real name cannot be empty
 job.number.does.not.exist.export=Line {0},job number does not exist
 duplicate.job.number.export=Line {0},duplicate job number
-cannot.close=Data that is not pending rectification or overdue cannot be closed
+cannot.close=Data that is not pending rectification, warning, or overdue cannot be closed
 
 
 
diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties
index c27fae42..4a5d369e 100644
--- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties
@@ -36,7 +36,7 @@ the.job.number.cannot.be.empty.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u80FD\u
 the.real.name.cannot.be.empty.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A
 job.number.does.not.exist.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u5B58\u5728
 duplicate.job.number.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u91CD\u590D
-cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u6216\u8D85\u671F\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED
+cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u3001\u8B66\u793A\u6216\u8D85\u671F\u72B6\u6001\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED