update 80891 【需求变更】未符合项-状态问题需更改

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;
 			}
 

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);
 	}