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

fix 79844 车型项目库详情-复制，选择项目弹窗可以多选

Browse Source
This commit is contained in:
lijiarao
2024-01-31 10:53:27 +08:00
parent 749dc845dc
commit c6d95d5581
2 changed files with 7 additions and 4 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
+5 -3
View File
@@ -167,14 +167,15 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
@ApiOperation(value="车型项目库-法规清单-复制", notes="车型项目库-法规清单-复制") @ApiOperation(value="车型项目库-法规清单-复制", notes="车型项目库-法规清单-复制")
@PostMapping(value = "/copy") @PostMapping(value = "/copy")
public Result<T> copy(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) { public Result<T> copy(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) {
String projectId = lawsAssessAddVo.getProjectId();
String copyProjectId = lawsAssessAddVo.getCopyProjectId(); String copyProjectId = lawsAssessAddVo.getCopyProjectId();
if (StringUtils.isBlank(copyProjectId)){ if (StringUtils.isBlank(copyProjectId)){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
Date now = new Date(); Date now = new Date();
List<LawsAssess> lawsAssesses = new ArrayList<>(); List<LawsAssess> lawsAssesses = new ArrayList<>();
List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId()); List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(projectId);
List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId()); List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(projectId);
List<String> allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList()); List<String> allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
List<String> allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList()); List<String> allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
//获取要拷贝项目的未删除标准 //获取要拷贝项目的未删除标准
@@ -194,13 +195,14 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
} }
LawsAssess assess = new LawsAssess(); LawsAssess assess = new LawsAssess();
assess.setSource(lawsAssess.getSource()); assess.setSource(lawsAssess.getSource());
assess.setProjectId(lawsAssessAddVo.getProjectId()); assess.setProjectId(projectId);
assess.setStandardId(standardId); assess.setStandardId(standardId);
assess.setStandardNumber(lawsAssess.getStandardNumber()); assess.setStandardNumber(lawsAssess.getStandardNumber());
assess.setStandardName(lawsAssess.getStandardName()); assess.setStandardName(lawsAssess.getStandardName());
assess.setProcessStatus(AssessCommon.NOT_EVALUATED); assess.setProcessStatus(AssessCommon.NOT_EVALUATED);
lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
lawsAssesses.add(assess); lawsAssesses.add(assess);
allByProjectIdNotDeletedIdList.add(standardId);
} }
lawsAssessService.saveBatch(lawsAssesses); lawsAssessService.saveBatch(lawsAssesses);
return Result.OK("操作成功!"); return Result.OK("操作成功!");
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+2 -1
View File
@@ -136,8 +136,9 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
if (StringUtils.isBlank(projectId)){ if (StringUtils.isBlank(projectId)){
return new ArrayList<>(); return new ArrayList<>();
} }
List<String> projectIdList = Arrays.asList(projectId.split(","));
LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsAssess::getProjectId, projectId); wrapper.in(LawsAssess::getProjectId, projectIdList);
wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
return list(wrapper); return list(wrapper);
} }