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

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

Browse Source
This commit is contained in:
zyx.net
2023-06-14 17:06:56 +08:00
parent 44e06497b8 fe449a9601
commit 8264d3c877
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -3520,7 +3520,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsCollectManifestEO.setParamsManifestId(paramsManifestId); paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
// 过滤出 状态为：待发起收集，且工程接口人处为空的参数项 // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList()); list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>(); List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
+2 -2
View File
@@ -6,9 +6,9 @@ package com.jero.modules.head.enums;
* @auth zhn * @auth zhn
*/ */
public enum AffirmFlagEnum { public enum AffirmFlagEnum {
DESIGN_FLAG("设计符合性确认","Design Compliance Check","1"), DESIGN_FLAG("设计符合性确认","Design Compliance Confirmation","1"),
AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"), AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"),
VERIFY_FLAG("验证符合性确认","Validation Compliance Check","3"); VERIFY_FLAG("验证符合性确认","Validation Compliance Confirmation","3");