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

平台件详情-状态导出-认证活动管理Pre-Homo流程中状态由待确认改为待提交

Browse Source
This commit is contained in:
zhn
2023-10-12 14:41:43 +08:00
parent 4fd2a4b402
commit d4c5825cf5
2 changed files with 5 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/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+4 -2
View File
@@ -2854,14 +2854,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
"Pre-Homo"; "Pre-Homo";
String secondTitle = "责任领域（一级）," + String secondTitle = "责任领域（一级）," +
"未发起,待确认,接受,拒绝,完成度," + "未发起,待确认,接受,拒绝,完成度," +
"未发起,待确认,审查通过,审查退回,完成度"; "未发起,待提交,审查通过,审查退回,完成度";
// "未发起,待确认,审查通过,审查退回,完成度";
if(StringUtils.equals(cut,CutEnum.EN.getValue())){ if(StringUtils.equals(cut,CutEnum.EN.getValue())){
sheetName = "Certification Activity Management"; sheetName = "Certification Activity Management";
firstTitle = "Authentication task confirmation," + firstTitle = "Authentication task confirmation," +
"Pre-Homo"; "Pre-Homo";
secondTitle = "Area of responsibility (level 1)," + secondTitle = "Area of responsibility (level 1)," +
"Not launched,To be confirmed,Accept,Refuse,Degree of completion," + "Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion"; "Not launched,To submit,Review of the adoption,Review return,Degree of completion";
// "Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion";
} }
HSSFSheet sheet = workbook.createSheet(sheetName); HSSFSheet sheet = workbook.createSheet(sheetName);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+1 -1
View File
@@ -397,7 +397,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
notStartedMap.put("amount",notStartedCount); notStartedMap.put("amount",notStartedCount);
notStartedMap.put("percentage",notStartedPercentageStr + percentSign); notStartedMap.put("percentage",notStartedPercentageStr + percentSign);
// 待确认 // 待提交
List<ProjectCertificationInventoryEO> toConfirmPciEoList = datas.stream().filter(data -> { List<ProjectCertificationInventoryEO> toConfirmPciEoList = datas.stream().filter(data -> {
boolean flag = ( boolean flag = (
StringUtils.equals(data.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) StringUtils.equals(data.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())