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

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

Browse Source
This commit is contained in:
范强强
2023-12-09 12:54:44 +08:00
parent bf96fe51fe e325737441
commit 981fb5af3e
2 changed files with 5 additions and 2 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/impl/ProjectCertificationInventoryEOServiceImpl.java
+2 -1
View File
@@ -1401,7 +1401,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
List<BussDocumentLibraryEO> docList = iBussDocumentLibraryEOService.listByIds(standIdList); List<BussDocumentLibraryEO> docList = iBussDocumentLibraryEOService.listByIds(standIdList);
for (ProjectCertificationInventoryEO data : datas) { for (ProjectCertificationInventoryEO data : datas) {
//处理编号，认证清单中若状态为符合时则编号标题不再随文档库变化 //处理编号，认证清单中若状态为符合时则编号标题不再随文档库变化
if (!data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) if ((!data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
|| !data.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue()))
&& StringUtils.isNotBlank(data.getBussDocumentLibraryId())) { && StringUtils.isNotBlank(data.getBussDocumentLibraryId())) {
BussDocumentLibraryEO docObj = null; BussDocumentLibraryEO docObj = null;
for (BussDocumentLibraryEO obj : docList) { for (BussDocumentLibraryEO obj : docList) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+3 -1
View File
@@ -1561,7 +1561,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
for (ProjectLawsInventoryEO projectLawsInventoryEO : list) { for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
//处理编号，法规清单中若状态为符合时则编号标题不再随文档库变化 //处理编号，法规清单中若状态为符合时则编号标题不再随文档库变化
if ((!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) if ((!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())
|| !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())) || !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue())
|| !projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())
|| !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue()))
&& StringUtils.isNotBlank(projectLawsInventoryEO.getStandId())) { && StringUtils.isNotBlank(projectLawsInventoryEO.getStandId())) {
BussDocumentLibraryEO docObj = null; BussDocumentLibraryEO docObj = null;
for (BussDocumentLibraryEO obj : docList) { for (BussDocumentLibraryEO obj : docList) {