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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
zyx.net
2023-03-29 10:52:12 +08:00
parent 658141010d 2e6211fad0
commit c396dfd4cb
2 changed files with 7 additions and 5 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/service/IProjectCertificationInventoryEOService.java
+1 -1
View File
@@ -233,5 +233,5 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
* @param cut * @param cut
* @return * @return
*/ */
List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result); List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+6 -4
View File
@@ -349,7 +349,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectCertificationInventoryEOList.add(projectCertificationInventoryEO); projectCertificationInventoryEOList.add(projectCertificationInventoryEO);
} }
// 处理提示信息， 类别+检验项目+配置项+编号+责任领域 作为唯一检验 // 处理提示信息， 类别+检验项目+配置项+编号+责任领域 作为唯一检验
List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result); List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId);
if(CollectionUtils.isNotEmpty(saveDataList)){ if(CollectionUtils.isNotEmpty(saveDataList)){
this.saveBatch(saveDataList); this.saveBatch(saveDataList);
@@ -499,10 +499,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
* @param result * @param result
*/ */
@Override @Override
public List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result) { public List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId) {
List<ProjectCertificationInventoryEO> pciSaveList = new ArrayList<>(); List<ProjectCertificationInventoryEO> pciSaveList = new ArrayList<>();
List<ProjectCertificationInventoryEO> allDataList = this.list(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectCertificationInventoryEO> allDataList = this.list(pciQueryWrap);
// 重复数据数组 // 重复数据数组
List<ProjectCertificationInventoryEO> duplicateDataList = allDataList.stream().filter(data -> { List<ProjectCertificationInventoryEO> duplicateDataList = allDataList.stream().filter(data -> {
boolean flag = false; boolean flag = false;
@@ -2664,7 +2666,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
} }
} }
List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result); List<ProjectCertificationInventoryEO> saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId);
this.saveBatch(saveDataList); this.saveBatch(saveDataList);
Date now = new Date(); Date now = new Date();