From 1da4e14d2ab8cade559d7e923dbf2db5e21d734e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Nov 2023 16:21:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=BA=93=20?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A0=87=E5=87=86id=E5=92=8C=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsEvaluationNotMetServiceImpl.java | 59 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 3 deletions(-)

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 1d23333a..89c98213 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
@@ -2,9 +2,18 @@ package com.jero.modules.projectLibrary.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.jero.common.constant.CommonConstant;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
+import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
+import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
 import com.jero.modules.projectLibrary.mapper.LawsEvaluationNotMetMapper;
 import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
@@ -12,6 +21,8 @@ import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.query.QueryGenerator;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,8 +37,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 @Service
 @Transactional(rollbackFor = JeroBootException.class)
 public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationNotMetMapper, LawsEvaluationNotMet> implements ILawsEvaluationNotMetService {
-
-
+	//国内标准
+	@Resource
+	private ILawsDomesticStandardService lawsDomesticStandardService;
+	//海外标准
+	@Resource
+	private ILawsOverseasStandardService lawsOverseasStandardService;
+	//企业标准
+	@Resource
+	private ILawsEnterpriseStandardService lawsEnterpriseStandardService;
     /**
      * 分页查询
      *
@@ -65,9 +83,42 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 	 */
 	@Override
     public void add(LawsEvaluationNotMet lawsEvaluationNotMet) {
-        save(lawsEvaluationNotMet);
+		//保存标准id和来源到未符合项
+		setStandardIdAndSource(lawsEvaluationNotMet);
+		save(lawsEvaluationNotMet);
     }
 
+	/**
+	 * 保存标准id和来源到未符合项
+	 * @param lawsEvaluationNotMet
+	 */
+	private void setStandardIdAndSource(LawsEvaluationNotMet lawsEvaluationNotMet) {
+		String standardNumber = lawsEvaluationNotMet.getStandardNumber();
+		String standardId = null;
+		String source = null;
+		LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.queryByStandardNumber(standardNumber);
+		if (lawsDomesticStandard != null){
+			standardId = lawsDomesticStandard.getId();
+			source = CommonConstant.STANDARD_SOURCE_1;
+		}
+		if (standardId == null){
+			LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.queryByStandardNumber(standardNumber);
+			if (lawsOverseasStandard != null){
+				standardId = lawsOverseasStandard.getId();
+				source = CommonConstant.STANDARD_SOURCE_2;
+			}
+		}
+		if (standardId == null){
+			LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.queryByStandardNumber(standardNumber);
+			if (lawsEnterpriseStandard != null) {
+				standardId = lawsEnterpriseStandard.getId();
+				source = CommonConstant.STANDARD_SOURCE_3;
+			}
+		}
+		lawsEvaluationNotMet.setStandardId(standardId);
+		lawsEvaluationNotMet.setSource(source);
+	}
+
 	/**
 	 * 更新
 	 *
@@ -76,6 +127,8 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 	 */
 	@Override
     public void editById(LawsEvaluationNotMet lawsEvaluationNotMet) {
+		//保存标准id和来源到未符合项
+		setStandardIdAndSource(lawsEvaluationNotMet);
     	saveOrUpdate(lawsEvaluationNotMet);
     }