WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改法规清单批量设置报错

Browse Source
This commit is contained in:
高嵩
2023-06-14 11:20:34 +08:00
parent 555272e781
commit 7c019a8d66
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+2
View File
@@ -303,6 +303,8 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
try {
projectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
} catch (Exception e) {
e.printStackTrace();
log.error("批量设置失败：" + e.getMessage());
if(CutEnum.CN.getValue().equals(cut)){
return Result.error("批量设置失败！");
}else{
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+23 -20
View File
@@ -4427,29 +4427,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String DesdutyId = projectLawsInventoryEOList.get(0).getDesignDutyId();
String VerdutyId = projectLawsInventoryEOList.get(0).getVerifyDutyId();
String desdutyId = projectLawsInventoryEO.getDesignDutyId();
String verdutyId = projectLawsInventoryEO.getVerifyDutyId();
List<String> dutyTerritoryList = new ArrayList<>();
//获取批量设置中责任领域
String dutyTerritory = projectLawsInventoryEOList.get(0).getDutyTerritory();
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if (!StringUtils.isEmpty(dutyTerritory)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setDutyTerritory(dutyTerritory);
}
}
if (!StringUtils.isEmpty(DesdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setDesignDutyId(DesdutyId);
}
}
if (!StringUtils.isEmpty(VerdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setVerifyDutyId(VerdutyId);
}
}
if (!StringUtils.isEmpty(dutyTerritory)) {
dutyTerritoryList = Arrays.asList(dutyTerritory.split(","));
dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
} else {
@@ -4461,9 +4448,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
}
if (!StringUtils.isEmpty(desdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setDesignDutyId(desdutyId);
}
}
if (!StringUtils.isEmpty(verdutyId)) {
for (ProjectLawsInventoryEO info : infoList) {
info.setVerifyDutyId(verdutyId);
}
}
// 获取当前的projectLibrartId
String projectLibrartId = infoEOList.get(0).getProjectLibraryId();
String cut = infoEOList.get(0).getCut();
String projectLibrartId = infoList.get(0).getProjectLibraryId();
String cut = projectLawsInventoryEO.getCut();
Map<String, Object> params = new HashMap<>();
params.put("projectLibraryId", projectLibrartId);
params.put("userId", currentUser.getId());
@@ -4480,9 +4478,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//分别获取当前编辑中的设计符合性和认证符合性责任人
List<String> designDutyIdList = new ArrayList<>();
designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) {
designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
}
List<String> verifyDutyIdList = new ArrayList<>();
verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) {
verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
}
//allDutyList 为法规工程师中验证符合性和确认符合中的责任人
List<String> allDutyList = new ArrayList<>();