From 52aa418c1053065f1337dc3338c0c87fe19e802b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Nov 2023 16:21:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=20=E8=B0=83=E5=8F=96=E6=A0=87=E5=87=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsAssessController.java      | 32 +++++++++----------
 .../projectLibrary/vo/LawsAssessAddVo.java    | 16 ++--------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
index 9b1b49fb..a4604827 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
@@ -111,24 +111,24 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 	@ApiOperation(value="车型项目库-法规清单-调取", notes="车型项目库-法规清单-调取")
 	@PostMapping(value = "/retrieval")
 	public Result<T> retrieval(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) {
-		String domesticStandardId = lawsAssessAddVo.getDomesticStandardId();
-		String overseasStandardId = lawsAssessAddVo.getOverseasStandardId();
-		if (StringUtils.isNotBlank(domesticStandardId) && StringUtils.isNotBlank(overseasStandardId)){
+		String projectId = lawsAssessAddVo.getProjectId();
+		String standardNumbers = lawsAssessAddVo.getStandardNumber();
+		if (StringUtils.isBlank(standardNumbers)){
 			throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
 		}
 		//查询当前项目已绑定的标准，为了不造成重复绑定
 		//查询该项目下所有未删除的标准
-		List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId());
+		List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(projectId);
 		List<String> allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
 		//查询该项目下所有删除的标准
-		List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId());
+		List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(projectId);
 		List<String> allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
 
-		Date now = new Date();
 		List<LawsAssess> lawsAssesses = new ArrayList<>();
-		if (StringUtils.isNotBlank(domesticStandardId)){
-			List<String> asList = Arrays.asList(domesticStandardId.split(","));
-			for (String id : asList) {
+		for (String standardNumber : standardNumbers.split(",")) {
+			LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.queryByStandardNumber(standardNumber);
+			if (lawsDomesticStandard != null){
+				String id = lawsDomesticStandard.getId();
 				if (allByProjectIdNotDeletedIdList.contains(id)){
 					//如果已存在跳过新增
 					continue;
@@ -142,7 +142,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 				}
 				LawsAssess lawsAssess = new LawsAssess();
 				lawsAssess.setSource(CommonConstant.STANDARD_SOURCE_1);
-				lawsAssess.setProjectId(lawsAssessAddVo.getProjectId());
+				lawsAssess.setProjectId(projectId);
 				lawsAssess.setStandardId(id);
 				LawsDomesticStandard standard = lawsDomesticStandardService.queryById(id);
 				lawsAssess.setStandardNumber(standard.getStandardNumber());
@@ -150,11 +150,11 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 				lawsAssess.setProcessStatus("1");
 				lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 				lawsAssesses.add(lawsAssess);
+				continue;
 			}
-		}
-		if (StringUtils.isNotBlank(overseasStandardId)){
-			List<String> asList = Arrays.asList(overseasStandardId.split(","));
-			for (String id : asList) {
+			LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.queryByStandardNumber(standardNumber);
+			if (lawsOverseasStandard != null){
+				String id = lawsOverseasStandard.getId();
 				if (allByProjectIdNotDeletedIdList.contains(id)){
 					//如果已存在跳过新增
 					continue;
@@ -167,8 +167,8 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 					continue;
 				}
 				LawsAssess lawsAssess = new LawsAssess();
-				lawsAssess.setSource("2");
-				lawsAssess.setProjectId(lawsAssessAddVo.getProjectId());
+				lawsAssess.setSource(CommonConstant.STANDARD_SOURCE_2);
+				lawsAssess.setProjectId(projectId);
 				lawsAssess.setStandardId(id);
 				LawsOverseasStandard standard = lawsOverseasStandardService.queryById(id);
 				lawsAssess.setStandardNumber(standard.getStandardNumber());
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/LawsAssessAddVo.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/LawsAssessAddVo.java
index f13853d9..1a5c2331 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/LawsAssessAddVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/LawsAssessAddVo.java
@@ -27,19 +27,7 @@ public class LawsAssessAddVo {
     @ApiModelProperty(value = "所选复制项目ID")
     private String copyProjectId;
 
-    /**标准ID*/
-    @ApiModelProperty(value = "国内标准ID")
-    private String domesticStandardId;
-
     /**标准编号*/
-    @ApiModelProperty(value = "国内标准编号")
-    private String domesticStandardNumber;
-
-    /**标准ID*/
-    @ApiModelProperty(value = "海外标准ID")
-    private String overseasStandardId;
-
-    /**标准编号*/
-    @ApiModelProperty(value = "海外标准编号")
-    private String overseasStandardNumber;
+    @ApiModelProperty(value = "标准编号")
+    private String standardNumber;
 }