ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 车型项目库 调取标准bug

Browse Source
This commit is contained in:
lijiarao
2023-11-29 16:21:45 +08:00
parent 1da4e14d2a
commit 52aa418c10
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+16 -16
View File
@@ -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());
laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/LawsAssessAddVo.java
+2 -14
View File
@@ -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;
}