From d4c5825cf581bf8403e7c9dd9de969477a6873e6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 12 Oct 2023 14:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81=E7=94=B1=E5=BE=85=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java | 6 ++++--
 .../service/impl/ProjectLibraryStatisticsServiceImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index ff237b1bb..5fe52592d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -2854,14 +2854,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				"Pre-Homo";
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
-				"未发起,待确认,审查通过,审查退回,完成度";
+				"未发起,待提交,审查通过,审查退回,完成度";
+//				"未发起,待确认,审查通过,审查退回,完成度";
 		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			sheetName = "Certification Activity Management";
 			firstTitle = "Authentication task confirmation," +
 					"Pre-Homo";
 			secondTitle = "Area of responsibility (level 1)," +
 					"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);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
index d5903a0f2..e3d1b0330 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
@@ -397,7 +397,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             notStartedMap.put("amount",notStartedCount);
             notStartedMap.put("percentage",notStartedPercentageStr + percentSign);
 
-            // 待确认
+            // 待提交
             List<ProjectCertificationInventoryEO> toConfirmPciEoList = datas.stream().filter(data -> {
                 boolean flag = (
                             StringUtils.equals(data.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())