From ebb83b0be5f90951f98aa493376b417ba4b12b5a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 Oct 2023 09:56:26 +0800 Subject: [PATCH 001/111] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E7=BC=96=E8=BE=91=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PlatformProjectLibraryBaseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2f0adfbce..3290c76af 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 @@ -661,7 +661,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl personnels = projectRelatedPersonnelService.list(personnelQueryWrapper); - if (!original.getStudioEngineer().equals(projectLibraryBase.getStudioEngineer())) { + if (StringUtils.isNotBlank(original.getStudioEngineer()) && !original.getStudioEngineer().equals(projectLibraryBase.getStudioEngineer())) { StringBuilder participator = new StringBuilder(); if (ObjectUtils.isNotEmpty(personnels)) { if (ObjectUtils.isNotEmpty(personnels.get(0).getLawEngineer())) { From 049810db90acb837af3bc11e10cd8a82f987e60c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 Oct 2023 14:24:26 +0800 Subject: [PATCH 002/111] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=EF=BC=88=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=8F=82=E6=95=B0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CertificationInventoryFlowStatusEnum.java | 1 + .../enums/ComplianceFlowStatusEnum.java | 1 + .../IProjectLawsInventoryEOService.java | 16 +- ...ctCertificationInventoryEOServiceImpl.java | 126 +++-- .../ProjectLawsInventoryEOServiceImpl.java | 482 +++++++++++++----- .../impl/ProjectLibraryBaseServiceImpl.java | 50 +- 6 files changed, 482 insertions(+), 194 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java index 211b6c269..ec640d4ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java @@ -29,6 +29,7 @@ public enum CertificationInventoryFlowStatusEnum { CERTIFICATION_RETURNED("认证退回","Certification returned","Certification returned"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"), + ACCEPTED_OF_RESPONSIBLE_PERSON("责任人接受","Accepted of responsible person","Accepted of responsible person"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), //ENGINEER_RETURN("工程师退回","Engineer return","Engineer return"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java index 6949a4ebb..204c3dee2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -11,6 +11,7 @@ public enum ComplianceFlowStatusEnum { LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"), DUTY_PERSON_REJECTED("责任人拒绝","Rejected by the responsible person","Duty Person Rejected"), + DUTY_PERSON_ACCEPTED("责任人接受","Accepted by the responsible person","Duty Person Accepted"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 2f2687e23..f63940732 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -264,7 +264,21 @@ public interface IProjectLawsInventoryEOService extends IService> getTaskToConfirmStatistics(List projectLawsInventoryEOList); +// List> getTaskToConfirmStatistics(List projectLawsInventoryEOList); + + /** + * 设计任务确认 + * @param projectLawsInventoryEOList + * @return + */ + List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList); + + /** + * 验证任务确认 + * @param projectLawsInventoryEOList + * @return + */ + List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList); /** * 获取设计符合性统计信息 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index a1522a076..713550590 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -53,7 +53,6 @@ import com.jero.modules.project.enums.ProjectMessageEnum; import com.jero.modules.project.enums.ProjectUserLocationEnum; import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.enums.RoleRelModelTypeEnum; -import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; @@ -83,7 +82,6 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; -import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; @@ -3276,28 +3274,36 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> getTaskToConfirmStatistics(List pciEoList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接受 + int rejectedCount = 0;//责任人拒绝 + if(CollectionUtils.isNotEmpty(pciEoList)){ - // 未发起 - notStartedCount = (int) pciEoList.stream().filter(pciEo -> { + // 清单待发布 + listToBeReleasedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) pciEoList.stream().filter(pciEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) pciEoList.stream().filter(pciEo -> { + boolean flag = ( + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + // 任务待确认 + taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - // 接受 + // 责任人接受 acceptedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) @@ -3307,7 +3313,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) @@ -3315,25 +3321,31 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); + + Map listToBeReleasedMap = new HashMap<>(); + Map taskToBeInitiatedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); Map acceptedMap = new HashMap<>(); Map rejectedMap = new HashMap<>(); - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("taskAffirmStatusCount",taskToBeInitiatedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatusCount",taskToBeConfirmedCount); + + acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.ACCEPTED_OF_RESPONSIBLE_PERSON.getValue()); acceptedMap.put("taskAffirmStatusCount",acceptedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); + rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); rejectedMap.put("taskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); result.add(acceptedMap); result.add(rejectedMap); return result; @@ -3343,13 +3355,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> getPrehomoStatistice(List pciEoList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int reviewAndPassCount = 0;//审查通过 + int reviewAndReturnCount = 0;//审查退回 + if(CollectionUtils.isNotEmpty(pciEoList)){ - // 未发起 - notStartedCount = (int) pciEoList.stream().filter(pciEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) @@ -3359,51 +3373,61 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { + // 结果待提交 + resultsToBeSubmittedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + ); + return flag; + }).count(); + // 结果待审查 + resultsToBeReviewedCount = (int) pciEoList.stream().filter(pciEo -> { + boolean flag = ( + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); // 审查通过 - acceptedCount = (int) pciEoList.stream().filter(pciEo -> { + reviewAndPassCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) ); return flag; }).count(); // 审查退回 - rejectedCount = (int) pciEoList.stream().filter(pciEo -> { + reviewAndReturnCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map reviewAndPassMap = new HashMap<>(); + Map reviewAndReturnMap = new HashMap<>(); - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + taskToBeConfirmedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("taskAffirmStatus", TodoCenterStatusEnum.TO_SUBMIT.getValue()); -// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("taskAffirmStatus", CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("taskAffirmStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + resultsToBeReviewedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("taskAffirmStatusCount",resultsToBeReviewedCount); - rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + reviewAndPassMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); + reviewAndPassMap.put("taskAffirmStatusCount",reviewAndPassCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + reviewAndReturnMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); + reviewAndReturnMap.put("taskAffirmStatusCount",reviewAndReturnCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(reviewAndPassMap); + result.add(reviewAndReturnMap); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index b1ba0d549..b253bf009 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9996,51 +9996,154 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getTaskToConfirmStatistics(List projectLawsInventoryEOList) { +// List> result = new ArrayList<>(); +// +// int notStartedCount = 0; +// int toConfirmCount = 0; +// int acceptedCount = 0; +// int rejectedCount = 0; +// if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ +// // 未发起 +// int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) +// ); +// return flag; +// }).count(); +// notStartedCount = designNotStartedCount + verifyNotStartedCount; +// +// // 待确认 +// int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// ); +// return flag; +// }).count(); +// toConfirmCount = designToConfirmCount + verifyToConfirmCount; +// +// // 接受 +// int designAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) +// ); +// return flag; +// }).count(); +// int verifyAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) +// ); +// return flag; +// }).count(); +// acceptedCount = designAcceptedCount + verifyAcceptedCount; +// +// // 拒绝 +// int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// ); +// return flag; +// }).count(); +// rejectedCount = designRejectedCount + verifyRejectedCount; +// } +// +// Map notStartedMap = new HashMap<>(); +// Map toConfirmMap = new HashMap<>(); +// Map acceptedMap = new HashMap<>(); +// Map rejectedMap = new HashMap<>(); +// +// notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); +// notStartedMap.put("taskAffirmStatusCount",notStartedCount); +// +// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); +// toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); +// +// acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); +// acceptedMap.put("taskAffirmStatusCount",acceptedCount); +// +// rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); +// rejectedMap.put("taskAffirmStatusCount",rejectedCount); +// +// result.add(notStartedMap); +// result.add(toConfirmMap); +// result.add(acceptedMap); +// result.add(rejectedMap); +// return result; +// } + + /** + * 设计任务确认 + * @param projectLawsInventoryEOList + * @return + */ @Override - public List> getTaskToConfirmStatistics(List projectLawsInventoryEOList) { + public List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); return flag; }).count(); - int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ); - return flag; - }).count(); - notStartedCount = designNotStartedCount + verifyNotStartedCount; - // 待确认 - int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ); - return flag; - }).count(); - toConfirmCount = designToConfirmCount + verifyToConfirmCount; - // 接受 - int designAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 责任人接收 + acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) @@ -10050,53 +10153,130 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) - ); - return flag; - }).count(); - acceptedCount = designAcceptedCount + verifyAcceptedCount; - // 拒绝 - int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 责任人拒绝 + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); return flag; }).count(); - int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + } + + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 + + listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("designTaskAffirmStatusCount",rejectedCount); + + taskToBeInitiatedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("designTaskAffirmStatusCount",rejectedCount); + + taskToBeConfirmedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designTaskAffirmStatusCount",rejectedCount); + + acceptedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("designTaskAffirmStatusCount",rejectedCount); + + rejectedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()); + rejectedMap.put("designTaskAffirmStatusCount",rejectedCount); + + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); + result.add(acceptedMap); + result.add(rejectedMap); + return result; + } + + /** + * 验证任务确认 + * @param projectLawsInventoryEOList + * @return + */ + @Override + public List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { + List> result = new ArrayList<>(); + + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + ); + return flag; + }).count(); + + // 任务待发起 + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + ); + return flag; + }).count(); + + // 责任人接收 + acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + ); + return flag; + }).count(); + + // 责任人拒绝 + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); return flag; }).count(); - rejectedCount = designRejectedCount + verifyRejectedCount; } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + listToBeReleasedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + taskToBeConfirmedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + acceptedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("verifyTaskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + rejectedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()); + rejectedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); result.add(acceptedMap); result.add(rejectedMap); return result; @@ -10105,31 +10285,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignComplianceStatistice(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - - int notStartedCount = 0; - int toConfirmCount = 0; - int complianceCount = 0; - int nonComplianceCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int complianceCount = 0;//符合 + int nonComplianceCount = 0;//不符合 + int toBeTrackedCount = 0;//待追踪 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) -// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 结果待提交 + resultsToBeSubmittedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) -// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + ); + return flag; + }).count(); + + // 结果待审查 + resultsToBeReviewedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); @@ -10141,69 +10328,91 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + ); + return flag; + }).count(); + // 待追踪 + toBeTrackedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map complianceMap = new HashMap<>(); + Map nonComplianceMap = new HashMap<>(); + Map toBeTrackedMap = new HashMap<>(); - notStartedMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("designFlowTaskStatusCount",notStartedCount); + taskToBeConfirmedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designFlowTaskStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("designFlowTaskStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("designFlowTaskStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); - acceptedMap.put("designFlowTaskStatusCount",complianceCount); + resultsToBeReviewedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("designFlowTaskStatusCount",resultsToBeReviewedCount); - rejectedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); - rejectedMap.put("designFlowTaskStatusCount",nonComplianceCount); + complianceMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); + complianceMap.put("designFlowTaskStatusCount",complianceCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + nonComplianceMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); + nonComplianceMap.put("designFlowTaskStatusCount",nonComplianceCount); + + toBeTrackedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.TO_TRACK.getValue()); + toBeTrackedMap.put("designFlowTaskStatusCount",toBeTrackedCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(complianceMap); + result.add(nonComplianceMap); + result.add(toBeTrackedMap); return result; } @Override public List> getVerifyComplianceStatistice(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - - int notStartedCount = 0; - int toConfirmCount = 0; - int complianceCount = 0; - int nonComplianceCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int complianceCount = 0;//符合 + int nonComplianceCount = 0;//不符合 + int toBeTrackedCount = 0;//待追踪 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) -// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 结果待提交 + resultsToBeSubmittedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) -// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + return flag; + }).count(); + + // 结果待审查 + resultsToBeReviewedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); @@ -10211,42 +10420,57 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); - // 不符合 nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + ); + return flag; + }).count(); + // 待追踪 + toBeTrackedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map complianceMap = new HashMap<>(); + Map nonComplianceMap = new HashMap<>(); + Map toBeTrackedMap = new HashMap<>(); - notStartedMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("verifyFlowTaskStatusCount",notStartedCount); + taskToBeConfirmedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyFlowTaskStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("verifyFlowTaskStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("verifyFlowTaskStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); - acceptedMap.put("verifyFlowTaskStatusCount",complianceCount); + resultsToBeReviewedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("verifyFlowTaskStatusCount",resultsToBeReviewedCount); - rejectedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); - rejectedMap.put("verifyFlowTaskStatusCount",nonComplianceCount); + complianceMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); + complianceMap.put("verifyFlowTaskStatusCount",complianceCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + nonComplianceMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); + nonComplianceMap.put("verifyFlowTaskStatusCount",nonComplianceCount); + + toBeTrackedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.TO_TRACK.getValue()); + toBeTrackedMap.put("verifyFlowTaskStatusCount",toBeTrackedCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(complianceMap); + result.add(nonComplianceMap); + result.add(toBeTrackedMap); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index fccc89134..2d16cd234 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1912,11 +1912,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = new HashMap<>(); // 认证任务确认 Map rzTaskToConfirmMap = new HashMap<>(); - - //清单确认统计 - /*List> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); - listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); - result.put("listingToConfirmMap",listingToConfirmMap);*/ + //设计任务确认 + Map designTaskToConfirmMap = new HashMap<>(); + //验证任务确认 + Map verifyTaskToConfirmMap = new HashMap<>(); QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); @@ -1925,17 +1924,42 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); //任务确认统计 - List> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); - int taskAffirmStatusCount = 0; - if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// List> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); +// int taskAffirmStatusCount = 0; +// if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// //taskAffirmStatusCount +// for (Map taskToConfirm : taskToConfirmMapList) { +// taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); +// } +// } +// taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); +// taskToConfirmMap.put("count",taskAffirmStatusCount); +// result.put("taskToConfirmMap",taskToConfirmMap); + //设计任务确认 + List> designTaskToConfirmMapList = this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList); + int designTaskAffirmStatusCount = 0; + if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){ //taskAffirmStatusCount - for (Map taskToConfirm : taskToConfirmMapList) { - taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); + for (Map taskToConfirm : designTaskToConfirmMapList) { + designTaskAffirmStatusCount += (int) taskToConfirm.get("designTaskAffirmStatusCount"); } } - taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); - taskToConfirmMap.put("count",taskAffirmStatusCount); - result.put("taskToConfirmMap",taskToConfirmMap); + designTaskToConfirmMap.put("designTaskToConfirmMapList",designTaskToConfirmMapList); + designTaskToConfirmMap.put("count",designTaskAffirmStatusCount); + result.put("designTaskToConfirmMap",designTaskToConfirmMap); + + //验证任务确认 + List> verifyTaskToConfirmMapList = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList); + int verifyTaskAffirmStatusCount = 0; + if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){ + //taskAffirmStatusCount + for (Map taskToConfirm : verifyTaskToConfirmMapList) { + verifyTaskAffirmStatusCount += (int) taskToConfirm.get("verifyTaskAffirmStatusCount"); + } + } + verifyTaskToConfirmMap.put("verifyTaskToConfirmMapList",verifyTaskToConfirmMapList); + verifyTaskToConfirmMap.put("count",verifyTaskAffirmStatusCount); + result.put("verifyTaskToConfirmMap",verifyTaskToConfirmMap); //设计符合性 List> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); From 8b0b0b5c76c412fc976bf4b6573899ce41297515 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 Oct 2023 14:47:41 +0800 Subject: [PATCH 003/111] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1--=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PlatformProjectLawsInventoryEOService.java | 16 +- ...ctCertificationInventoryEOServiceImpl.java | 124 +++-- ...formProjectLawsInventoryEOServiceImpl.java | 490 +++++++++++++----- ...PlatformProjectLibraryBaseServiceImpl.java | 46 +- 4 files changed, 479 insertions(+), 197 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java index e12e83503..6157f7ba7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java @@ -264,7 +264,21 @@ public interface IPlatformProjectLawsInventoryEOService extends IService> getTaskToConfirmStatistics(List projectLawsInventoryEOList); +// List> getTaskToConfirmStatistics(List projectLawsInventoryEOList); + + /** + * 设计任务确认 + * @param projectLawsInventoryEOList + * @return + */ + List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList); + + /** + * 验证任务确认 + * @param projectLawsInventoryEOList + * @return + */ + List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList); /** * 获取设计符合性统计信息 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index e01abb68b..e7fc3cdd6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -3376,28 +3376,36 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI public List> getTaskToConfirmStatistics(List pciEoList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接受 + int rejectedCount = 0;//责任人拒绝 + if(CollectionUtils.isNotEmpty(pciEoList)){ - // 未发起 - notStartedCount = (int) pciEoList.stream().filter(pciEo -> { + // 清单待发布 + listToBeReleasedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) pciEoList.stream().filter(pciEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) pciEoList.stream().filter(pciEo -> { + boolean flag = ( + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + // 任务待确认 + taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - // 接受 + // 责任人接受 acceptedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) @@ -3407,7 +3415,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI ); return flag; }).count(); - // 拒绝 + // 责任人拒绝 rejectedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) @@ -3415,25 +3423,31 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); + + Map listToBeReleasedMap = new HashMap<>(); + Map taskToBeInitiatedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); Map acceptedMap = new HashMap<>(); Map rejectedMap = new HashMap<>(); - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("taskAffirmStatusCount",taskToBeInitiatedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatusCount",taskToBeConfirmedCount); + + acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.ACCEPTED_OF_RESPONSIBLE_PERSON.getValue()); acceptedMap.put("taskAffirmStatusCount",acceptedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); + rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); rejectedMap.put("taskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); result.add(acceptedMap); result.add(rejectedMap); return result; @@ -3443,13 +3457,15 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI public List> getPrehomoStatistice(List pciEoList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int reviewAndPassCount = 0;//审查通过 + int reviewAndReturnCount = 0;//审查退回 + if(CollectionUtils.isNotEmpty(pciEoList)){ - // 未发起 - notStartedCount = (int) pciEoList.stream().filter(pciEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) @@ -3459,51 +3475,61 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) pciEoList.stream().filter(pciEo -> { + // 结果待提交 + resultsToBeSubmittedCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + ); + return flag; + }).count(); + // 结果待审查 + resultsToBeReviewedCount = (int) pciEoList.stream().filter(pciEo -> { + boolean flag = ( + StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); // 审查通过 - acceptedCount = (int) pciEoList.stream().filter(pciEo -> { + reviewAndPassCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) ); return flag; }).count(); // 审查退回 - rejectedCount = (int) pciEoList.stream().filter(pciEo -> { + reviewAndReturnCount = (int) pciEoList.stream().filter(pciEo -> { boolean flag = ( StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map reviewAndPassMap = new HashMap<>(); + Map reviewAndReturnMap = new HashMap<>(); - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + taskToBeConfirmedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("taskAffirmStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("taskAffirmStatus", TodoCenterStatusEnum.TO_SUBMIT.getValue()); -// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("taskAffirmStatus", CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("taskAffirmStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + resultsToBeReviewedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("taskAffirmStatusCount",resultsToBeReviewedCount); - rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + reviewAndPassMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); + reviewAndPassMap.put("taskAffirmStatusCount",reviewAndPassCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + reviewAndReturnMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); + reviewAndReturnMap.put("taskAffirmStatusCount",reviewAndReturnCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(reviewAndPassMap); + result.add(reviewAndReturnMap); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index f25ae55b1..bf7fc3a09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -10026,139 +10026,314 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl> getTaskToConfirmStatistics(List projectLawsInventoryEOList) { + public List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int acceptedCount = 0; - int rejectedCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) ); return flag; }).count(); - int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ); - return flag; - }).count(); - notStartedCount = designNotStartedCount + verifyNotStartedCount; - // 待确认 - int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ); - return flag; - }).count(); - toConfirmCount = designToConfirmCount + verifyToConfirmCount; - // 接受 - int designAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 责任人接收 + acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).count(); - int verifyAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) - ); - return flag; - }).count(); - acceptedCount = designAcceptedCount + verifyAcceptedCount; - // 拒绝 - int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 责任人拒绝 + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); return flag; }).count(); - int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - ); - return flag; - }).count(); - rejectedCount = designRejectedCount + verifyRejectedCount; } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 - notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("taskAffirmStatusCount",notStartedCount); + listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("designTaskAffirmStatusCount",rejectedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); + taskToBeInitiatedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("designTaskAffirmStatusCount",rejectedCount); - acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); - acceptedMap.put("taskAffirmStatusCount",acceptedCount); + taskToBeConfirmedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designTaskAffirmStatusCount",rejectedCount); - rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); - rejectedMap.put("taskAffirmStatusCount",rejectedCount); + acceptedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("designTaskAffirmStatusCount",rejectedCount); - result.add(notStartedMap); - result.add(toConfirmMap); + rejectedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()); + rejectedMap.put("designTaskAffirmStatusCount",rejectedCount); + + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); result.add(acceptedMap); result.add(rejectedMap); return result; } - @Override - public List> getDesignComplianceStatistice(List projectLawsInventoryEOList) { + public List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - int notStartedCount = 0; - int toConfirmCount = 0; - int complianceCount = 0; - int nonComplianceCount = 0; + int listToBeReleasedCount = 0;//清单待发布 + int taskToBeInitiatedCount = 0;//任务待发起 + int taskToBeConfirmedCount = 0;//任务待确认 + int acceptedCount = 0;//责任人接收 + int rejectedCount = 0;//责任人拒绝 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 清单待发布 + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) -// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待发起 + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + ); + return flag; + }).count(); + + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + ); + return flag; + }).count(); + + // 责任人接收 + acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + ); + return flag; + }).count(); + + // 责任人拒绝 + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + ); + return flag; + }).count(); + } + + Map listToBeReleasedMap = new HashMap<>();//清单待发布 + Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 + Map taskToBeConfirmedMap = new HashMap<>();//任务待确认 + Map acceptedMap = new HashMap<>();//责任人接收 + Map rejectedMap = new HashMap<>();//责任人拒绝 + + listToBeReleasedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + listToBeReleasedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + taskToBeInitiatedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + taskToBeInitiatedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + taskToBeConfirmedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + acceptedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_ACCEPTED.getValue()); + acceptedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + rejectedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()); + rejectedMap.put("verifyTaskAffirmStatusCount",rejectedCount); + + result.add(listToBeReleasedMap); + result.add(taskToBeInitiatedMap); + result.add(taskToBeConfirmedMap); + result.add(acceptedMap); + result.add(rejectedMap); + return result; + } +// @Override +// public List> getTaskToConfirmStatistics(List projectLawsInventoryEOList) { +// List> result = new ArrayList<>(); +// +// int notStartedCount = 0; +// int toConfirmCount = 0; +// int acceptedCount = 0; +// int rejectedCount = 0; +// if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ +// // 未发起 +// int designNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyNotStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) +// ); +// return flag; +// }).count(); +// notStartedCount = designNotStartedCount + verifyNotStartedCount; +// +// // 待确认 +// int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// ); +// return flag; +// }).count(); +// toConfirmCount = designToConfirmCount + verifyToConfirmCount; +// +// // 接受 +// int designAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) // || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) +// ); +// return flag; +// }).count(); +// int verifyAcceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) +// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) +// ); +// return flag; +// }).count(); +// acceptedCount = designAcceptedCount + verifyAcceptedCount; +// +// // 拒绝 +// int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// ); +// return flag; +// }).count(); +// int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) +// ); +// return flag; +// }).count(); +// rejectedCount = designRejectedCount + verifyRejectedCount; +// } +// +// Map notStartedMap = new HashMap<>(); +// Map toConfirmMap = new HashMap<>(); +// Map acceptedMap = new HashMap<>(); +// Map rejectedMap = new HashMap<>(); +// +// notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); +// notStartedMap.put("taskAffirmStatusCount",notStartedCount); +// +// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); +// toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); +// +// acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue()); +// acceptedMap.put("taskAffirmStatusCount",acceptedCount); +// +// rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue()); +// rejectedMap.put("taskAffirmStatusCount",rejectedCount); +// +// result.add(notStartedMap); +// result.add(toConfirmMap); +// result.add(acceptedMap); +// result.add(rejectedMap); +// return result; +// } + + @Override + public List> getDesignComplianceStatistice(List projectLawsInventoryEOList) { + List> result = new ArrayList<>(); + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int complianceCount = 0;//符合 + int nonComplianceCount = 0;//不符合 + int toBeTrackedCount = 0;//待追踪 + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + + ); + return flag; + }).count(); + + // 结果待提交 + resultsToBeSubmittedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + return flag; + }).count(); + + // 结果待审查 + resultsToBeReviewedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); @@ -10170,69 +10345,91 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + ); + return flag; + }).count(); + // 待追踪 + toBeTrackedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map complianceMap = new HashMap<>(); + Map nonComplianceMap = new HashMap<>(); + Map toBeTrackedMap = new HashMap<>(); - notStartedMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("designFlowTaskStatusCount",notStartedCount); + taskToBeConfirmedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("designFlowTaskStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("designFlowTaskStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("designFlowTaskStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); - acceptedMap.put("designFlowTaskStatusCount",complianceCount); + resultsToBeReviewedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("designFlowTaskStatusCount",resultsToBeReviewedCount); - rejectedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); - rejectedMap.put("designFlowTaskStatusCount",nonComplianceCount); + complianceMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); + complianceMap.put("designFlowTaskStatusCount",complianceCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + nonComplianceMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); + nonComplianceMap.put("designFlowTaskStatusCount",nonComplianceCount); + + toBeTrackedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.TO_TRACK.getValue()); + toBeTrackedMap.put("designFlowTaskStatusCount",toBeTrackedCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(complianceMap); + result.add(nonComplianceMap); + result.add(toBeTrackedMap); return result; } @Override public List> getVerifyComplianceStatistice(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); - - int notStartedCount = 0; - int toConfirmCount = 0; - int complianceCount = 0; - int nonComplianceCount = 0; + int taskToBeConfirmedCount = 0;//任务待确认 + int resultsToBeSubmittedCount = 0;//结果待提交 + int resultsToBeReviewedCount = 0;//结果待审查 + int complianceCount = 0;//符合 + int nonComplianceCount = 0;//不符合 + int toBeTrackedCount = 0;//待追踪 if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - // 未发起 - notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 任务待确认 + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) -// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + ); return flag; }).count(); - // 待确认 - toConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + // 结果待提交 + resultsToBeSubmittedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) -// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + ); + return flag; + }).count(); + + // 结果待审查 + resultsToBeReviewedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) ); return flag; }).count(); @@ -10240,42 +10437,57 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); - // 不符合 nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) + ); + return flag; + }).count(); + // 待追踪 + toBeTrackedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + boolean flag = ( + StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) ); return flag; }).count(); } - Map notStartedMap = new HashMap<>(); - Map toConfirmMap = new HashMap<>(); - Map acceptedMap = new HashMap<>(); - Map rejectedMap = new HashMap<>(); + Map taskToBeConfirmedMap = new HashMap<>(); + Map resultsToBeSubmittedMap = new HashMap<>(); + Map resultsToBeReviewedMap = new HashMap<>(); + Map complianceMap = new HashMap<>(); + Map nonComplianceMap = new HashMap<>(); + Map toBeTrackedMap = new HashMap<>(); - notStartedMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); - notStartedMap.put("verifyFlowTaskStatusCount",notStartedCount); + taskToBeConfirmedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + taskToBeConfirmedMap.put("verifyFlowTaskStatusCount",taskToBeConfirmedCount); - toConfirmMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); - toConfirmMap.put("verifyFlowTaskStatusCount",toConfirmCount); + resultsToBeSubmittedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); + resultsToBeSubmittedMap.put("verifyFlowTaskStatusCount",resultsToBeSubmittedCount); - acceptedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); - acceptedMap.put("verifyFlowTaskStatusCount",complianceCount); + resultsToBeReviewedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()); + resultsToBeReviewedMap.put("verifyFlowTaskStatusCount",resultsToBeReviewedCount); - rejectedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); - rejectedMap.put("verifyFlowTaskStatusCount",nonComplianceCount); + complianceMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue()); + complianceMap.put("verifyFlowTaskStatusCount",complianceCount); - result.add(notStartedMap); - result.add(toConfirmMap); - result.add(acceptedMap); - result.add(rejectedMap); + nonComplianceMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue()); + nonComplianceMap.put("verifyFlowTaskStatusCount",nonComplianceCount); + + toBeTrackedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.TO_TRACK.getValue()); + toBeTrackedMap.put("verifyFlowTaskStatusCount",toBeTrackedCount); + + result.add(taskToBeConfirmedMap); + result.add(resultsToBeSubmittedMap); + result.add(resultsToBeReviewedMap); + result.add(complianceMap); + result.add(nonComplianceMap); + result.add(toBeTrackedMap); return result; } 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 3290c76af..9f5335a0a 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 @@ -1600,6 +1600,10 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = new HashMap<>(); // 认证任务确认 Map rzTaskToConfirmMap = new HashMap<>(); + //设计任务确认 + Map designTaskToConfirmMap = new HashMap<>(); + //验证任务确认 + Map verifyTaskToConfirmMap = new HashMap<>(); //清单确认统计 /*List> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); @@ -1613,17 +1617,43 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); //任务确认统计 - List> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); - int taskAffirmStatusCount = 0; - if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// List> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); +// int taskAffirmStatusCount = 0; +// if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ +// //taskAffirmStatusCount +// for (Map taskToConfirm : taskToConfirmMapList) { +// taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); +// } +// } +// taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); +// taskToConfirmMap.put("count",taskAffirmStatusCount); +// result.put("taskToConfirmMap",taskToConfirmMap); + + //设计任务确认 + List> designTaskToConfirmMapList = this.platformProjectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList); + int designTaskAffirmStatusCount = 0; + if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){ //taskAffirmStatusCount - for (Map taskToConfirm : taskToConfirmMapList) { - taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); + for (Map taskToConfirm : designTaskToConfirmMapList) { + designTaskAffirmStatusCount += (int) taskToConfirm.get("designTaskAffirmStatusCount"); } } - taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); - taskToConfirmMap.put("count",taskAffirmStatusCount); - result.put("taskToConfirmMap",taskToConfirmMap); + designTaskToConfirmMap.put("designTaskToConfirmMapList",designTaskToConfirmMapList); + designTaskToConfirmMap.put("count",designTaskAffirmStatusCount); + result.put("designTaskToConfirmMap",designTaskToConfirmMap); + + //验证任务确认 + List> verifyTaskToConfirmMapList = this.platformProjectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList); + int verifyTaskAffirmStatusCount = 0; + if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){ + //taskAffirmStatusCount + for (Map taskToConfirm : verifyTaskToConfirmMapList) { + verifyTaskAffirmStatusCount += (int) taskToConfirm.get("verifyTaskAffirmStatusCount"); + } + } + verifyTaskToConfirmMap.put("verifyTaskToConfirmMapList",verifyTaskToConfirmMapList); + verifyTaskToConfirmMap.put("count",verifyTaskAffirmStatusCount); + result.put("verifyTaskToConfirmMap",verifyTaskToConfirmMap); //设计符合性 From c82c40fe187b210f38913042ff5e7185703cfb60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 16 Oct 2023 18:01:39 +0800 Subject: [PATCH 004/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/ProjectDetails.vue | 2 +- .../components/certificationActivity.vue | 40 ++- .../parameterCollectionProgress.vue | 4 +- .../components/regulatoryCompliance.vue | 224 +++++++++++---- .../components/statistics.vue | 259 +++++++++++++----- 7 files changed, 406 insertions(+), 129 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 93e296293..80cb0a3be 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1771,6 +1771,7 @@ module.exports = { andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned', deliverablesFor:'Deliverables for', dutyPersonRejected:'Rejected by the responsible person', + acceptanceTheResponsiblePerson:'Acceptance by the responsible person', theCurrentlySelectedDataContainsReviewed:'The currently selected data contains reviewed data. Are you sure to return it?', reviewTheReasonForReturn:'Review the reason for return', reasonForTaskRejection:'Reason for task rejection', @@ -2019,4 +2020,6 @@ module.exports = { Filingcompletiontime:'Filing completion time', Platformdevelopmentvalvepoint:'Platform development valve point', Compliancemanagementvalvepoint:'Compliance management valve point', + designTaskValidation:'Design task validation', + verificationTaskValidation:'Verification task validation', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 653497dc2..579f9ec35 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3778,6 +3778,7 @@ module.exports = { andPendingSubmissionReviewReturned: '并且流程状态为结果待提交、审查退回', deliverablesFor: '的交付结果', dutyPersonRejected: '责任人拒绝', + acceptanceTheResponsiblePerson:'责任人接受', theCurrentlySelectedDataContainsReviewed: '当前选择的数据中包含审查通过的数据，确认退回吗？', reviewTheReasonForReturn: '审查退回原因', reasonForTaskRejection: '任务拒绝原因', @@ -3975,4 +3976,6 @@ module.exports = { Filingcompletiontime:'备案完成时间', Platformdevelopmentvalvepoint:'平台件开发阀点', Compliancemanagementvalvepoint:'合规管理阀点', + designTaskValidation:'设计任务确认', + verificationTaskValidation:'验证任务确认', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 63246a914..ea759280f 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -71,7 +71,7 @@
RXSWIN - diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index b19a1314f..c6b4c388e 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -110,34 +110,42 @@ if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { - if (res.taskAffirmStatus == 'Not started') { + if (res.taskAffirmStatus == 'List to be released') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('notLaunch'), + name: this.$t('listToBeReleased'), color: '#00B3BE', status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'List to confirm') { + } else if (res.taskAffirmStatus == 'List to be checked') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('listToConfirm'), + name: this.$t('listToBeChecked'), + color: '#4B82FF', + status: res.taskAffirmStatus + }) + color.push('#4B82FF') + } else if (res.taskAffirmStatus == 'Task to be confirmed') { + data.push({ + value: res.taskAffirmStatusCount, + name: this.$t('taskToBeConfirmed'), color: '#FDA71C', status: res.taskAffirmStatus }) color.push('#FDA71C') - } else if (res.taskAffirmStatus == 'Accepted') { + } else if (res.taskAffirmStatus == 'Refusal of responsible person') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('accept'), + name: this.$t('acceptanceTheResponsiblePerson'), color: '#26BC4B', status: res.taskAffirmStatus }) color.push('#26BC4B') - } else if (res.taskAffirmStatus == 'Rejected') { + }else if (res.taskAffirmStatus == 'Accepted of responsible person') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('refuse'), + name: this.$t('dutyPersonRejected'), color: '#E83030', status: res.taskAffirmStatus }) @@ -155,22 +163,30 @@ if (dataSource && dataSource.length > 0) { this.dataSource = [{}] dataSource.forEach(res => { - if (res.taskAffirmStatus == 'Not started') { + if (res.taskAffirmStatus == 'Task to be confirmed') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('notLaunch'), + name: this.$t('taskToBeConfirmed'), color: '#00B3BE', status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'To submit') { + } else if (res.taskAffirmStatus == 'Results to be submitted') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('toSubmit'), + name: this.$t('resultsToBeSubmitted'), color: '#FDA71C', status: res.taskAffirmStatus }) color.push('#FDA71C') + }else if (res.taskAffirmStatus == 'Results to be reviewed') { + data.push({ + value: res.taskAffirmStatusCount, + name: this.$t('resultsToBeReviewed'), + color: '#745ADB', + status: res.taskAffirmStatus + }) + color.push('#745ADB') } else if (res.taskAffirmStatus == 'Review and pass') { data.push({ value: res.taskAffirmStatusCount, diff --git a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue index 3e7bd272a..2aca019fe 100644 --- a/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue +++ b/jero-web/src/views/projectManagement/components/parameterCollectionProgress.vue @@ -239,7 +239,7 @@ text: this.$t('parameterCollectionProgress'), }, legend: { - data: [this.$t('Notatthe'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')], + data: [this.$t('notLaunch'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')], icon: 'circle', bottom:'0', itemWidth: 12, @@ -294,7 +294,7 @@ }, series: [ { - name: this.$t('Notatthe'), + name: this.$t('notLaunch'), type: 'bar', stack: 'one', barWidth: 40, diff --git a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue index 9b6e851cd..824863613 100644 --- a/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue +++ b/jero-web/src/views/projectManagement/components/regulatoryCompliance.vue @@ -1,10 +1,16 @@ \ No newline at end of file From bb106f3f9df4cae051602f7454e1f2e484ba379c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 20 Oct 2023 15:50:37 +0800 Subject: [PATCH 042/111] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=94=B5=E6=B1=A0=E5=A4=87=E6=A1=88=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=89=93=E5=BC=80=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vdrDetial.vue | 6 +- .../components/ProjectDetails.vue | 34 +- .../components/addModel.vue | 672 +++++++++--------- .../components/editBattery.vue | 587 +++++++++++++++ 4 files changed, 951 insertions(+), 348 deletions(-) create mode 100644 jero-web/src/views/projectManagement/platformItemLibraryDetails/components/editBattery.vue diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue index 4a0f80e98..96445b1a0 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue @@ -17,7 +17,7 @@
{{'VDR'}} + @click="vdrClick(form.vdr)" :title="form.vdr"> {{form.vdr}}
@@ -198,8 +198,8 @@ isEdit() { this.disabled = false }, - vdrClick() { - window.open('http://jira.nioint.com/browse/issue_key') + vdrClick(row) { + window.open('http://jira.nioint.com/browse/' + row) } } } diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue index 814d1e483..0fa5b81cd 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue @@ -14,6 +14,12 @@
+
+ {{$t('platformType')}} + {{queryForm.platformType}} +
{{$t('power')}} {{queryForm.producer}}
+
+
{{$t('targetMarket')}} {{queryForm.targetMarket_dictText}}
-
-
{{$t('brand')}} {{queryForm.projectStatus_dictText}}
+
+
{{$t('statisticalNodes')}} {{queryForm.dutyDepart}}
-
-
{{$t('regulatoryEngineer')}} {{queryForm.engineeringInterfacePersonName}}
+
+
- {{$t('platformType')}} + {{$t('Batteryfilingrecord')}} {{queryForm.platformType}} + @click="editBattery" + style="color: #00B3BE;cursor: pointer" + :title="$t('edit')" + >{{$t('edit')}}
@@ -140,6 +150,7 @@ +
@@ -151,6 +162,7 @@ import complianceCertificationForm from './complianceCertificationForm' import settingList from './settingList' import projectStatus from './projectStatus' + import editBattery from './editBattery' import { mapGetters } from 'vuex' export default { @@ -160,7 +172,8 @@ settingList, projectStatus, versionStatistics, - complianceCertificationForm + complianceCertificationForm, + editBattery }, data() { return { @@ -308,7 +321,10 @@ }, projectStatusForm(activeKey) { this.activeKey = activeKey - } + }, + editBattery(){ + this.$refs.editBatteryRef.editModel(this.queryForm) + }, } } diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue index 74623f73a..476598508 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue @@ -16,6 +16,18 @@ {{$t('basicInformationOfParameters')}} + +
+
+ * + {{$t('platformType')}} +
+ + + +
+
@@ -28,6 +40,8 @@
+ +
@@ -40,8 +54,6 @@
- -
@@ -57,6 +69,9 @@
+ + +
@@ -72,8 +87,6 @@
- -
@@ -89,6 +102,8 @@
+ +
@@ -115,8 +130,6 @@
- -
@@ -126,39 +139,29 @@
- -
-
- * - {{$t('engineeringInterfacePerson')}} -
- - - -
-
* - {{$t('platformType')}} + {{$t('engineeringInterfacePerson')}}
- - + +
@@ -211,313 +214,313 @@ -
- {{$t('Batteryfilingrecord')}} -
- -
- {{$t('Modelinformation')}} -
- - -
-
- {{$t('productModel')}} -
- - - -
- - -
-
- {{$t('Electriccellproductionenterprises')}} -
- - - -
- - - - -
-
- {{$t('Assemblymanufacturer')}} -
- - - -
- - -
-
- {{$t('PartNumberCN')}} -
- - - -
- - - - -
-
- {{$t('PartNumberEU')}} -
- - - -
- - - -
- {{$t('Batterynationalcode')}} -
- - -
-
- {{$t('bitfilecode')}} -
- - - -
- - -
-
- {{$t('Vendorcode') + '(1～3)'}} -
- - - -
- - - - -
-
- {{$t('Productclasscode') + '(4)'}} -
- - - -
- - -
-
- {{$t('Batterytypecode') + '(5)'}} -
- - - -
- - - - -
-
- {{$t('Specificationcode') + '(6～7)'}} -
- - - -
- - -
-
- {{$t('Traceinformationcode') + '(8～14)'}} -
- - - -
- - - - -
-
- {{$t('Productionyearmonthdateserialnumber') + '(15～20)'}} -
- - - -
- - - -
- {{$t('Recordnformation')}} -
- - -
-
- {{$t('dimension')}} -
- - - -
- - -
-
- {{$t('Ratedcapacity')}} -
- - - -
- - - - -
-
- {{$t('Nominalvoltage')}} -
- - - -
- - -
-
- {{$t('Ratedmass')}} -
- - - -
- - - - -
-
- {{$t('Numbercontainedmodules')}} -
- - - -
- - -
-
- {{$t('Moduleseriesparallelmode')}} -
- - - -
- - - - -
-
- {{$t('modulspecificationcodeused')}} -
- - - -
- - -
-
- {{$t('Coolingmode')}} -
- - - -
- - - -
- {{$t('remarks')}} -
- - -
-
- {{$t('Filingcompletiontime')}} -
- - - -
- - - - -
-
- {{$t('remarks')}} -
- - - -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -819,7 +822,6 @@ list.forEach((item => { getAction('sys/common/getFileInfos', { id: item }).then((res) => { if (res.success) { - console.log(res.result) res.result.forEach((item => { file.push({ name: item.fileName, @@ -867,10 +869,8 @@ this.title = this.$t('edit') this.formInline.engineeringInterfacePersonName = value.engineeringInterfacePersonName this.formInline.regulationOwnerIdName = value.regulationOwnerIdName - console.log(this.formInline.engineeringInterfacePersonName, this.formInline.engineeringInterfacePersonName) const token = Vue.ls.get(ACCESS_TOKEN) this.headers = { 'X-Access-Token': token } - console.log(this.headers) this.getNameList(value) this.$nextTick(() => { this.$refs.ruleForm.clearValidate() diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/editBattery.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/editBattery.vue new file mode 100644 index 000000000..a89308eed --- /dev/null +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/editBattery.vue @@ -0,0 +1,587 @@ + + + + + + + \ No newline at end of file From 5e57cf894f0b9f8bdfb5a7c201550b0aef6bbf69 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 20 Oct 2023 16:53:41 +0800 Subject: [PATCH 043/111] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PlatformProjectLibraryBaseServiceImpl.java | 8 ++++---- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 4 ++-- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- .../service/impl/ProjectLibraryBaseServiceImpl.java | 6 +++--- 4 files changed, 10 insertions(+), 10 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 19922b462..46be7e98a 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 @@ -1140,7 +1140,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(libraryBaseList)){ String dictItemText = DictItemUtil.getDictItemText(cut, libraryBaseList.get(0).getTargetMarket(), targetMarketList); - String configItem = libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText; + String configItem = libraryBaseList.get(0).getPlatformType() + "-" + libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText; certificationInventoryEO.setConfigItem(configItem); // certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); @@ -7217,7 +7217,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Fri, 20 Oct 2023 18:05:41 +0800 Subject: [PATCH 044/111] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= =?UTF-8?q?=E4=B8=80=E7=BA=A7--=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/mapper/SysDictItemMapper.java | 2 +- .../service/impl/SysDictItemServiceImpl.java | 28 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index 45c415dc5..807763af2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -26,7 +26,7 @@ public interface SysDictItemMapper extends BaseMapper { @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc") public List selectItemsOrderBySortOrder(String dictCode); - @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0") + @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0 ORDER BY sys_dict_item.sort_order ASC") List selectItemsAll(); /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 09e1f1a81..7c18c1be2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -2,21 +2,24 @@ package com.jero.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; -import com.jero.common.system.vo.DictModel; -import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -275,16 +278,11 @@ public class SysDictItemServiceImpl extends ServiceImpl> result = null; - if(CollectionUtils.isNotEmpty(sysDictItemByDictCode)){ - result = sysDictItems.stream().filter(sysDict -> { - boolean flag = false; - if (StringUtils.isNotEmpty(sysDict.getStatNode())) { - flag = true; - } - return flag; - }).collect(Collectors.groupingBy(SysDictItem::getStatNode)); + List statNodeList = sysDictItemByDictCode.stream().map(SysDictItem::getStatNode).distinct().collect(Collectors.toList()); + Map> result = new LinkedHashMap<>(); + for (String node : statNodeList) { + List collect = sysDictItemByDictCode.stream().filter(e -> node.equals(e.getStatNode())).collect(Collectors.toList()); + result.put(node,collect); } return result; } From 8533d04f1f58102596470b68a46a02fae8cd35ed Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 20 Oct 2023 18:06:56 +0800 Subject: [PATCH 045/111] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=E4=BC=98=E5=85=88=E7=BA=A7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 591e0517c..04eae0511 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1321,6 +1321,10 @@ ADD COLUMN `extension_item_count` int(10) NULL COMMENT '扩展任务数量' AFTE ALTER TABLE `laws_monthly_report_write` ADD COLUMN `save_state` varchar(10) NULL COMMENT '保存状态（0->暂存，1->提交）' AFTER `technology_territory_en`; +-- 问题管理添加问题优先级字段 2023-10-20 +ALTER TABLE `problem_management` +ADD COLUMN `problem_priority` varchar(10) NULL COMMENT '问题优先级' AFTER `approval_evidence_link`; + From 9fb9df65c2fd738ae26a06c6ae0f4a8f2eae7c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 22 Oct 2023 11:08:59 +0800 Subject: [PATCH 046/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../components/projectStatus.vue | 45 +- .../projectNonConformance/index.vue | 19 + .../moudles/TrackingModel.vue | 356 +++++ .../moudles/addModel.vue | 1197 ++++++++++------- 6 files changed, 1139 insertions(+), 486 deletions(-) create mode 100644 jero-web/src/views/projectManagement/projectNonConformance/moudles/TrackingModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b3d9eed72..12cd3ce78 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -2024,4 +2024,8 @@ module.exports = { verificationTaskValidation: 'Verification task validation', platformType: 'Platform Type', extensionItems:'Extension Items', + problemPriority:'Problem Priority', + high:'High', + centre:'Centre', + low:'Low', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2451c737c..1e1227441 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3980,4 +3980,8 @@ module.exports = { verificationTaskValidation:'验证任务确认', platformType:'平台件类型', extensionItems:'扩展任务数量', + problemPriority:'问题优先级', + high:'高', + centre:'中', + low:'低', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/projectStatus.vue b/jero-web/src/views/projectManagement/components/projectStatus.vue index aa9e2a4af..ee34ebcd4 100644 --- a/jero-web/src/views/projectManagement/components/projectStatus.vue +++ b/jero-web/src/views/projectManagement/components/projectStatus.vue @@ -1,36 +1,36 @@ @@ -60,8 +60,8 @@ } }, methods: { - activeKeyChange(){ - this.$emit('projectStatusForm',this.activeKey) + activeKeyChange() { + this.$emit('projectStatusForm', this.activeKey) }, currentStatus(item) { this.$emit('currentStatus', item) @@ -89,7 +89,8 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index cf457048e..8163a3d0d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -165,6 +165,17 @@ {{result.problemState ? result.problemState : ''}}
+ + + {{$t('high')}} + + + {{$t('centre')}} + + + {{$t('low')}} + + @@ -296,6 +307,14 @@ ellipsis: true, scopedSlots: { customRender: 'CertificationProgress' } }, + { + title: this.$t('problemPriority'), + align: 'left', + dataIndex: 'problemPriority', + width: 120, + ellipsis: true, + scopedSlots: { customRender: 'problemPriority' } + }, { title: this.$t('createTime'), align: 'left', diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/TrackingModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/TrackingModel.vue new file mode 100644 index 000000000..35ebd6f0c --- /dev/null +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/TrackingModel.vue @@ -0,0 +1,356 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 3123bfdcb..37be64368 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -55,7 +55,7 @@ + :placeholder="$t('PleaseEnter')+'PS-issue'+$t('link')"/>
@@ -176,11 +176,28 @@ {{$t('descriptions')}}
- - + +
+ +
+ {{$t('putAway')}} + {{$t('open')}} + + + +
@@ -203,7 +220,9 @@ -
@@ -226,16 +245,34 @@ :title="$t('progresstracking')">{{$t('progresstracking')}}
-
+
- - {{$t('newlyAdded')}} - {{$t('delete')}} +
+ +
+ + + + + + + {{$t('newlyAdded')}} + {{$t('delete')}} + + {{$t('putAway')}} + {{$t('open')}}
@@ -249,11 +286,15 @@ {{$t('conculsion')}}
- - + + + + + +
@@ -276,9 +317,10 @@ - + type="minus" :disabled="disabled"/> @@ -318,489 +360,716 @@ {{$t('progresstracking')}} - + + + + + + + + \ No newline at end of file From 21ca5f4503ca1e64d06ecac49f44dd4a0f4de303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 22 Oct 2023 11:13:09 +0800 Subject: [PATCH 047/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/certificationActivity.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index c6b4c388e..39ba73256 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -134,7 +134,7 @@ status: res.taskAffirmStatus }) color.push('#FDA71C') - } else if (res.taskAffirmStatus == 'Refusal of responsible person') { + } else if (res.taskAffirmStatus == 'Accepted of responsible person') { data.push({ value: res.taskAffirmStatusCount, name: this.$t('acceptanceTheResponsiblePerson'), @@ -142,7 +142,7 @@ status: res.taskAffirmStatus }) color.push('#26BC4B') - }else if (res.taskAffirmStatus == 'Accepted of responsible person') { + }else if (res.taskAffirmStatus == 'Refusal of responsible person') { data.push({ value: res.taskAffirmStatusCount, name: this.$t('dutyPersonRejected'), From 59c4b632f8118689b8fb2b985a27f0000fbe941f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 22 Oct 2023 12:15:06 +0800 Subject: [PATCH 048/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moudles/addModel.vue | 52 ++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 37be64368..3af6b2024 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -191,6 +191,10 @@ @blur="quilleditorBlur" @change="onEditorChange($event)" /> + {{$t('putAway')}} {{$t('open')}} @@ -249,16 +253,21 @@ v-for="(item,index) in formInline.progressTrackingList" :key="index">
- + + + + + + + + + + +
+
@@ -607,7 +616,7 @@ this.problemState = this.$t('emptyc') } let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - let text = this.userInfo().username + ' ' + time + ' ' + this.$t('Problemstate') + this.$t('by') + '\'' + this.problemState + '\'' + this.$t('Changeto') + '\'' + value + '\'' + let text = '

'+this.userInfo().username + ' ' + time+'

' + ' ' + this.$t('Problemstate') + this.$t('by') + '\'' + this.problemState + '\'' + this.$t('Changeto') + '\'' + value + '\'' if (JSON.stringify(this.formInline.progressTrackingList[0]) == '{}' || this.formInline.progressTrackingList[0].progressTracking == '') { this.formInline.progressTrackingList.forEach((item, index) => { item.progressTracking = text @@ -718,13 +727,16 @@ }, TrackingModelForm(row) { let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - let text = this.userInfo().username + ' ' + time + ' ' + row + console.log(row) + let text = '

'+this.userInfo().username + ' ' + time +'

' + row + console.log(text) this.formInline.progressTrackingList.forEach((item, index) => { if (!item.progressTracking) { this.formInline.progressTrackingList.splice(0, 1) } }) this.formInline.progressTrackingList.splice(this.index + 1, 1, { progressTracking: text }) + console.log(this.formInline.progressTrackingList) }, addprogresstrackingClick(index) { this.index = index @@ -948,6 +960,14 @@ .ant-input-disabled { color: rgba(0, 0, 0, 0.65) !important; } + .text-class{ + color: rgba(0, 0, 0, 0.65); + font-weight: bold; + } + p{ + margin: 0; + padding: 0; + } \ No newline at end of file From 0c5cbb19d5fdc9a4a756c1a9b022ff81cab630f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 22 Oct 2023 14:46:51 +0800 Subject: [PATCH 049/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 39 ++++-- .../modules/system/enums/DicCodeEnum.java | 1 + .../modules/ota/entity/OtaManageApplyEO.java | 14 ++ .../modules/ota/entity/OtaManageReceive.java | 14 +- .../jero/modules/ota/job/OtaDataUpdate.java | 123 +++++++++++------- .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 8 +- .../impl/OtaManageApplyEOServiceImpl.java | 71 ++++++++-- .../otaAuthentication/components/detil.vue | 34 +++-- .../components/vdrDetial.vue | 2 +- 9 files changed, 215 insertions(+), 91 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 04eae0511..c713155e9 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1205,16 +1205,16 @@ MODIFY COLUMN `work_progress_cn` text CHARACTER SET utf8mb4 COLLATE utf8mb4_gene MODIFY COLUMN `work_progress_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'NIO工作进展英文' AFTER `work_progress_cn`; ---参数收集清单 添加英文 +--参数收集清单 添加英文 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Control Component' WHERE `id` = '84fec4a260dc646dc570cbf7cb581dab'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Component Value' WHERE `id` = '5d468613746f413a53fa0b485089839b'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Component' WHERE `id` = '608274a6a6dfed0e183093d9ea357436'; ---平台件项目库数据标识 +--平台件项目库数据标识 已同步生产环境 ALTER TABLE `laws_weilai`.`project_library_base` ADD COLUMN `platform` varchar(255) NULL COMMENT '平台件项目库数据（platform=YES）' AFTER `brand`; ---平台件合规认证计划 +--平台件合规认证计划 已同步生产环境 CREATE TABLE `laws_weilai`.`platform_task_planning` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -1229,7 +1229,7 @@ CREATE TABLE `laws_weilai`.`platform_task_planning` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; ---车型项目库法规清单关联平台件表2023-09-19 +--车型项目库法规清单关联平台件表2023-09-19 已同步生产环境 CREATE TABLE `laws_inventory_platform` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -1242,14 +1242,14 @@ CREATE TABLE `laws_inventory_platform` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; ---车修改字段长度2023-09-28 +--车修改字段长度2023-09-28 已同步生产环境 ALTER TABLE `project_certification_directory` MODIFY COLUMN `directory_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '目录名称' AFTER `project_library_id`, MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次' AFTER `directory_name`, MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`, MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`; ---添加平台件项目库字段2023-10-09 +--添加平台件项目库字段2023-10-09 已同步生产环境 ALTER TABLE `project_library_base` ADD COLUMN `power` varchar(255) NULL COMMENT '功率' AFTER `platform`, ADD COLUMN `producer` varchar(255) NULL COMMENT '生产商' AFTER `power`, @@ -1280,11 +1280,11 @@ ADD COLUMN `cooling_method` varchar(255) NULL COMMENT '冷却方式' AFTER `modu ADD COLUMN `filing_completion_time` datetime(0) NULL COMMENT '备案完成时间' AFTER `cooling_method`, ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion_time`; ---平台件合规认证计划添加标识字段2023-10-09 +--平台件合规认证计划添加标识字段2023-10-09 已同步生产环境 ALTER TABLE `platform_task_planning` ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识（用来区分上下两部分数据，up->上，down->下）' AFTER `project_id` ---平台件合规认证计划初始化数据 2023-10-10 +--平台件合规认证计划初始化数据 2023-10-10 已同步生产环境 INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('08ecf06f4f947836d0e95285fd8afb96', NULL, NULL, NULL, NULL, NULL, 'KO', NULL, NULL, 'up'); INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('09e577fa7afa3a8cb26b9c8f29eaf8d9', NULL, NULL, NULL, NULL, NULL, 'RF', NULL, NULL, 'up'); INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('17323a3d13e747e493c41e2e09bedc92', NULL, NULL, NULL, NULL, NULL, 'ADF', NULL, NULL, 'up'); @@ -1301,7 +1301,7 @@ INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_b INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('e76e63a251aa6d64cac96125315805e1', NULL, NULL, NULL, NULL, NULL, 'CAMDS提交（CDF前）', NULL, NULL, 'down'); INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('ee85c1b1964586e512ef0b2b401b16b5', NULL, NULL, NULL, NULL, NULL, '验证检查（ESO）', NULL, NULL, 'down'); ---平台件合规认证计划初始化数据->合规管理阀点相关字段初始化值修改 2023-10-18 +--平台件合规认证计划初始化数据->合规管理阀点相关字段初始化值修改 2023-10-18 已同步生产环境 UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '法规清单', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = '85fa6eb0b58d93d4cc76b8fb1d5248ca'; UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '责任确认', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = '97aaf07d156b6a4278e0ac3627566c8b'; UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '设计核查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'a533416284ab81c7f6ee95b5e9e06d38'; @@ -1310,21 +1310,34 @@ UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `u UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = 'CAMDS提交', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'e76e63a251aa6d64cac96125315805e1'; UPDATE `platform_task_planning` SET `create_by` = NULL, `create_time` = NULL, `update_by` = NULL, `update_time` = NULL, `sys_org_code` = NULL, `node_name` = '验证检查', `node_time` = NULL, `project_id` = NULL, `flag` = 'down' WHERE `id` = 'ee85c1b1964586e512ef0b2b401b16b5'; ---项目库添加平台件类型字段 2023-10-18 +--项目库添加平台件类型字段 2023-10-18 已同步生产环境 ALTER TABLE `project_library_base` ADD COLUMN `platform_type` varchar(255) NULL COMMENT '平台件类型' AFTER `remark`; ---ota_manage_receive_nsdp添加数量字段 2023-10-18 +--ota_manage_receive_nsdp添加数量字段 2023-10-18 已同步生产环境 ALTER TABLE `ota_manage_receive_nsdp` ADD COLUMN `extension_item_count` int(10) NULL COMMENT '扩展任务数量' AFTER `created_at`; --- 法规月报填写添加保存状态字段 2023-10-20 +-- 法规月报填写添加保存状态字段 2023-10-20 已同步生产环境 ALTER TABLE `laws_monthly_report_write` ADD COLUMN `save_state` varchar(10) NULL COMMENT '保存状态（0->暂存，1->提交）' AFTER `technology_territory_en`; --- 问题管理添加问题优先级字段 2023-10-20 +-- 问题管理添加问题优先级字段 2023-10-20 已同步生产环境 ALTER TABLE `problem_management` ADD COLUMN `problem_priority` varchar(10) NULL COMMENT '问题优先级' AFTER `approval_evidence_link`; +-- OTA添加主键 2023-10-20 已同步生产环境 +ALTER TABLE `ota_manage_apply` + ADD COLUMN `vdr_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'vdr_id' AFTER `remark`; +ALTER TABLE `ota_manage_receive` + + ADD COLUMN `vdr_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键id' FIRST , +ADD COLUMN `is_del` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否被删除（0:否;1:是）' AFTER `release_date`, +DROP PRIMARY KEY, +ADD PRIMARY KEY (`vdr_id`); + + + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index 313ad591e..6f878d1aa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -7,6 +7,7 @@ public enum DicCodeEnum { REGION("适用地区","1493782108399820801","region"), DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"), PROBLEM_TYPE("问题类型","1697066042058821634","wen4_ti2_lei4_xing2"), + CERTIFICATION_PROGRESS("认证清单-认证进度","1524311122804346881","certification_progress"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 62931d8f9..dcf17716b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -62,6 +62,9 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + @ApiModelProperty(value = "VDR_ID") + private java.lang.String vdrId; + @ApiModelProperty(value = "VDR") private java.lang.String vdr; @@ -199,6 +202,10 @@ public class OtaManageApplyEO implements Serializable { @TableField(exist = false) private boolean disabled; + @ApiModelProperty(value = "是否丢弃置灰") + @TableField(exist = false) + private boolean discard; + @TableField(exist = false) @ApiModelProperty(value = "表头排序字段") private java.lang.String orderByField; @@ -233,5 +240,12 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "扩展任务数量") private Integer extensionItemCount; + @TableField(exist = false) + @ApiModelProperty(value = "是否被删除（0:否;1:是）") + private String isDel; + + @TableField(exist = false) + private String attestationScheduleText; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java index 8b8651b67..5e61ca280 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java @@ -32,9 +32,14 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class OtaManageReceive implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") + private String vdrId; + + /**VDR*/ + @ApiModelProperty(value = "VDR") private String id; /**创建人*/ @@ -126,6 +131,9 @@ public class OtaManageReceive implements Serializable { @ApiModelProperty(value = "发布类型") private String releaseType; - + /**是否被删除（0:否;1:是）*/ + @Excel(name = "是否被删除（0:否;1:是）", width = 15) + @ApiModelProperty(value = "是否被删除（0:否;1:是）") + private String isDel; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java index d3e0e304b..72f8bbe37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/job/OtaDataUpdate.java @@ -45,26 +45,48 @@ public class OtaDataUpdate implements Job { List omrSyncList = otaManageReceiveService.getReceiveSync(); + + for (OtaManageReceive omrSync : omrSyncList) { + String plannedBpLaunchBatch = omrSync.getPlannedBpLaunchBatch(); + if (StringUtils.isNotEmpty(plannedBpLaunchBatch)) { + Matcher matcher = pattern.matcher(plannedBpLaunchBatch); + if (matcher.find()) { + omrSync.setPlannedBpLaunchBatch(matcher.group()); + } + } + } List omrList = otaManageReceiveService.queryList(); List addList = new ArrayList<>(); - List delList = new ArrayList<>(); List updateList = new ArrayList<>(); for (OtaManageReceive omr : omrList) { - boolean delFlag = true; for (OtaManageReceive omrSync : omrSyncList) { + if(StringUtils.isBlank(omrSync.getPlannedBpLaunchBatch())){ + continue; + } if (omr.getId().equals(omrSync.getId())) { - delFlag = false; - if (!compareReceive(omr, omrSync)) { + if (1 == compareReceive(omr, omrSync)) { updateList.add(omrSync); + } else if (2 == compareReceive(omr, omrSync)) { + boolean have = false; + for (OtaManageReceive omr1 : omrList) { + if(omrSync.getPlannedBpLaunchBatch().equals(omr1.getPlannedBpLaunchBatch())){ + have = true; + break; + } + } + if(!have){ + //逻辑删除 但保留在原软件版本列表中 + omr.setIsDel("1"); + updateList.add(omr); + //同步数据中新增 + omrSync.setVdrId(UUID.randomUUID().toString().replace("-","")); + addList.add(omrSync); + } } } } - if (delFlag) { - //同步数据中被删除 - delList.add(omr.getId()); - } } for (OtaManageReceive omrSync : omrSyncList) { @@ -76,27 +98,28 @@ public class OtaDataUpdate implements Job { } if (addFlag) { //同步数据中新增 - String plannedBpLaunchBatch = omrSync.getPlannedBpLaunchBatch(); - if (StringUtils.isNotEmpty(plannedBpLaunchBatch)) { - Matcher matcher = pattern.matcher(plannedBpLaunchBatch); - if (matcher.find()) { - omrSync.setPlannedBpLaunchBatch(matcher.group()); - } - } + omrSync.setVdrId(UUID.randomUUID().toString().replace("-","")); addList.add(omrSync); } } if (CollectionUtils.isNotEmpty(addList)) { otaManageReceiveService.saveBatch(addList); } - if (CollectionUtils.isNotEmpty(addList)) { - otaManageReceiveService.deleteByIds(delList); - } if (CollectionUtils.isNotEmpty(updateList)) { otaManageReceiveService.updateBatchById(updateList); } List omrnSyncList = otaManageReceiveNsdpService.getOtaManageReceiveNsdpSync(); + + for (OtaManageReceiveNsdp omrnSync : omrnSyncList) { + String plannedBpLaunchBatch = omrnSync.getReleaseName(); + if (StringUtils.isNotEmpty(plannedBpLaunchBatch)) { + Matcher matcher = pattern.matcher(plannedBpLaunchBatch); + if (matcher.find()) { + omrnSync.setReleaseName(matcher.group()); + } + } + } List omrnList = otaManageReceiveNsdpService.queryList(); List addNsdpList = new ArrayList<>(); @@ -128,13 +151,7 @@ public class OtaDataUpdate implements Job { } if (addFlag) { //同步数据中新增 - String releaseName = omrnSync.getReleaseName(); - if (StringUtils.isNotEmpty(releaseName)) { - Matcher matcher = pattern.matcher(releaseName); - if (matcher.find()) { - omrnSync.setReleaseName(matcher.group()); - } - } + addNsdpList.add(omrnSync); } @@ -154,26 +171,24 @@ public class OtaDataUpdate implements Job { Map releaceDateMap = new HashMap<>(); //记录车型列表 Map> omrnVehicleMap = new HashMap<>(); - - Map releaceTypeMap = new HashMap<>(); - - Date today = new Date(); List omrnLastList = otaManageReceiveNsdpService.queryList(); for (OtaManageReceiveNsdp omrn : omrnLastList) { //找到最快来临的发布时间 Date releaceDate = releaceDateMap.get(omrn.getReleaseName()); - try { - Date syncDate = sdf.parse(omrn.getReleaseDate()); - if (null == releaceDate) { - releaceDateMap.put(omrn.getReleaseName(), syncDate); - } else { - if (syncDate.after(today) && syncDate.before(releaceDate)) { + if (StringUtils.isNotBlank(omrn.getDateName()) && omrn.getDateName().equals("PLM")) { + try { + Date syncDate = sdf.parse(omrn.getReleaseDate()); + if (null == releaceDate) { releaceDateMap.put(omrn.getReleaseName(), syncDate); + } else { + if (syncDate.before(releaceDate)) { + releaceDateMap.put(omrn.getReleaseName(), syncDate); + } } + } catch (ParseException e) { + e.printStackTrace(); } - } catch (ParseException e) { - e.printStackTrace(); } //处理车型字符串 Set vehicleSet = omrnVehicleMap.get(omrn.getReleaseName()); @@ -288,35 +303,49 @@ public class OtaDataUpdate implements Job { if (!StringUtils.equals(omrn.getVehicle(), omrnSync.getVehicle())) { return false; } + if (!StringUtils.equals(omrn.getReleaseName(), omrnSync.getReleaseName())) { + return false; + } return true; } - private boolean compareReceive(OtaManageReceive omr, OtaManageReceive omrSync) { + /** + * 对比VDR数据 + * 返回状态 + * 0：无变化 + * 1：有变化 + * 2：改变版本号 + */ + private int compareReceive(OtaManageReceive omr, OtaManageReceive omrSync) { + int res = 0; if (!StringUtils.equals(omr.getSummary(), omrSync.getSummary())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getStatus(), omrSync.getStatus())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getHomologationImpact(), omrSync.getHomologationImpact())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getHomologation(), omrSync.getHomologation())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getImpactCnHomo(), omrSync.getImpactCnHomo())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getImpactEuHomo(), omrSync.getImpactEuHomo())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getMasterDomain(), omrSync.getMasterDomain())) { - return false; + res = 1; } if (!StringUtils.equals(omr.getAppliedVehicleProject(), omrSync.getAppliedVehicleProject())) { - return false; + res = 1; } - return true; + if (!StringUtils.equals(omr.getPlannedBpLaunchBatch(), omrSync.getPlannedBpLaunchBatch())) { + res = 2; + } + return res; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 7c83b88f7..c5647afc1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -68,14 +68,14 @@ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 378f1c07b..afe6e58ec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -203,7 +203,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getNsdpList(OtaManageApplyEO otaManageApplyEO) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date today = new Date(); List resList = new ArrayList<>(); List dataList = otaManageReceiveNsdpService.queryList(); Map> dataMap = dataList.stream().collect(Collectors.groupingBy(OtaManageReceiveNsdp::getReleaseName)); @@ -228,13 +227,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaPage(OtaManageApplyEO otaManageApplyEO) { LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); boolean otaManager = isOtaManager(); + boolean regulationOwner = isRegulationOwner(); + List otaManageApplyEOList = this.getNsdpList(otaManageApplyEO); List dataList = new ArrayList<>(); //去跟manager和studio权限 - if (otaManager) { + if (otaManager || regulationOwner) { dataList = otaManageApplyEOList; } else { List managePermissionList = otaManagePermissionService.queryByUserId(currentUser.getId()); @@ -333,7 +336,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO); //studio数据权限 - if (isOtaManager()) { + if (isOtaManager() || isRegulationOwner()) { otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO); } else { otaManageApplyEOList = getStudioData(otaManageApplyEO, otaManageApplyEOList); @@ -724,15 +727,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl { - Date e1CreatedAt = ObjectUtils.isNotEmpty(e1.getCreatedAt()) ? e1.getCreatedAt() : new Date(0); - Date e2CreatedAt = ObjectUtils.isNotEmpty(e2.getCreatedAt()) ? e2.getCreatedAt() : new Date(0); - return e2CreatedAt.compareTo(e1CreatedAt); + String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseDate()) ? e1.getReleaseDate() : ""; + String e2ReleaseName = StringUtils.isNotBlank(e2.getReleaseDate()) ? e2.getReleaseDate() : ""; + return comparator.compare(e2ReleaseName, e1ReleaseName); }); } } private boolean hasPermission(String plannedBpLaunchBatch){ - if(isOtaManager()){ + if(isOtaManager()||isRegulationOwner()){ return true; } LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -757,6 +760,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl(); } + + boolean isStudio = isStudio(); + boolean isRegulationOwner = isRegulationOwner(); List otaManageApplyEOList = this.getBaseMapper().getOtaCarPage(otaManageApplyEO); List list = new ArrayList<>(); Map omaMap = new HashMap<>(); @@ -807,6 +813,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl regionDictList = sysDictItemServiceImpl.selectItemsByDictCode(DicCodeEnum.CERTIFICATION_PROGRESS.getCode()); list = new ArrayList<>(omaMap.values()); if (!list.isEmpty()) { List vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject(), null); @@ -899,6 +906,23 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl collect = regionDictList.stream() + .filter(e -> e.getItemValue().equals(manageApplyEO.getAttestationSchedule())).collect(Collectors.toList()); + if (CutEnum.CN.getValue().equals(cut)) { + manageApplyEO.setAttestationScheduleText(collect.get(0).getItemText()); + } else { + manageApplyEO.setAttestationScheduleText(collect.get(0).getEnName()); + } + } if (StringUtils.isBlank(manageApplyEO.getMatchStatus())) { manageApplyEO.setMatchStatus(OtaStatusEnum.TO_BE_MATCHED.getKey()); if (CutEnum.CN.getValue().equals(cut)) { @@ -1273,7 +1297,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress"); + List regionDictList = sysDictItemServiceImpl.selectItemsByDictCode(DicCodeEnum.CERTIFICATION_PROGRESS.getCode()); List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); @@ -1517,6 +1541,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色 + if (CollectionUtils.isNotEmpty(userRoleList)) { + for (SysUserRole role : userRoleList) { + if (role.getRoleId().equals(RoleEnum.REGULATION_OWNER.getId())) { + return true; + } + } + } + return false; + } + private boolean isStudio() { LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色 @@ -1579,6 +1619,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl list, boolean isSubmit, String cut) { + if (!isOtaManager() || !isStudio()) { + return; + } LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (CollectionUtils.isNotEmpty(list)) { List idList = list.stream() diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index feb8311ff..f32bb1ff4 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -231,6 +231,7 @@ :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" @change="tableOnChange" + :rowClassName="setRowClassName" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columnsAll"> @@ -255,7 +256,7 @@ + {{record.projectVersionText}}
@@ -965,6 +970,13 @@ export default { }, methods: { ...mapGetters(['userInfo']), + setRowClassName(record, index) { + if (record.discard){ + return 'clickRowStyl' + }else{ + return '' + } + }, getSelectData(){ getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => { if (res.success) { @@ -1500,10 +1512,10 @@ export default { flex-direction: column; align-items: flex-start; } -/deep/ .ant-table-row:first-child { - background: #fff !important; - opacity: 0.9; -} +///deep/ .ant-table-row:first-child { +// background: #fff !important; +// opacity: 0.9; +//} .customize-text-title { margin-left: 0; font-size: 14px; @@ -1511,10 +1523,10 @@ export default { color: #040B29; margin-bottom: 22px; } -/deep/ .ant-table-row:first-child { - background: #fff !important; - opacity: 2.9; -} +///deep/ .ant-table-row:first-child { +// background: #fff !important; +// opacity: 2.9; +//} /deep/ .ant-table-body { background: transparent !important; @@ -1551,6 +1563,7 @@ popconfirmmize { /deep/ .ant-select-dropdown { z-index: 100; } + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue index 96445b1a0..e4b7770be 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue @@ -170,7 +170,7 @@ addModel(record, val) { this.form = record this.car = val - getAction('/ota/otaManageApplyEO/getVersionInfo', { vdr: this.form.vdr, car: this.car }).then((res) => { + getAction('/ota/otaManageApplyEO/getVersionInfo', { vdr: this.form.vdrId, car: this.car }).then((res) => { if (res.success) { this.vdrList = res.result } else { From f048ac4238e0c785922ef7b17164b262e14a0c1f Mon Sep 17 00:00:00 2001 From: gaosong Date: Sun, 22 Oct 2023 16:52:36 +0800 Subject: [PATCH 050/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 3 + .../ParamsCollectManifestEOController.java | 10 +- .../ParamsCollectManifestHistoryEOMapper.xml | 2 +- ...ParamsCollectManifestHistoryEOService.java | 5 + .../ParamsCollectManifestEOServiceImpl.java | 11 +- ...msCollectManifestHistoryEOServiceImpl.java | 552 ++++++++++++++++++ .../collect/vo/ParamsCollectManifestVO.java | 4 + .../controller/ParamsReportEOController.java | 10 +- .../cert/report/entity/ParamsReportEO.java | 3 + .../mapper/xml/ParamsReportEOMapper.xml | 1 + .../impl/ParamsReportDetailEOServiceImpl.java | 49 +- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../parameter/managementdetails/index.vue | 319 +++++++++- .../ParameterItemCollectionList.vue | 25 +- 15 files changed, 949 insertions(+), 47 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c713155e9..2f2873c04 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1335,6 +1335,9 @@ ADD COLUMN `is_del` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_c DROP PRIMARY KEY, ADD PRIMARY KEY (`vdr_id`); +ALTER TABLE `params_report` + ADD COLUMN `project_version` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关项目版本' AFTER `target_market`; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index e7584e710..c13b31fa6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService; import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -43,6 +44,8 @@ import java.util.stream.Collectors; public class ParamsCollectManifestEOController extends JeroController { @Autowired private IParamsCollectManifestEOService paramsCollectManifestEOService; + @Autowired + private IParamsCollectManifestHistoryEOService paramsCollectManifestHistoryEOService; @Autowired private ISysUserService sysUserService; @@ -531,7 +534,12 @@ public class ParamsCollectManifestEOController extends JeroController - and control_type != '11' order by nio_number asc + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java index b84c3f009..05cb16497 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java @@ -3,8 +3,10 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO; +import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -42,4 +44,7 @@ public interface IParamsCollectManifestHistoryEOService extends IService ids); + void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request); + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 90e4ff271..c46ccd87d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3525,6 +3525,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataEOList) { @@ -606,4 +638,524 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl fieldList = Arrays.asList(field.split(",")); // list形式 + + // 查询导出数据 + List> allParamsInfoList = queryForExportAll(paramsCollectManifestVO); // id记得去掉 + + // 开始处理工作表 + List allRelevFileList = new ArrayList<>(); + + // 在excel表中添加表头 + XSSFRow row = sheetItems.createRow(0); + for (int i = 0; i < headers.length; i++) { + XSSFCell cell = row.createCell(i); + XSSFRichTextString text = new XSSFRichTextString(headers[i]); + cell.setCellValue(text); + cell.setCellStyle(cellStyle1); + sheetItems.setColumnWidth(i, 20 * 256); // 设置单元格宽度 + } + + Map fileNowPathMap = new HashMap<>(); + //放文字内容 + int allRow = 0; + for (int rowNum = 0; rowNum < allParamsInfoList.size(); rowNum++) { + Map exportDto = allParamsInfoList.get(rowNum); + + // 处理文件 + List fileList = (List) exportDto.get("fileList"); + if (CollectionUtil.isNotEmpty(fileList)) { + allRelevFileList.addAll(fileList); + fileList.forEach(file -> { + fileNowPathMap.put(file.getId(), fileNowPath + File.separator + exportDto.get("nio_number")); + }); + + } + + allRow++; + XSSFRow row1 = sheetItems.createRow(allRow); + for (int cellNum = 0; cellNum < fieldList.size(); cellNum++) { + if (ObjectUtils.isNotEmpty(exportDto.get(fieldList.get(cellNum)))) { + row1.createCell(cellNum).setCellValue(exportDto.get(fieldList.get(cellNum)).toString()); + row1.getCell(cellNum).setCellStyle(cellStyle); + + } + } + + } + + //下载关联文件内容 + if (allRelevFileList != null && !allRelevFileList.isEmpty()) { + allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); + downLoadFileList(allRelevFileList, fileNowPathMap); + } + + String repFileName = fileName.replaceAll("/", "_"); + excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName); + response.setHeader("Content-Disposition", + "attachment; filename=\"" + ReadExcel.encodeFileName(fileOriName + ".zip", request) + "\""); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(excelOS); + excelOS.flush(); + excelOS.close(); + ZipUtil.zip(fileNowPath, fileNowPath + ".zip"); +// FileInputStream fis = new FileInputStream(fileNowPath + ".zip"); +// int len = 0; +// while ((len = fis.read()) != -1) { +// os.write(len); +// } + + // 将导出文件上传到cos上 + String uploadFileName = fileOriName + ".zip"; + InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip")); + MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传 + OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包 +// +// // 系统向用户发消息 +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人 +// String msgTitle = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated."; +// String content = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click download."; +// +// String href = "download."; +// String contentInfo = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click " + href; +// +// SysAnnouncement sysAnnouncement = new SysAnnouncement(); +// sysAnnouncement.setDelFlag("0"); +// sysAnnouncement.setSendStatus("0"); +// sysAnnouncement.setSendTime(new Date()); +// sysAnnouncement.setMsgCategory(MessageTypeEnum.PUSH.getValue()); //消息类型：转发推送 +// sysAnnouncement.setInitiator(MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); // 发起人：系统 +// sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 +// sysAnnouncement.setTitile(msgTitle); +// sysAnnouncement.setMsgContent(content); +// sysAnnouncement.setMsgContentInfo(contentInfo); +// sysAnnouncement.setUserIds(currentUser.getId()); // 发送给当前导出人 +// sysAnnouncementService.saveAnnouncement(sysAnnouncement); +// +// JSONObject obj = new JSONObject(); +// obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); +// obj.put(WebsocketConst.MSG_ID, currentUser.getId()); +// obj.put(WebsocketConst.MSG_TXT, contentInfo); +// webSocket.sendMessage(obj.toJSONString()); +// +// uploadFileio.close(); + os.flush(); + os.close(); // 后开先关 +// fis.close(); // 先开后关 + pce.setState(ExportStateEnum.SUCCESSFULLY.getValue()); + pce.setFileId(ossFile.getId()); + paramsCollectExportService.updateById(pce); + } catch (Exception e) { + pce.setState(ExportStateEnum.FAILURE.getValue()); + paramsCollectExportService.updateById(pce); + if (e instanceof JeroBootException) { + throw new JeroBootException(e.getMessage()); + } else { + log.error(e.getMessage(), e); + if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) { + throw new JeroBootException("Failed to download file, please try again"); + } else { + throw new JeroBootException("下载文件失败，请重试"); + } + } + } finally { + IOUtils.closeQuietly(os); + IOUtils.closeQuietly(excelOS); + File tempZipFile = new File(uploadpath + "/tempZip"); + FileUtil.deleteContents(tempZipFile); + } + } + + + private String[] getWorkbookTitleForExport(ParamsCollectManifestVO paramsCollectManifestVO) { + String cut = paramsCollectManifestVO.getCut(); + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue()); + + List dbFieldNameList = new LinkedList<>(); + List dbFieldList = new LinkedList<>(); + + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + + // 固定列 + int indexOfDescription = 1; // 参数名称的位置 + for (int i = 0; i < fieldList.size(); i++) { + OnlCgformField onlCgformField = fieldList.get(i); + String dbFieldName = onlCgformField.getDbFieldName(); + if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName)) { + dbFieldList.add(dbFieldName); + + if (CutEnum.CN.getValue().equals(cut)) { + dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名 + } else { + dbFieldNameList.add(onlCgformField.getDbFieldEnName()); // 字段英文名 + } + if ("params_name".equals(dbFieldName)) { + indexOfDescription = i; + } + } + } + + // 认证类别列 + List dbFieldNameListCC = new LinkedList<>(); + List dbFieldListCC = new LinkedList<>(); + // 查询所有认证类别 + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + if (CutEnum.EN.getValue().equals(cut)) { + sysDictItemList.forEach(sysDictItem -> { + dbFieldListCC.add(sysDictItem.getItemValue()); + dbFieldNameListCC.add(sysDictItem.getEnName() + " Number"); + }); + + } else { + sysDictItemList.forEach(sysDictItem -> { + dbFieldListCC.add(sysDictItem.getItemValue()); + dbFieldNameListCC.add(sysDictItem.getItemText() + "编号"); + }); + } + + // 配置列 + List dbFieldNameListConfig = new LinkedList<>(); + List dbFieldListConfig = new LinkedList<>(); + List paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); + for (ParamsConfigHistoryEO paramsConfigEO : paramsConfigEOList) { + dbFieldListConfig.add(paramsConfigEO.getId()); + dbFieldNameListConfig.add(paramsConfigEO.getConfigName()); + } + + // 插入认证类别列 + dbFieldList.addAll(indexOfDescription, dbFieldListCC); + dbFieldNameList.addAll(indexOfDescription, dbFieldNameListCC); + + // 插入配置列 + dbFieldList.addAll(dbFieldListConfig); + dbFieldNameList.addAll(dbFieldNameListConfig); + + String[] title = new String[2]; + String dbFieldStr = StringUtils.join(dbFieldList, ","); + String dbFieldNameStr = StringUtils.join(dbFieldNameList, ","); + + title[0] = dbFieldStr; + title[1] = dbFieldNameStr; + return title; + } + + private List> queryForExportAll(ParamsCollectManifestVO paramsCollectManifestVO) { + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + String paramsTemplateId = paramsCollectManifestVO.getParamsTemplateId(); + Integer paramsTemplatePublishVersion = paramsCollectManifestVO.getParamsTemplatePublishVersion(); + String cut = paramsCollectManifestVO.getCut(); + + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO(); + queryEO.setParamsManifestId(paramsManifestId); + String userTypes = paramsCollectManifestVO.getUserTypes(); + if (userTypes != null && CollectManifestUserTypeEnum.SDT.getValue().equals(userTypes)) { + queryEO.setUserTypes(CollectManifestUserTypeEnum.SDT.getValue()); + queryEO.setSdt(loginUser.getUsername()); + } + + List> dataList = paramsCollectManifestHistoryEOMapper.listInfoForExport(queryEO, null); // 查询导出数据 + if (dataList == null || dataList.isEmpty()) { + // 没有查到数据，进行提示 + if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) { + throw new JeroBootException("No data, unable to export"); + } else { + throw new JeroBootException("无数据，无法导出"); + } + } + + List paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询所有配置列 + + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 + + List> exportDataList = new ArrayList<>(); + // 配置列多行数据处理 + for (Map data : dataList) { + String controlType = (String)data.get("control_type"); + if("0".equals(paramsCollectManifestVO.getExportOption()) && "11".equals(controlType)){ + //不要标题 + continue; + } + String id = (String) data.get("id"); + + Map> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> { + boolean flag = false; + if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) { + flag = true; + } + return flag; + }).collect(Collectors.groupingBy(configDataEO -> configDataEO.getParamsConfigId())); + + List> paramsConfigDataCountList = new ArrayList<>(); + + for (Map.Entry> map : paramsConfigDataMap.entrySet()) { + Map paramsConfigDataCountMap = new HashMap<>(); + paramsConfigDataCountMap.put("key", map.getKey()); + paramsConfigDataCountMap.put("paramsConfigDataCount", map.getValue().size()); + paramsConfigDataCountMap.put("value", map.getValue()); + paramsConfigDataCountList.add(paramsConfigDataCountMap); + } + + // 排序 配置数据总数倒序排序 + Collections.sort(paramsConfigDataCountList, new Comparator>() { + @Override + public int compare(Map o1, Map o2) { + return o2.get("paramsConfigDataCount").toString().compareTo(o1.get("paramsConfigDataCount").toString()); + } + }); + + // 获取出最多行的配置列。 + if (!paramsConfigDataCountList.isEmpty()) { + Map paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0); + String key = (String) paramsConfigDataMaxCountMap.get("key"); + List paramsConfigDataEOs = paramsConfigDataMap.get(key); + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) { + Map dataTemp = new HashMap<>(); + data.entrySet().forEach(o -> dataTemp.put(o.getKey(), o.getValue())); + exportDataList.add(dataTemp); + } + } else { + exportDataList.add(data); + } + } + + List nioNumberList = dataList.stream().map(m -> (String) m.get("nio_number")).collect(Collectors.toList()); + List certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项 + + // 查询责任领域数据字典 + List sysDictItemList = sysDictItemService.selectItemsByDictCode("duty_territory"); + Map dutyTerritoryMap = new HashMap<>(); + if (CutEnum.EN.getValue().equals(cut)) { + dutyTerritoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getEnName())); + } else { + dutyTerritoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getItemText())); + } + // 状态 + Map stateMap = CollectManifestStateEnum.toMap(cut); + + // 插入配置列和认证类别列数据 + for (Map record1 : exportDataList) { + + String paramsCollectManifestId = (String) record1.get("id"); + String nioNumber = (String) record1.get("nio_number"); + String dutyTerritory = (String) record1.get("duty_territory"); + String state = (String) record1.get("state"); + + String control_type = record1.get("control_type").toString(); + //references_col -> #a# # + if (!Objects.isNull(record1.get("references_col"))) { + String references_col = record1.get("references_col").toString(); + if (StringUtils.isNotEmpty(references_col)) { + String[] references_colArr = references_col.split("#"); + if (StringUtils.equals(control_type, ControlTypeEnum.FILE.getValue())) { + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#" + references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + } else if (StringUtils.equals(control_type, ControlTypeEnum.TEXT_FILE.getValue()) + || StringUtils.equals(control_type, ControlTypeEnum.PULL_SINGLE_FILE.getValue()) + || StringUtils.equals(control_type, ControlTypeEnum.PULL_MORE_FILE.getValue())) { + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#" + references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + } else if (StringUtils.equals(control_type, ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())) { + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#" + references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + } + + StringBuilder references_colSb = new StringBuilder(); + for (String col : references_col.split("#")) { + if (StringUtils.isNotEmpty(col) && !StringUtils.equals(col, " ")) { + references_colSb.append(col).append("#"); + } + } + + if (StringUtils.isNotEmpty(references_colSb)) { + references_col = references_colSb.substring(0, references_colSb.length() - 1); + } else { + references_col = references_colSb.toString(); + } + + record1.put("references_col", references_col); + } + } + + // 处理负责领域 + record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory)); + + // 处理状态 + record1.put("state", stateMap.get(state)); + + // 认证类别列 + List certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e -> nioNumber.equals(e.getNioNumber())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) { + certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> { + record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber()); + }); + } + + // 配置列 + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + List fileList = new ArrayList<>(); + + paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + + String paramsConfigId = paramsConfigEO.getId(); + List paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> { + boolean flag = false; + if(StringUtils.equals(paramsConfigId,e.getParamsConfigId()) && StringUtils.equals(paramsCollectManifestId,e.getParamsCollectManifestId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); // 参数配置数据 + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (CollectionUtil.isNotEmpty(paramsConfigDataEOS)) { + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOS.get(0); + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData()).append("#"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()).append("#"); + + fileList.addAll(ossFileList); + } + } + paramsConfigDataEOList.remove(paramsConfigDataEO); + } + + String configData = configDataBuilder.toString(); + if (configData.contains("#")) { + configData = configData.substring(0, configData.lastIndexOf("#")); + } + + record1.put(paramsConfigEO.getId(), configData); + }); + + record1.put("fileList", fileList); + } + } + return exportDataList; + } + + + private void downLoadFileList(List fileTemplateList, Map fileNowPathMap) { + for (OSSFile fileExportDto : fileTemplateList) { + String fileNowPath = fileNowPathMap.get(fileExportDto.getId()); + File nowFile = new File(fileNowPath); + if (nowFile.exists()) { + nowFile.delete(); + } + nowFile.mkdirs(); + + String oldPath = fileExportDto.getUrl(); + String newPath = fileNowPath + File.separator + fileExportDto.getFileName(); + if (CosBootUtil.doesObjectExist(oldPath)) { + try (InputStream in = CosBootUtil.download(oldPath);) { + copyFile(in, newPath); + } catch (IOException e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + } + } + } + } + + private void copyFile(InputStream in, String destPath) throws IOException { + BufferedInputStream bis = new BufferedInputStream(in); + BufferedOutputStream bos = + new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE)); + // 打开输入流 +// FileInputStream fis = new FileInputStream(srcPath); + // 打开输出流 +// FileOutputStream fos = new FileOutputStream(destPath); + // 读取和写入信息 + byte[] bytes = new byte[1024 * 1024]; + int len; + while ((len = bis.read(bytes)) > 0) { + bos.write(bytes, 0, len); + } + // 关闭流 先开后关 后开先关 + bos.close(); // 后开先关 + bis.close(); // 先开后关 + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java index e080b6c69..d33b6f3e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java @@ -110,4 +110,8 @@ public class ParamsCollectManifestVO { //是否导出标题 ”1“ 是 ”0“否 @TableField(exist = false) private String exportOption; + + //是否是历史版本 ”1“ 是 ”0“否 + @TableField(exist = false) + private String isHistory; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index b12561b94..38fddf82e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -123,14 +123,20 @@ public class ParamsReportEOController extends JeroController
- {{this.$route.query.pageName ? this.$route.query.pageName : $t('ParameterViewPage')}} + {{this.$route.query.pageName ? this.$t('ParameteItemReportList')+'('+this.$route.query.pageName+')' + ' — '+this.$route.query.title +' — '+ this.$route.query.version: $t('ParameterViewPage')}}
@@ -129,6 +129,13 @@ {{$t('dataExport')}} + + +
+ + {{$t('Derivedlist')}} +
+
{{$t('ConventionalExport')}} @@ -215,21 +222,131 @@ {{this.$t('pleaseWaitWhileRunning')}} + + + + + +
+
+ * + + {{$t('exportOption')}} +
+ + + + {{$t('includeTitle')}} + + + {{$t('Notitleincluded')}} + + + +
+ + + + + + + + + +
+ {{$t('Exportsuccessexportlist')}} + + + +
+ + + + + + + + + + {{$t('download')}} + {{$t('delete')}} + + + + + + + +
+ +
+ - - \ No newline at end of file diff --git a/jero-web/src/views/ceshiList/index.vue b/jero-web/src/views/ceshiList/index.vue deleted file mode 100644 index 9846dead3..000000000 --- a/jero-web/src/views/ceshiList/index.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/ceshiList/modules/addForm.vue b/jero-web/src/views/ceshiList/modules/addForm.vue deleted file mode 100644 index d1273465a..000000000 --- a/jero-web/src/views/ceshiList/modules/addForm.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/phoneView/components/header.vue b/jero-web/src/views/phoneView/components/header.vue deleted file mode 100644 index 56d84d65b..000000000 --- a/jero-web/src/views/phoneView/components/header.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - \ No newline at end of file From c4d3623896498c27a32bf2ea268ff3e4dc81b2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 22 Oct 2023 17:23:26 +0800 Subject: [PATCH 052/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/managementdetails/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 4fb546515..1fa66204d 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -5,7 +5,7 @@
- {{this.$route.query.pageName ? this.$t('ParameteItemReportList')+'('+this.$route.query.pageName+')' + ' — '+this.$route.query.title +' — '+ this.$route.query.version: $t('ParameterViewPage')}} + {{this.$route.query.pageName ? this.$t('ParameteItemReportList')+'('+this.$route.query.projectName+')' + ' — '+this.$route.query.title +' — '+ this.$route.query.version: $t('ParameterViewPage')}}
@@ -571,6 +571,7 @@ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' }, props: {}, mounted() { + console.log(this.$route.query) // this.Getlist() this.getTableList() this.getcustomizeList() From accfb73cc699fbf47533e419b169da2a651139b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 22 Oct 2023 17:27:05 +0800 Subject: [PATCH 053/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index f148903ca..8f22803d6 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1661,7 +1661,7 @@ paramsTemplatePublishVersion: 1, cut: this.cut, userTypes: this.currentPersonRole, - exportName: this.$route.query.projectName + '(' + this.$route.query.title + this.$route.query.version + ')', + exportName: this.$route.query.projectName.slice(0,-3)+ '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')'+'-' + this.$route.query.version, isHistory:this.isHistroy } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' From 327f4a575c67e8ceca617a61a71990b4c351e54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 22 Oct 2023 17:56:26 +0800 Subject: [PATCH 054/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tableCollection/historyTable.vue | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/jero-web/src/components/tableCollection/historyTable.vue b/jero-web/src/components/tableCollection/historyTable.vue index 4c6a80a74..29feb16d2 100644 --- a/jero-web/src/components/tableCollection/historyTable.vue +++ b/jero-web/src/components/tableCollection/historyTable.vue @@ -1,22 +1,22 @@ \ No newline at end of file From 1446f59688b8e65b784e0902d7267ac2aaedc905 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 23 Oct 2023 09:20:46 +0800 Subject: [PATCH 061/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E4=B8=8D=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/impl/OtaManageApplyEOServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index afe6e58ec..4abf2106b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -890,7 +890,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl collect = vprojectVersionList.stream().filter(e -> e.getProjectId().equals(manageApplyEO.getProjectVersion())).distinct().collect(Collectors.toList()); if (!collect.isEmpty()) { - manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket()); + if("NA".equals(collect.get(0).getProjectId())){ + if (CutEnum.CN.getValue().equals(cut)) { + manageApplyEO.setProjectVersionText("不涉及"); + } else { + manageApplyEO.setProjectVersionText("NA"); + } + }else{ + manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket()); + } } }else{ //没有设置项目版本的情况 From 1f260e62c267e8eb3a21fc6050836be064cac13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 23 Oct 2023 09:25:54 +0800 Subject: [PATCH 062/111] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectNonConformance/moudles/addModel.vue | 2 ++ .../projectNonConformance/moudles/detilModel.vue | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index c85a2ee48..9b6e9d385 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -1123,5 +1123,7 @@ border: 1px solid #ccc; padding: 0 15px; box-sizing: border-box; + white-space: pre-wrap; + overflow: auto; } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 6cf603d31..5631b0596 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -538,6 +538,8 @@ border: 1px solid #ccc; padding: 0 15px; box-sizing: border-box; + white-space: pre-wrap; + overflow: auto; } .text-box-one { width: 100%; @@ -547,5 +549,7 @@ padding: 0 15px; box-sizing: border-box; margin-bottom: 20px; + white-space: pre-wrap; + overflow: auto; } \ No newline at end of file From 8c21bd0d5fb03d3df69a1f00d2eb137575a1dc92 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 23 Oct 2023 10:37:14 +0800 Subject: [PATCH 063/111] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 465 +++++++++++++++++- 1 file changed, 446 insertions(+), 19 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 81643d87e..8316f757f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -2062,16 +2062,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl prcdQueryWrap = new QueryWrapper<>(); @@ -2185,18 +2180,6 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataList, String paramsManifestId) { +// List newConfigDataEOList = new ArrayList<>(); +// List updateDetailEOList = new ArrayList<>(); +// List insertLogEOList = new ArrayList<>(); +// List paramsReportConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 +// List paramsReportConfigIdList = paramsReportConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); +// List paramsReportConfigDataEOList = paramsReportConfigDataEOService.queryListByConfigIdList(paramsReportConfigIdList); // 查询所有配置数据 +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// +// // 处理数据 +// for (Map map : configDataList) { +// String paramsCollectManifestId = (String) map.get("id"); +// // 操作记录 +// StringBuilder logCnContent = new StringBuilder(); +// StringBuilder logEnContent = new StringBuilder(); +// logCnContent.append(loginUser.getUsername()); +// logEnContent.append(loginUser.getUsername()); +// +// // 删除操作记录 +// StringBuilder deleteLogCnContent = new StringBuilder(); +// StringBuilder deleteLogEnContent = new StringBuilder(); +// deleteLogCnContent.append(loginUser.getUsername()); +// deleteLogEnContent.append(loginUser.getUsername()); +// +// +// // 添加操作记录 +// StringBuilder addLogCnContent = new StringBuilder(); +// StringBuilder addLogEnContent = new StringBuilder(); +// addLogCnContent.append(loginUser.getUsername()); +// addLogEnContent.append(loginUser.getUsername()); +// +// // 变更标识 +// boolean changeFlag = false; +// // 删除标识 +// boolean deleteFlag = false; +// // 新增标识 +// boolean addFlag = false; +// +// String configNameCn = ""; +// String configNameEn = ""; +// +// // 添加配置数据*****循环同一个配置里的内容 +// for (Map.Entry entry : map.entrySet()) { +// String key = entry.getKey(); +// if ("id".equals(key)) { +// continue; +// } +// +// if ("remarks".equals(entry.getKey()) && StringUtils.isNotEmpty((String) entry.getValue())) { +// ParamsReportDetailEO updateDEtailEO = new ParamsReportDetailEO(); +// updateDEtailEO.setId(paramsCollectManifestId); +// updateDEtailEO.setRemarks((String) entry.getValue()); +// updateDetailEOList.add(updateDEtailEO); +// continue; +// } +// +// // 取值 +// String paramsReportConfigEOId = entry.getKey(); +// ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(paramsReportConfigEOId); +// Map paramsReportConfigDataMap = (Map) entry.getValue(); +// // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） +// // List> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); +// +// logCnContent.append("将"); +// logEnContent.append(" set "); +// +// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); +// logEnContent.append(paramsReportConfigEO.getConfigName()); +// +// Map paramsConfigDataVOMap = (Map) paramsReportConfigDataMap.get("paramsConfigData"); +// +// for (Map.Entry paramsConfigDataMap : paramsConfigDataVOMap.entrySet()) { +// //顺序号不存在ID中，查询的时候会拼接 +// String configDataId = paramsConfigDataMap.getKey(); +// +// List> configDataVOList = (List>) paramsConfigDataMap.getValue(); +// +// if (CollectionUtil.isNotEmpty(configDataVOList)) { +// int orderNum = (Integer) configDataVOList.get(0).get("orderNum"); +// int plusIndex = configDataId.indexOf("+"); +// if (plusIndex != -1) { +// orderNum = Integer.parseInt(configDataId.substring(0, plusIndex)); +// configDataId = configDataId.substring(plusIndex + 1); +// } +// ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO(); +// paramsReportConfigDataEO.setOrderNum(orderNum); +// for (Map paramsConfigDataVO : configDataVOList) { +// String type = (String) paramsConfigDataVO.get("type"); +// String dataValue = ""; +// if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){ +// dataValue = String.valueOf(paramsConfigDataVO.get("dataValue")); +// } +// +// // 判断是新增还是修改 +// ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList,configDataId); +// if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { +// paramsReportConfigDataEO.setId(oldConfigDataEO.getId()); +// +// if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { +// // paramsReportConfigDataEO.setTextData(dataValue); +// if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) { +// logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } +// +// } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) +// || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { +// // paramsReportConfigDataEO.setPullData(dataValue); +// +// if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) { +// logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) { +// logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", "); +// +// changeFlag = true; +// } +// +// } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { +// String newFileNames = ""; +// if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 +// // 处理文件connectId +// String[] fileIdList = dataValue.split(","); +// List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); +// if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// List updateFileList = new ArrayList<>(); +// for (int i = 0; i < fileIdList.length; i++) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileIdList[i]); +// ossFile.setConnectId(connectId); +// updateFileList.add(ossFile); +// } +// ossFileService.updateBatchById(updateFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { +// List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); +// if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// //修改文件表关联信息connect_id +// List oSSFileList = new ArrayList<>(); +// for (String fileId : dataValue.split(",")) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileId); +// ossFile.setConnectId(connectId); +// oSSFileList.add(ossFile); +// } +// ossFileService.updateFileInfo(oSSFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } +// // paramsReportConfigDataEO.setFileConnectId(dataValue); +// if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { +// logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) { +// String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", "); +// +// changeFlag = true; +// } else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) { +// String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) { +// logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，"); +// logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", "); +// +// changeFlag = true; +// } +// +// } +// +// } +// } +// +// +// +// if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { +// +// paramsReportConfigDataEO.setTextData(dataValue); +// } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) +// || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { +// +// paramsReportConfigDataEO.setPullData(dataValue); +// } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { +// String newFileNames = ""; +// if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件. 目前没用到这段代码 +// // 处理文件connectId +// String[] fileIdList = dataValue.split(","); +// List ossFiles = ossFileService.getFileInfosByConnectId(fileIdList[0]); +// if(CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// List updateFileList = new ArrayList<>(); +// for (int i = 0; i < fileIdList.length; i++) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileIdList[i]); +// ossFile.setConnectId(connectId); +// updateFileList.add(ossFile); +// } +// ossFileService.updateBatchById(updateFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { +// List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); +// if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 +// String connectId = UUID.randomUUID().toString().replace("-", ""); +// //修改文件表关联信息connect_id +// List oSSFileList = new ArrayList<>(); +// for (String fileId : dataValue.split(",")) { +// OSSFile ossFile = new OSSFile(); +// ossFile.setId(fileId); +// ossFile.setConnectId(connectId); +// oSSFileList.add(ossFile); +// } +// ossFileService.updateFileInfo(oSSFileList); +// dataValue = connectId; +// newFileNames = ossFileService.getFileInfosByConnectId(connectId).stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); +// } +// } +// paramsReportConfigDataEO.setFileConnectId(dataValue); +// } +// } +// +// +// paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); +// paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); +// paramsReportConfigDataEO.setId(configDataId); +// newConfigDataEOList.add(paramsReportConfigDataEO); +// } +//// +//// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的"); +//// logEnContent.append(paramsReportConfigEO.getConfigName()); +// +// } +// +// QueryWrapper prcdQueryWrap = new QueryWrapper<>(); +// prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); +// prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); +// List prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap); +// if(CollectionUtils.isNotEmpty(prcdEoList)){ +// List paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey().split("\\+")[0]).distinct().collect(Collectors.toList()); +// +// List newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> { +// boolean flag = false; +// // 如果key的长度是16位，则是新添加的 +// if (e.length() == 16) { +// flag = true; +// } +// return flag; +// }).distinct().collect(Collectors.toList()); +// +// if(CollectionUtils.isNotEmpty(newAddPcdDataIdList)){ +// StringBuilder dataValueSb = new StringBuilder(); +// for (String newAddPcdDataId : newAddPcdDataIdList) { +// List> configDataVOList = (List>) paramsConfigDataVOMap.get(newAddPcdDataId); +// for (Map paramsConfigDataVO : configDataVOList) { +// String type = (String) paramsConfigDataVO.get("type"); +// +// String dataValue = ""; +// if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){ +// dataValue = String.valueOf(paramsConfigDataVO.get("dataValue")); +// } +// // 如果是附件 单独处理 +// if(StringUtils.equals(type,ConfigDataTypeEnum.FILE.getValue())){ +// +// } +// dataValueSb.append("\"").append(dataValue).append("\","); +// } +// } +// +// String dataValue = ""; +// if(StringUtils.isNotBlank(dataValueSb.toString())){ +// dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); +// } +// +// addLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append("，"); +// addLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(","); +// +// addFlag = true; +// } +// +// // 判断有没有被减掉的（删除的） +// List deletePrcdEoList = prcdEoList.stream().filter(prcdEo -> { +// boolean flag = true; +// for (String paramsConfigDataId : paramsConfigDataIdList) { +// if(StringUtils.equals(prcdEo.getId(),paramsConfigDataId)){ +// flag = false; +// break; +// } +// } +// return flag; +// }).collect(Collectors.toList()); +// +// // 如果有被删的数据 增加log记录 +// if(CollectionUtils.isNotEmpty(deletePrcdEoList)){ +// StringBuilder dataValueSb = new StringBuilder(); +// for (ParamsReportConfigDataEO paramsReportConfigDataEO : deletePrcdEoList) { +// if(StringUtils.isNotBlank(paramsReportConfigDataEO.getTextData())){ +// dataValueSb.append("\"").append(paramsReportConfigDataEO.getTextData()).append("\","); +// } +// if(StringUtils.isNotBlank(paramsReportConfigDataEO.getPullData())){ +// dataValueSb.append("\"").append(paramsReportConfigDataEO.getPullData()).append("\","); +// } +// if(StringUtils.isNotBlank(paramsReportConfigDataEO.getFileConnectId())){ +// dataValueSb.append("\"").append(paramsReportConfigDataEO.getFileConnectId()).append("\","); +// } +// } +// String dataValue = ""; +// if(StringUtils.isNotBlank(dataValueSb.toString())){ +// dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1); +// } +// deleteLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append("，"); +// deleteLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(","); +// +// deleteFlag = true; +// } +// } +// +// +// QueryWrapper removeConfigDataWrap = new QueryWrapper<>(); +// removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId); +// removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId); +// this.paramsReportConfigDataEOService.remove(removeConfigDataWrap); +// +// //******************这里是当前配置的循环结束了****************** +// //判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字 +// //configNameCn = paramsReportConfigEO.getConfigName()+"的"; +// //configNameEn = paramsReportConfigEO.getConfigName(); +// String cnContent = logCnContent.toString(); +// String enContent = logEnContent.toString(); +// if(!configNameCn.isEmpty() && !configNameEn.isEmpty() +// && cnContent.contains(configNameCn) && enContent.contains(configNameEn)){ +// int cnStar = cnContent.length() - configNameCn.length(); +// int enStar = enContent.length()-configNameEn.length(); +// String logCnContentLast = logCnContent.substring(cnStar, logCnContent.length()); +// String logEnContentLast = logEnContent.substring(enStar, logEnContent.length()); +// +// //logCnContent的最后是configName时 +// if(logCnContentLast.equals(configNameCn) && logEnContentLast.equals(configNameEn)) { +// logCnContent.delete(cnStar, cnContent.length() + 1); +// logEnContent.delete(enStar,enContent.length()+1); +// } +// } +// } +// +// +// /*if (logCnContent.toString().endsWith("，")) { +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(","))); +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// }*/ +// if(changeFlag){ +// ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// int i = logCnContent.lastIndexOf("，"); +// insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(","))); +//// insertLogEO.setLogCnContent(cnContent.substring(0, logCnContent.lastIndexOf("，"))); +//// insertLogEO.setLogEnContent(enContent.substring(0, logEnContent.lastIndexOf(","))); +// +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// } +// +// if(deleteFlag){ +// ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// insertLogEO.setLogCnContent(deleteLogCnContent.toString().substring(0, deleteLogCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(deleteLogEnContent.toString().substring(0, deleteLogEnContent.lastIndexOf(","))); +// +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// } +// +// if(addFlag){ +// +// ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO(); +// String ramarks = ""; +// if(map.get("remarks") != null){ +// ramarks = map.get("remarks").toString(); +// } +// insertLogEO.setLogCnContent(addLogCnContent.toString().substring(0, addLogCnContent.lastIndexOf("，"))); +// insertLogEO.setLogEnContent(addLogEnContent.toString().substring(0, addLogEnContent.lastIndexOf(","))); +// +// insertLogEO.setParamsReportId(paramsManifestId); +// insertLogEO.setParamsReportDetailId(paramsCollectManifestId); +// insertLogEO.setRemarks(ramarks); +// insertLogEOList.add(insertLogEO); +// } +// +// +// } +// +// // 批量更新 +// if (CollectionUtil.isNotEmpty(updateDetailEOList)) { +// paramsReportDetailEOService.updateBatchById(updateDetailEOList); +// } +// if (CollectionUtil.isNotEmpty(insertLogEOList)) { +// paramsReportDetailLogEOService.saveBatch(insertLogEOList); +// } +// return paramsReportConfigDataEOService.saveBatch(newConfigDataEOList); +// } private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List paramsReportConfigDataEOList,String configDataId) { From ce2baf0f9a31ee44d15469006f3dbdda755da52d Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 23 Oct 2023 14:27:49 +0800 Subject: [PATCH 064/111] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93id=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BussDocumentLibraryEOController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index c27c46e44..40d688c73 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -523,4 +523,12 @@ public class BussDocumentLibraryEOController extends JeroController queryListByIds(String ids,String cut) { + List> res = bussDocumentLibraryEOService.queryListByIds(ids); + return Result.OK(res); + } } From 5f1a78b74feee6fa90088e362df501859e802548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 23 Oct 2023 15:33:19 +0800 Subject: [PATCH 065/111] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrAddForm/index.vue | 7 + .../src/components/SplitBatForm/index.vue | 7 + .../components/Standardselection/index.vue | 175 ++++++++++++++---- .../src/components/libraryAddForm/index.vue | 2 +- .../splitting/modules/SplitAddForm.vue | 6 + .../virtualList/components/editModel.vue | 6 + .../components/addModelconformance.vue | 1 + .../components/addModelconformance.vue | 1 + .../moudles/addModel.vue | 1 + 9 files changed, 164 insertions(+), 42 deletions(-) diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue index c49a84c67..f5ae9586b 100644 --- a/jero-web/src/components/OcrAddForm/index.vue +++ b/jero-web/src/components/OcrAddForm/index.vue @@ -215,6 +215,9 @@
@@ -283,6 +286,10 @@ this.getForm() }, methods: { + StandardselectionChange(value, id) { + this.formInline[value + '_id'] = id + this.formInline = { ...this.formInline } + }, sumber() { // console.log('vilidate',this.formInline) this.$refs.ruleForm1.validate(valid => { diff --git a/jero-web/src/components/SplitBatForm/index.vue b/jero-web/src/components/SplitBatForm/index.vue index acdf19cb9..04c428002 100644 --- a/jero-web/src/components/SplitBatForm/index.vue +++ b/jero-web/src/components/SplitBatForm/index.vue @@ -207,6 +207,9 @@ @@ -305,6 +308,10 @@ // console.log('idssss111',this.ids) }, methods: { + StandardselectionChange(value, id) { + this.formInline[value + '_id'] = id + this.formInline = { ...this.formInline } + }, sumber() { // console.log('vilidate',this.formInline) this.$refs.ruleForm1.validate(valid => { diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index d7edda414..941325af4 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -1,13 +1,27 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 8f22803d6..93fe58c0d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -234,7 +234,7 @@
- {{$t('Adjustareasofresponsibility')}} + {{$t('BatchSetting')}}
@@ -272,17 +272,20 @@ {{$t('dataExport')}}
-
+
{{$t('Derivedlist')}}
-
+
{{$t('referenceparameter')}}
-
+
{{$t('tempSave')}}
@@ -359,12 +362,14 @@
-
+
{{$t('dataExport')}}
-
+
{{$t('Derivedlist')}}
@@ -455,7 +460,7 @@ @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/> - + @@ -631,27 +636,27 @@ @ok="exportok" @cancel="exportvisiblecancel" > - - + + {{$t('download')}} {{$t('delete')}} - - - - - - + + + + + +
- + import TableCollection from '@/components/tableCollection/index' import parameterColumn from '../dialog/parametercolumn' - import { getAction, postAction, downloadFile ,deleteAction } from '../../../api/manage' + import { getAction, postAction, downloadFile, deleteAction } from '../../../api/manage' import eventBUs from '../../../common/event' import customizeList from './customizeList' import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index' @@ -774,7 +779,7 @@ globalAdvancedQuery, batchUpdateDeadline }, - mixins:[ResizeHeader, ResizeColumnProvide], + mixins: [ResizeHeader, ResizeColumnProvide], data() { this.statusList = [ { @@ -894,7 +899,7 @@ title: this.$t('status'), align: 'left', dataIndex: 'stateText', - width: 120, + width: 120 }, { title: this.$t('Exporttime'), @@ -1162,9 +1167,9 @@ } if (this.$route.query.statusFlag == '1') { this.formInline.state = '1' - } else if(this.$route.query.statusFlag == '2'){ + } else if (this.$route.query.statusFlag == '2') { this.formInline.state = '2' - }else if(this.$route.query.statusFlag == '4'){ + } else if (this.$route.query.statusFlag == '4') { this.formInline.state = '4' } // clearTimeout(this.timeBatch) @@ -1272,20 +1277,29 @@ this.visibleRoleSwitching = false }, bringInTheProjectInterfaceClick() { - let query = { - paramsManifestId: this.paramsManifest.id, - projectId: this.$route.query.projectId - } - this.textLoading = true - getAction('/params/collectManifest/bringSdtInto', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.$refs.CollectionTabel.getTableList(this.queryParamQuery) - } else { - this.$message.warning(this.$t('operationFailed')) + if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) { + let ids = [] + this.selectedRowKeysValue.forEach(res => { + ids.push(res.id) + }) + let query = { + paramsManifestId: this.paramsManifest.id, + ids: ids.join(','), + projectId: this.$route.query.projectId } - this.textLoading = false - }) + this.textLoading = true + getAction('/params/collectManifest/bringSdtInto', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.$refs.CollectionTabel.getTableList(this.queryParamQuery) + } else { + this.$message.warning(this.$t('operationFailed')) + } + this.textLoading = false + }) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, handleOkRoleSwitching() { if (this.$route.query.type == '1') { @@ -1574,7 +1588,7 @@ // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) }, // 导出列表 - Derivedlist(){ + Derivedlist() { this.exportvisible = true this.expoteList() }, @@ -1587,22 +1601,22 @@ this.pageSizehistory = pageSize this.expoteList() }, - exportok(){ + exportok() { this.exportvisible = false }, - exportvisiblecancel(){ + exportvisiblecancel() { this.exportvisible = false }, - exportsubmit(){ + exportsubmit() { this.ExportFailed = false }, - exportcancel(){ + exportcancel() { this.ExportFailed = false }, - exportdata(item){ + exportdata(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId }) }, - exportdelete(item){ + exportdelete(item) { this.$confirm({ title: this.$t('confirmDeletion'), content: '', @@ -1661,8 +1675,8 @@ paramsTemplatePublishVersion: 1, cut: this.cut, userTypes: this.currentPersonRole, - exportName: this.$route.query.projectName.slice(0,-3)+ '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')'+'-' + this.$route.query.version, - isHistory:this.isHistroy + exportName: this.$route.query.projectName.slice(0, -3) + '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')' + '-' + this.$route.query.version, + isHistory: this.isHistroy } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' getAction('/params/collectManifest/exportAll', query).then((res) => { @@ -2325,7 +2339,7 @@ let selectedRowKeysValue = [] data.forEach(res => { if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') { + res.state == 'Rejected by homo engineer' || res.state == 'Modify' || res.state == '变更') { selectedRowKeysValue.push(res) } }) @@ -2509,7 +2523,7 @@ if (keyNameOne[l].type == 'pull_more') { keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',') } - if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { + if ((keyNameOne[l].dataValue == undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) return } From 56eb2f746b4bb45ca0eac4fb5ddd5669d959d2cb Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 25 Oct 2023 16:44:41 +0800 Subject: [PATCH 090/111] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95--=E6=B7=BB=E5=8A=A0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestHistoryEO.java | 4 ++ .../ParamsCollectManifestEOServiceImpl.java | 4 +- ...msCollectManifestHistoryEOServiceImpl.java | 59 +++++++++++++++++-- 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java index c0ebc31a4..492b99ce5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.collect.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -37,4 +38,7 @@ public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestBaseEO @ApiModelProperty(value = "参考列") private String referencesCol; + + @TableField(exist = false) + private String userTypes;//用户类型 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 6a6ad78ef..4f34109da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3671,7 +3671,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); //带入逻辑修改为只带入勾选的条目 - list = list.stream().filter(e->paramsCollectManifestVO.getIds().contains(e.getId())).collect(Collectors.toList()); + if(StringUtils.isNotBlank(paramsCollectManifestVO.getIds())){ + list = list.stream().filter(e->paramsCollectManifestVO.getIds().contains(e.getId())).collect(Collectors.toList()); + } // 过滤出 状态为：待发起收集或变更，且工程接口人处为空的参数项 list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index 6c0bb194a..d03068e6a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -16,7 +16,12 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oss.CosBootUtil; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; -import com.jero.modules.cert.collect.entity.*; +import com.jero.modules.cert.collect.entity.ParamsCollectExport; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO; +import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO; import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum; import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; @@ -36,13 +41,20 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.common.ReadExcel; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFFont; +import org.apache.poi.xssf.usermodel.XSSFRichTextString; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -53,13 +65,31 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Field; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -92,6 +122,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl(Arrays.asList("2","4","5","6","7","8"))); + } else if (CollectManifestUserTypeEnum.DRE.getValue().equals(userTypes)) { + queryWrapper.lambda().eq(ParamsCollectManifestHistoryEO::getDre,loginUser.getUsername()); + queryWrapper.lambda().in(ParamsCollectManifestHistoryEO::getState,new ArrayList(Arrays.asList("4","6","7","8"))); + } else if (CollectManifestUserTypeEnum.GUEST.getValue().equals(userTypes)) { + return page; + } else if (CollectManifestUserTypeEnum.VIEWER.getValue().equals(userTypes)) { + List dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(loginUser.getId()); + queryWrapper.lambda().and(q->{ + q.eq(ParamsCollectManifestHistoryEO::getSdt,loginUser.getUsername()); + q.or().eq(ParamsCollectManifestHistoryEO::getDre,loginUser.getUsername()); + q.or().in(ParamsCollectManifestHistoryEO::getDutyTerritory,dutyTerritoryList); + }); + } + IPage pageInfo = page(page, queryWrapper); // 查询固定列 // IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列 From 581bd6b7b247e734ecce6fd77d94d974ffc436ad Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 25 Oct 2023 17:08:03 +0800 Subject: [PATCH 091/111] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9C=AC=E6=B8=85=E5=8D=95=E6=89=80=E6=9C=89=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 9 +++++++++ .../mapper/ParamsCollectManifestEOMapper.java | 4 ++-- .../xml/ParamsCollectManifestEOMapper.xml | 3 +++ .../IParamsCollectManifestEOService.java | 1 + .../ParamsCollectManifestEOServiceImpl.java | 18 ++++++++++++++++++ 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index bc3aab407..531e4aa80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -706,6 +706,15 @@ public class ParamsCollectManifestEOController extends JeroController queryDutyTerritory(@RequestParam(name="id",required=true) String id) { return this.paramsCollectManifestEOService.queryDutyTerritory(id); } + /** + * 查询本清单所有责任领域 + */ + @AutoLog(value = "参数项历史收集清单-查询本清单所有责任领域") + @ApiOperation(value="参数项历史收集清单-查询本清单所有责任领域", notes="参数项历史收集清单-查询本清单所有责任领域") + @GetMapping(value = "/queryDutyTerritoryHistory") + public Result queryDutyTerritoryHistory(@RequestParam(name="id",required=true) String id) { + return this.paramsCollectManifestEOService.queryDutyTerritoryHistory(id); + } /** * 某个项目责任领域下-工程接口人 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index cdcbc1cee..a1013f53f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -1,11 +1,9 @@ package com.jero.modules.cert.collect.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.entity.ParamsManifestEO; -import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,5 +39,7 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper queryDutyTerritory(@Param("paramsManifestId") String paramsManifestId); + List queryDutyTerritoryHistory(@Param("paramsManifestId") String paramsManifestId); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 04d385b79..d49dcd42e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -159,5 +159,8 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 1ac6ed770..9dd1382d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -206,4 +206,5 @@ public interface IParamsCollectManifestEOService extends IService getList(Map params); Result queryDutyTerritory(String id); + Result queryDutyTerritoryHistory(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 4f34109da..b852a6c70 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -7655,4 +7655,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryDutyTerritoryHistory(String paramsManifestId) { + List dtList = paramsCollectManifestEOMapper.queryDutyTerritoryHistory(paramsManifestId); + List dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory"); + Map dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); + JSONArray resList = new JSONArray(); + if(ObjectUtils.isNotEmpty(dtList)){ + for (String dtId : dtList) { + if(StringUtils.isNotBlank(dtId)){ + JSONObject dt = new JSONObject(); + dt.put("key",dtId); + dt.put("value",dictItemsMap.get(dtId)); + resList.add(dt); + } + } + } + return Result.OK(resList); + } } From 6d9446d9b63238ac3a7de5cba5ae218a9373dde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 25 Oct 2023 17:33:31 +0800 Subject: [PATCH 092/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 93fe58c0d..41317e19a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1211,7 +1211,13 @@ methods: { ...mapGetters(['userInfo']), getQueryDutyTerritory() { - getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => { + let url = '' + if(this.$route.query.it){ + url = '/params/collectManifest/queryDutyTerritoryHistory' + }else{ + url = '/params/collectManifest/queryDutyTerritory' + } + getAction(url, { id: this.$route.query.id }).then((res) => { if (res.success) { // res.result.push( // { From d4f94c67bb177a2fe8ce1c78ad322f8e3d90786f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 26 Oct 2023 09:18:05 +0800 Subject: [PATCH 093/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=8B=B1=E6=96=87=E7=89=88=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA=E4=B8=BAStudio?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=E4=B8=BARegulation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/ProjectDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 3dcaf7c09..d24bf45f4 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -293,7 +293,7 @@ export default { }, roleSwitchListEn: { '0': 'R&H Studio', - '1': 'studio', + '1': 'Regulation', '2': 'homo', '4': 'Regulatory Engineer/Certification Engineer', '11': 'R&H Manager', From c8586cd71cdd26b0a2113a75d0e5c0fff26bc20d Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 26 Oct 2023 09:20:23 +0800 Subject: [PATCH 094/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/certificationList/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 68de076af..72f9f4f7a 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1283,7 +1283,8 @@ postAction('/project/projectCertificationInventoryEO/resetFlow', { ids: idList.join(','), projectLibraryId: _this.$route.query.id, - operatorType: 'certificationInventoryStudioReset' + operatorType: 'certificationInventoryStudioReset', + currRole:_this.roleSwitchingCode }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) From a676b546db7f7f96bcf1ff4a79b6ed9772c45f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 26 Oct 2023 09:40:28 +0800 Subject: [PATCH 095/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../certificationList/components/addModel.vue | 48 +++++++++---------- .../components/deadlineForm.vue | 20 ++++---- .../components/certificationList/index.vue | 8 ++-- 5 files changed, 41 insertions(+), 37 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f7b84ed7c..722f78b1a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1712,6 +1712,7 @@ module.exports = { returntofill: 'Return to fill', thereAreCurrentlyNoRegulationsToHandle: 'No regulations to be processed now', certificationSubmission: 'Application Submitted', + certificationSubmissionEndTime: 'Application Submitted End Time', upgradecompletion: 'Upgrade completion', implementedupgrade: 'Whether the implemented upgrade is consistent with the record', numberofvehicles: 'Number of vehicles that have completed upgrades', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c7d04575e..29697e07a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1812,6 +1812,7 @@ module.exports = { expeditionProcess: '催办流程', thereAreCurrentlyNoRegulationsToHandle: '当前没有可处理的法规', certificationSubmission: '认证提交', + certificationSubmissionEndTime:'认证提交截止时间', upgradecompletion: '升级完成情况', implementedupgrade: '实施的升级是否和备案一致', numberofvehicles: '完成升级的车辆数', diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 1fe20cf5e..f385f2e98 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -303,14 +303,14 @@
* - {{$t('closingDate')}} + {{$t('certificationSubmissionEndTime')}}
* - {{$t('closingDate')}} + {{$t('certificationSubmissionEndTime')}}
- - -
-
- {{$t('remarks')}} -
- - - -
- -
@@ -690,6 +674,22 @@
+ + +
+
+ {{$t('remarks')}} +
+ + + +
+ +
@@ -1222,7 +1222,7 @@ } .title-text { - width: 114px; + width: 124px; text-align: right; display: inline-block; font-weight: 500; @@ -1242,7 +1242,7 @@ } .itemModel { - width: calc(100% - 130px); + width: calc(100% - 140px); display: inline-block; margin-top: 2px; height: 40px; diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue index 62d6ee45c..92ba9c97a 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue @@ -13,16 +13,16 @@
-
+
* - {{ $t('cutoffTime') }} + :title="titleName"> + {{ titleName }}
{ if (valid) { - this.$emit('deadlineDataForm', this.queryData,this.formInline) + this.$emit('deadlineDataForm', this.queryData, this.formInline) this.confirmLoading = true } }) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 68de076af..eaf3fcca0 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -843,10 +843,10 @@ scopedSlots: { customRender: 'DeliverablesResult' } }, { - title: this.$t('closingDate'), + title: this.$t('certificationSubmissionEndTime'), align: 'left', dataIndex: 'endTime', - width: 130, + width: 150, sorter: true, ellipsis: true }, @@ -1424,7 +1424,7 @@ dutyDueDate: 'inventoryVerifyEndTime', title: this.$t('release') } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query))) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('inventoryVerifyEndTime')) } else { this.failedMessage(data) } @@ -2070,7 +2070,7 @@ title: this.$t('initiateTask'), NAId: NAId } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query))) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('taskConfirmEndTime')) // this.submitTask(value, prompt, ids, notConditions, data, NAId) } else { this.failedMessage(data) From 98984575f78be3ae9b5c0a6162890340b037738e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 26 Oct 2023 09:48:28 +0800 Subject: [PATCH 096/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/responsibilityList.vue | 3 ++- .../components/responsibilityList.vue | 3 ++- .../projectStatusBoard/components/responsibilityList.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index 86259d364..a5470d4f5 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -141,7 +141,8 @@ this.visible = false }, areaOfResponsibilityClick(item) { - if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' || + if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' || + this.queryParam.operatorType == 'queryVerificationTaskConfirmation' || this.queryParam.operatorType == 'queryDesignStatistics' || this.queryParam.operatorType == 'queryVerifyStatistics') { item.isListing = '1' diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue index 86259d364..a5470d4f5 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue @@ -141,7 +141,8 @@ this.visible = false }, areaOfResponsibilityClick(item) { - if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' || + if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' || + this.queryParam.operatorType == 'queryVerificationTaskConfirmation' || this.queryParam.operatorType == 'queryDesignStatistics' || this.queryParam.operatorType == 'queryVerifyStatistics') { item.isListing = '1' diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue index 9be0759ff..51a0da2da 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue @@ -144,7 +144,8 @@ }, areaOfResponsibilityClick(item) { let type = '' - if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' || + if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' || + this.queryParam.operatorType == 'queryVerificationTaskConfirmation' || this.queryParam.operatorType == 'queryDesignStatistics' || this.queryParam.operatorType == 'queryVerifyStatistics') { type = '102' From 5c113843a5d8aefbc81eeda04890739411894375 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 Oct 2023 10:50:25 +0800 Subject: [PATCH 097/111] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E9=80=80=E5=9B=9E=E6=94=B9=E4=B8=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/enums/ComplianceFlowStatusEnum.java | 2 +- .../main/java/com/jero/modules/project/enums/FlowStateEnum.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java index 204c3dee2..a4cb202dd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.StringUtils; public enum ComplianceFlowStatusEnum { LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), - REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"), + REGULATORY_ENGINEER_RETURNS("法规退回","Regulatory engineer returns","Regulatory engineer returns"), DUTY_PERSON_REJECTED("责任人拒绝","Rejected by the responsible person","Duty Person Rejected"), DUTY_PERSON_ACCEPTED("责任人接受","Accepted by the responsible person","Duty Person Accepted"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java index 10ba287e5..a35b3aa1b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java @@ -13,7 +13,7 @@ public enum FlowStateEnum { UNINVOLVED("不涉及","NA","NA"), LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), - REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"), + REGULATORY_ENGINEER_RETURNS("法规退回","Regulatory engineer returns","Regulatory engineer returns"), REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), From 877266d0306e4d366e6b61ed6b37b064bc420df4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 Oct 2023 11:21:03 +0800 Subject: [PATCH 098/111] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4--=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/entity/DummyInventoryInfoEO.java | 5 ++- .../impl/DummyInventoryInfoEOServiceImpl.java | 37 +++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 7950daead..e6a62aa7c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -336,6 +335,10 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private String orderByField; + /**一级责任领域**/ + @TableField(exist = false) + private String firstLevelDutyTerritory; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 339a11252..7ff8f138f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -46,8 +46,19 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.hssf.usermodel.HSSFRichTextString; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; @@ -65,11 +76,25 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.text.Collator; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile; @@ -168,6 +193,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl page = new Page(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize()); IPage pageInfo = this.page(page, queryWrapper); From c4659076b23c98b46a8572395302f7058a4739a0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 Oct 2023 11:41:19 +0800 Subject: [PATCH 099/111] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOController.java | 39 ++++++++++++------- .../entity/AuthDummyInventoryInfoEO.java | 17 ++++---- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index b0eb5a9f9..8e33cdcc2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -1,30 +1,36 @@ package com.jero.modules.authDummy.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; -import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.dummy.entity.DummyInventoryInfoEO; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -68,6 +74,9 @@ public class AuthDummyInventoryInfoEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper); this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index 43f046ec2..c29dff603 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -1,22 +1,19 @@ package com.jero.modules.authDummy.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -166,4 +163,8 @@ public class AuthDummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "备注") @Excel(name = "备注", width = 50) private String remark; + + @ApiModelProperty(value = "责任部门") + @TableField(exist = false) + private String firstLevelDutyTerritory; } From 3a0a48ec668f8a0df9aa5dd49902ecc2c2b1afa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 26 Oct 2023 12:24:45 +0800 Subject: [PATCH 100/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=90=8E=EF=BC=8C=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=9C=AA=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 191 +++++++++--------- .../components/listOfRegulations.vue | 102 +++++----- .../components/responsibilityList.vue | 129 +++++++++++- .../components/certificationList/index.vue | 92 ++++----- .../components/listOfRegulations.vue | 2 + .../components/responsibilityList.vue | 117 ++++++++++- .../components/responsibilityList.vue | 128 +++++++++++- 7 files changed, 554 insertions(+), 207 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 7ef8546d6..d40476924 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -21,6 +21,7 @@ class="box-input" mode="multiple" allowClear + @change="ProcessStatusChange" :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam.flowStatus"> - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -130,9 +133,9 @@
- - -
+ + +
{{ $t('CertificationDirectory') }}
@@ -603,7 +606,7 @@ export default { name: 'index', - props: ['isDisplayNum','areaOfResponsibility'], + props: ['isDisplayNum', 'areaOfResponsibility'], mixins: [ResizeColumnProvide, ResizeHeader], components: { globalAdvancedQuery, @@ -633,7 +636,7 @@ total: 0, JTextLoading: false, visibleoperationFailed: false, - visibleoperation:'', + visibleoperation: '', CertificationColor: { 'Test passed': 'accordColor', 'Test failed': 'nonConformityColor', @@ -896,7 +899,7 @@ align: 'left', dataIndex: 'remark', width: 210, - ellipsis: true, + ellipsis: true }, { title: this.$t('operation'), @@ -913,7 +916,7 @@ toDoNotConditions: [], userInfoQuery: {}, DeliverableTreeList: [], - firstLevelDutyTerritoryList:[], + firstLevelDutyTerritoryList: [] } }, mounted() { @@ -922,9 +925,9 @@ this.long = localStorage.getItem('language') || 'zh-cn' this.loading = true this.userInfoQuery = this.userInfo() - console.log(this.areaOfResponsibility) if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) { this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName + this.queryParam.flowStatus = this.areaOfResponsibility.processState ? this.areaOfResponsibility.processState.split(',') : [] this.queryParam = { ...this.queryParam } } this.getProcessStatus() @@ -1206,6 +1209,9 @@ } downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect) }, + ProcessStatusChange(value) { + console.log(value) + }, handleDel() { let _this = this if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { @@ -1215,9 +1221,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'List to be released' || this.selectedRowKeysList[i].flowStatus == 'Review and pass') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1284,7 +1290,7 @@ ids: idList.join(','), projectLibraryId: _this.$route.query.id, operatorType: 'certificationInventoryStudioReset', - currRole:_this.roleSwitchingCode + currRole: _this.roleSwitchingCode }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -1310,9 +1316,9 @@ } }, // 关联平台件 - associatedplatformClick(type){ + associatedplatformClick(type) { let flag = '' - if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.detailedWarningList = [] let dataSource = [] let status = '' @@ -1331,31 +1337,31 @@ status = '2' } } - if(status == '1'){ - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) - }else{ + if (status == '1') { + this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(',')) + } else { this.$message.warning(this.$t('unpublishedregulationsselected')) } - }else{ + } else { flag = '2' this.$message.warning(this.$t('selectLeastOne')) } }, - associatedplatForm(id,flag,type,ids){ - console.log(id,flag,type,ids) - let query ={ - ids:ids, - projectLibraryIds:id + associatedplatForm(id, flag, type, ids) { + console.log(id, flag, type, ids) + let query = { + ids: ids, + projectLibraryIds: id } - if(type == '认证'){ + if (type == '认证') { postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => { if (res.success) { - if(res.result == ''){ + if (res.result == '') { this.$refs.associatedplatRef.visible = false this.$message.success(this.$t('OperationSuccessful')) this.selectedRowKeys = [] this.getList() - }else{ + } else { this.visibleoperation = res.result this.visibleoperationFailed = true } @@ -1368,16 +1374,16 @@ // this.$refs.associatedplattwoRef.transferModel(id,type,ids) // } }, - cancleoperationFailed(){ + cancleoperationFailed() { this.visibleoperationFailed = false this.$refs.associatedplatRef.handleCancel() this.selectedRowKeys = [] this.getList() }, - associatedplattwoForm(id,type,ids){ + associatedplattwoForm(id, type, ids) { // this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }, - associatedplatthreeForm(id){ + associatedplatthreeForm(id) { console.log(id) }, //添加 @@ -1425,7 +1431,7 @@ dutyDueDate: 'inventoryVerifyEndTime', title: this.$t('release') } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('inventoryVerifyEndTime')) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('inventoryVerifyEndTime')) } else { this.failedMessage(data) } @@ -1542,9 +1548,9 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be checked') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1606,9 +1612,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1629,9 +1635,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1652,9 +1658,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1721,13 +1727,16 @@ let _this = this if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') { console.log(val) - if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){ + if (val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)) { this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated')) - }else{ + } else { this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => { + deleteAction(_this.url.deleteOne, { + id: val.id, + projectLibraryId: _this.$route.query.id + }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -1857,9 +1866,9 @@ if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1873,9 +1882,9 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1914,9 +1923,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { this.toDoIds.push(this.selectedRowKeysList[i].id) } } else { @@ -2036,17 +2045,17 @@ this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { NAId.push(this.selectedRowKeysList[i].id) } } else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType && this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2071,7 +2080,7 @@ title: this.$t('initiateTask'), NAId: NAId } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('taskConfirmEndTime')) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('taskConfirmEndTime')) // this.submitTask(value, prompt, ids, notConditions, data, NAId) } else { this.failedMessage(data) @@ -2089,9 +2098,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2124,9 +2133,9 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2158,9 +2167,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2205,9 +2214,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2237,9 +2246,9 @@ this.selectedRowKeysList[i].flowStatus == 'Review and return') && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2268,16 +2277,16 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) isTrue = true } @@ -2445,16 +2454,16 @@ if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') { if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else if (this.roleSwitchingCode == 21) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2502,31 +2511,31 @@ this.$message.warning(this.$t('selectLeastOne')) } }, - bringInRelevantPersonnelClick(){ + bringInRelevantPersonnelClick() { let _this = this // if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$confirm({ - content: _this.$t('confirmBringInRelevantPersonnel'), - onOk() { - // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', { - // ids: selectedRowKeys.join(','), - projectLibraryId: _this.$route.query.id - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) + this.$confirm({ + content: _this.$t('confirmBringInRelevantPersonnel'), + onOk() { + // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', { + // ids: selectedRowKeys.join(','), + projectLibraryId: _this.$route.query.id + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) // } else { // this.$message.warning(this.$t('selectLeastOne')) // } - }, + } } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 44cdf94e3..4995c32d8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -58,6 +58,7 @@ style="width: calc(100% - 80px);" mode="multiple" optionFilterProp="label" + @change="listOptionsChange" :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam[selectModel]"> - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -166,11 +169,11 @@ {{ $t('processReset') }}
- - - - - + + + + + - + @@ -795,8 +799,8 @@ pageNo: 1, pageSize: 50, total: 0, - long:'', - visibleoperation:'', + long: '', + visibleoperation: '', roleSwitchingList: [], formInlineQuestion: {}, formInlineReset: {}, @@ -1585,6 +1589,8 @@ this.getFirstLevelDutyTerritory() if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) { this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName + this.selectModel = this.areaOfResponsibilityList.selectModel + this.queryParam[this.selectModel] = this.areaOfResponsibilityList.processState ? this.areaOfResponsibilityList.processState.split(',') : [] this.queryParam = { ...this.queryParam } } this.long = localStorage.getItem('language') || 'zh-cn' @@ -1855,15 +1861,15 @@ primaryKeyId: row.primaryKeyId } } - if(row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1){ + if (row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1) { this.$refs.flowstatusdetialRef.addModel(row, name) - }else{ + } else { this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name) } }, - a(){ + a() { this.$refs.flowstatusdetialRef.addModel() }, @@ -1942,7 +1948,9 @@ downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) } }, - + listOptionsChange(row) { + console.log(row) + }, //导出 handleExport() { let roleCodeIndex = this.roleSwitchingCode @@ -1985,9 +1993,9 @@ this.$refs.transferListRef.transferModel() }, // 关联平台件visibleoperation - associatedplatformClick(type){ + associatedplatformClick(type) { let flag = '' - if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.detailedWarningList = [] let dataSource = [] let status = '' @@ -2006,42 +2014,42 @@ } } console.log(status) - if(status == '1'){ + if (status == '1') { this.$message.warning(this.$t('unpublishedregulationsselected')) - }else{ - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + } else { + this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(',')) } - }else{ + } else { let ids = [] this.dataSource.forEach(item => { ids.push(item.id) }) flag = '2' - this.$refs.associatedplatRef.transferModel(flag,type,ids.join(',')) + this.$refs.associatedplatRef.transferModel(flag, type, ids.join(',')) } }, - associatedplatForm(id,flag,type,ids){ - if(flag == '1'){ - this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids) - }else{ - this.$refs.associatedplattwoRef.transferModel(id,flag,type,ids) + associatedplatForm(id, flag, type, ids) { + if (flag == '1') { + this.$refs.associatedplatthreeRef.transferModel(id, flag, type, ids) + } else { + this.$refs.associatedplattwoRef.transferModel(id, flag, type, ids) } }, - associatedplattwoForm(id,flag,type,ids){ - this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids) + associatedplattwoForm(id, flag, type, ids) { + this.$refs.associatedplatthreeRef.transferModel(id, flag, type, ids) }, - associatedplatthreeForm(id){ + associatedplatthreeForm(id) { this.$refs.associatedplatRef.handleCancel() this.$refs.associatedplattwoRef.handleCancel() this.selectedRowKeys = [] this.getList() }, - associatedplatthreeFormHomo(msg){ - if(msg){ + associatedplatthreeFormHomo(msg) { + if (msg) { this.visibleoperation = msg this.visibleoperationFailed = true - }else{ + } else { this.$message.success(this.$t('OperationSuccessful')) this.$refs.associatedplatRef.handleCancel() this.$refs.associatedplattwoRef.handleCancel() @@ -2049,7 +2057,7 @@ this.getList() } }, - cancleoperationFailed(){ + cancleoperationFailed() { this.visibleoperationFailed = false this.$refs.associatedplatRef.handleCancel() this.$refs.associatedplattwoRef.handleCancel() @@ -2156,8 +2164,8 @@ contentList[i].designFlowStatus == 'Duty Person Rejected') { if (contentList[i].projectLawsInventoryEOS && (contentList[i].projectLawsInventoryEOS.length > 0 || contentList[i].projectLawsInventoryEOS !== null)) { detailedWarningList.push( - < div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) - }else{ + < div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) + } else { idList.push(contentList[i].id) } } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') { @@ -2280,8 +2288,8 @@ content[i].designFlowStatus == 'Results to be reviewed') { if (content[i].projectLawsInventoryEOS && (content[i].projectLawsInventoryEOS.length > 0 || content[i].projectLawsInventoryEOS !== null)) { this.questionWarning.push( - < div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) - }else{ + < div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) + } else { this.questionIdList.push(content[i].id) } } else { @@ -2407,7 +2415,7 @@ ids: idList.join(','), projectLibraryId: _this.$route.query.id, operateType: _this.formInlineReset.operateType, - currRole:this.roleSwitchingCode + currRole: this.roleSwitchingCode }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -2934,12 +2942,12 @@ dataSource[i].designFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'Regulatory engineer returns') { // if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){ - if (dataSource[i].regulationOwnerId) { - this.detailedSuccessList.push(dataSource[i]) - } else { - this.detailedWarningList.push( - < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) - } + if (dataSource[i].regulationOwnerId) { + this.detailedSuccessList.push(dataSource[i]) + } else { + this.detailedWarningList.push( + < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) + } // }else{ // this.detailedWarningList.push( // < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) @@ -3103,8 +3111,8 @@ dataSource[i].designFlowStatus == 'Duty Person Rejected') { if (dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)) { this.detailedWarningList.push( - < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) - }else{ + < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) + } else { idList.push(dataSource[i].id) this.rowKeysSuccessList.push(dataSource[i]) } @@ -3477,7 +3485,7 @@ if (isDesign || isVerify) { if (dataSource[0].projectLawsInventoryEOS && (dataSource[0].projectLawsInventoryEOS.length > 0 || dataSource[0].projectLawsInventoryEOS !== null)) { this.$message.warning(dataSource[0].serialNumber + this.$t('platformitemhasbeenassociated')) - }else{ + } else { this.$refs.toResubmitFormRef.getData(dataSource[0], isDesign, isVerify) } } else { diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index a5470d4f5..f3bec6261 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -30,7 +30,7 @@ > - {{text}} + {{text}} @@ -82,7 +82,101 @@ width: 240, sorter: true } - ] + ], + //法规清单 + taskProcessState: {//设计、验证任务确认 + 'Duty Person Accepted': [//设计、验证任务确认-责任人接受 + 'Results to be submitted', + 'Results to be reviewed', + 'Compliance', + 'Non-Compliance', + 'To be tracked' + ], + 'List to be released': [//设计、验证任务确认-清单待发布 + 'List to be released', + 'Regulatory engineer returns' + ], + 'Task to be confirmed': [//设计、验证任务确认-任务待确认 + 'Task to be confirmed' + ], + 'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝 + 'Duty Person Rejected' + ], + 'List to be checked': [//设计、验证任务确认-任务待发起 + 'List to be checked' + ] + }, + complianceProcessState: {//设计、验证符合性 + 'Task to be confirmed': [//任务待确认 + 'List to be released', + 'Regulatory engineer returns', + 'List to be checked', + 'Task to be confirmed', + 'Duty Person Rejected' + ], + 'Results to be submitted': [//结果待提交 + 'Results to be submitted' + ], + 'Results to be reviewed': [//结果待审查 + 'Results to be reviewed' + ], + 'To be tracked': [//待追踪 + 'To be tracked' + ], + 'Compliance': [//符合 + 'Compliance' + ], + 'Non-Compliance': [//不符合 + 'Non-Compliance' + ] + }, + + //认证清单-认证任务确认 + authenticationProcessState: { + 'List to be released': [//清单待发布 + 'List to be released', + 'Certification returned' + ], + 'List to be checked': [//任务待发起 + 'List to be checked' + ], + 'Task to be confirmed': [//任务待确认 + 'Task to be confirmed' + ], + 'Accepted of responsible person': [//责任人接受 + 'Results to be submitted', + 'Results to be reviewed', + 'Review and pass', + 'Review and return' + ], + 'Refusal of responsible person': [//责任人拒绝 + 'Refusal of responsible person' + ] + }, + //认证清单-Pro-homo流程 + proHomoProcessState: { + 'Task to be confirmed': [//任务待确认 + 'List to be released', + 'Certification returned', + 'List to be checked', + 'Task to be confirmed', + 'Refusal of responsible person' + ], + 'Results to be submitted': [//结果待提交 + 'Results to be submitted' + ], + 'Results to be reviewed': [//结果待审查 + 'Results to be reviewed' + ], + 'Review and pass': [//审查通过 + 'Review and pass' + ], + 'Review and return': [//审查退回 + 'Review and return' + ] + }, + //认证清单-认证进度 + progressProcessState: {} } }, mounted() { @@ -108,9 +202,9 @@ this.orderByField = 'designDutyId' } else if (sorter.columnKey == 'verifyDutyIdName') { this.orderByField = 'verifyDutyId' - } else if (sorter.columnKey == 'verifyFlowStatusName') { + } else if (sorter.columnKey == 'verifyFlowStatusName') { this.orderByField = 'verifyFlowStatus' - } else if (sorter.columnKey == 'designFlowStatusName') { + } else if (sorter.columnKey == 'designFlowStatusName') { this.orderByField = 'designFlowStatus' } else { this.orderByField = sorter.columnKey @@ -120,9 +214,9 @@ getList() { this.loading = true let query = { - ...this.queryParam, + ...this.queryParam, orderBy: this.orderBy, - orderByField: this.orderByField, + orderByField: this.orderByField } getAction(this.url.GroupByTerritory, query).then((res) => { if (res.success) { @@ -141,11 +235,26 @@ this.visible = false }, areaOfResponsibilityClick(item) { - if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' || - this.queryParam.operatorType == 'queryVerificationTaskConfirmation' || - this.queryParam.operatorType == 'queryDesignStatistics' || - this.queryParam.operatorType == 'queryVerifyStatistics') { + if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') { item.isListing = '1' + item.processState = this.taskProcessState[this.queryParam.status].join(',') + item.selectModel = 'designFlowStatus' + } else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') { + item.isListing = '1' + item.processState = this.taskProcessState[this.queryParam.status].join(',') + item.selectModel = 'verifyFlowStatus' + } else if (this.queryParam.operatorType == 'queryDesignStatistics') { + item.processState = this.complianceProcessState[this.queryParam.status].join(',') + item.isListing = '1' + item.selectModel = 'designFlowStatus' + } else if (this.queryParam.operatorType == 'queryVerifyStatistics') { + item.processState = this.complianceProcessState[this.queryParam.status].join(',') + item.isListing = '1' + item.selectModel = 'verifyFlowStatus' + } else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') { + item.processState = this.authenticationProcessState[this.queryParam.status].join(',') + } else if (this.queryParam.operatorType == 'queryPrehomoStatistics') { + item.processState = this.proHomoProcessState[this.queryParam.status].join(',') } this.$emit('responsibility', item) } diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue index cd2d47208..5221d7161 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue @@ -85,8 +85,10 @@ {{ !toggleSearchStatus ? $t('open') : $t('away') }} - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -130,18 +132,18 @@
- - -
+ + +
{{ $t('CertificationDirectory') }}
- - - - - + + + + +
- - - - - - + + + + + +