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

法规清单关联排平台件后-列表流程状态数据展顺序

Browse Source
This commit is contained in:
zhn
2023-12-06 15:32:54 +08:00
parent 7e64cb6af9
commit a4c0e00a7a
2 changed files with 3 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/ProjectLawsInventoryEOServiceImpl.java
+2 -2
View File
@@ -76,7 +76,7 @@ import com.jero.modules.project.enums.DataEnum;
import com.jero.modules.project.enums.DataSourceEnum; import com.jero.modules.project.enums.DataSourceEnum;
import com.jero.modules.project.enums.DesignComplianceStatusEnum; import com.jero.modules.project.enums.DesignComplianceStatusEnum;
import com.jero.modules.project.enums.FlowFlagEnum; import com.jero.modules.project.enums.FlowFlagEnum;
import com.jero.modules.project.enums.FlowStateEnum; import com.jero.modules.project.enums.FlowStateDesignEnum;
import com.jero.modules.project.enums.InventoryAffirmNodeEnum; import com.jero.modules.project.enums.InventoryAffirmNodeEnum;
import com.jero.modules.project.enums.InventoryAffirmStatusEnum; import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.JumpLinkEnum;
@@ -12314,7 +12314,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
public void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) { public void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
List<String> valueList = FlowStateEnum.getValueInfo(); List<String> valueList = FlowStateDesignEnum.getValueInfo();//修改为按高嵩提供的流程顺序
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>(); List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>(); List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+1
View File
@@ -2720,6 +2720,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
} }
private List<ProjectCertificationInventoryEO> getProjectCertificationInventoryEOS(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) { private List<ProjectCertificationInventoryEO> getProjectCertificationInventoryEOS(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
//认证清单关联平台件（实际是一个认证清单只关联一个平台件）
List<String> projectCertificationInventoryIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList()); List<String> projectCertificationInventoryIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList());
//认证清单关联的平台件 //认证清单关联的平台件
LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();