From dcd0d41910b501f9b2f4b2bea87073a10d9cc206 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 27 Jul 2022 14:14:49 +0800 Subject: [PATCH] =?UTF-8?q?56405=20=E6=B3=95=E8=A7=84/=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LawsTechnologyEvaluationEOServiceImpl.java | 28 +++++++++++++++++++ .../enums/ProjectTaskPlanningNameEnum.java | 10 ++++--- jero-web/src/common/lang/en-us.js | 5 ++-- jero-web/src/common/lang/zh-cn.js | 5 ++-- .../components/settingList.vue | 8 +++--- .../components/TaskPlanList.vue | 6 ++-- .../projectStatusBoard/index.vue | 6 ++-- 7 files changed, 50 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 97fcc3cb4..b02e02d74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -360,6 +360,17 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl titleList = Arrays.asList(title.split(",")); + //校验模板 + for (int cellIndex = 0; cellIndex < 3; cellIndex++){ + boolean flag = false; + Cell cell = firstRow.getCell(cellIndex); + for (String titl : titleList) { + if(StringUtils.equals(titl,cell.toString())){ + flag = true; + break; + } + } + if(!flag){ + throw new JeroBootException(verifyTemplateMsg); + } + } + int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数 for (int i = 0; i < rowNos ; i++) { Row row = sheet.getRow(i + 1); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index e2ca5fee7..34169acd6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,11 +4,13 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("清单确认"," Checklist confirmation"), LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), DESIGN_DEADLINE("设计符合性","Design compliance"), - PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), - ATTESTATION_START_TIME("认证开始","Certification begins"), - ATTESTATION_END_TIME("认证结束"," End of certification"), +// PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), +// ATTESTATION_START_TIME("认证开始","Certification begins"), +// ATTESTATION_END_TIME("认证结束"," End of certification"), + PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Completion"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),// name:认证开始 value:Certification begins + ATTESTATION_END_TIME("认证批准","Type Approval"),// name:认证结束 value:End of certification VERIFY_DEADLINE("验证符合性","Verify compliance"), - ; String name; String value; diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1c5b2d4a..db5e4d815 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -713,8 +713,9 @@ module.exports = { confirmationOfRegulationsList: 'Regulation List Confirmation', regulatoryTaskConfirmation: 'Regulation Task Confirmation', - certificationStart: 'Homo KO', - certificationEnd: 'Homo Completion', + certificationStart: 'Homo Test Completion', + preHomoCompletion:'Pre-Homo Completion', + certificationEnd: 'Type Approval', directoryName: 'Catalogue Name', batch: 'Batch', uploadTime: 'Upload Time', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 43142beb5..9bb86cd15 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -728,8 +728,9 @@ module.exports = { time: '时间', confirmationOfRegulationsList: '法规清单确认', regulatoryTaskConfirmation: '法规任务确认', - certificationStart: '认证开始', - certificationEnd: '认证结束', + certificationStart: '认证试验结束', + preHomoCompletion:'摸底试验结束', + certificationEnd: '认证批准', directoryName: '目录名称', batch: '批次', uploadTime: '上传时间', diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index cb5f214a6..a16be93a9 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -71,12 +71,12 @@
* - - {{$t('PrehomoConfirmation')}} + + {{$t('preHomoCompletion')}}