Merge remote-tracking branch 'origin/fourthStage' into fourthStage

laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java

@@ -119,12 +119,18 @@ public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageM
         // 验证 部门名称+标准化工程师+联络人+部门联络人主管级领导唯一
         LambdaQueryWrapper<LawsContactManage> queryLawsContactManage = new LambdaQueryWrapper<>();
         queryLawsContactManage.eq(LawsContactManage::getDepartId, lawsContactManage.getDepartId());
-		queryLawsContactManage.eq(LawsContactManage::getEngineerId,lawsContactManage.getEngineerId());
         queryLawsContactManage.eq(LawsContactManage::getContactId, lawsContactManage.getContactId());
         queryLawsContactManage.eq(LawsContactManage::getLeaderId, lawsContactManage.getLeaderId());
         long l = count(queryLawsContactManage);
         if (l > 0) {
-			throw new JeroBootException("部门名称+标准化工程师+联络人+部门联络人主管级领导已存在");
+            throw new JeroBootException("部门和联络人匹配关系已存在，请重新选择");
+        }
+
+        queryLawsContactManage.clear();
+        queryLawsContactManage.eq(LawsContactManage::getContactId, lawsContactManage.getContactId());
+        long n = count(queryLawsContactManage);
+        if (n > 0) {
+            throw new JeroBootException("已存在相同的联络人");
         }
 
         Date now = new Date();

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java

@@ -169,6 +169,8 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 				lawsEvaluationNotMet.setState(AssessCommon.OVERDUE);
 			}else if (expectedTime.compareTo(theDayBefore) < 0){
 				lawsEvaluationNotMet.setState(AssessCommon.WARNING);
+			}else if (expectedTime.compareTo(theDayBefore) >= 0){
+				lawsEvaluationNotMet.setState(AssessCommon.TO_BE_RECTIFIED);
 			}
 		}