From 02ad9c47902f62b1ee3a30c99dd797b6d2bdac5b Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 16 May 2022 15:40:28 +0800 Subject: [PATCH 01/13] =?UTF-8?q?bug51957=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/enums/ProjectTaskPlanningNameEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 290039710..ac6da41f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,7 +4,7 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_END_TIME("认证结束"," Certification end\n"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), From 93717670590437d2667ed23eb1bceaba185721a7 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 16 May 2022 15:41:02 +0800 Subject: [PATCH 02/13] =?UTF-8?q?Revert=20"bug51957=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 02ad9c47902f62b1ee3a30c99dd797b6d2bdac5b. --- .../jero/modules/project/enums/ProjectTaskPlanningNameEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index ac6da41f0..290039710 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,7 +4,7 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), + PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_END_TIME("认证结束"," Certification end\n"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), From f7fe956cc7e8c648d58414abeddc925ce94895d1 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 16 May 2022 15:42:07 +0800 Subject: [PATCH 03/13] =?UTF-8?q?bug51957=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/ProjectTaskPlanningNameEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 290039710..02839a265 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,9 +4,9 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), - ATTESTATION_END_TIME("认证结束"," Certification end\n"), + ATTESTATION_END_TIME("认证结束"," Certification end"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), ; From 06fdebeaf2ac27415b9378fc4851e5c98f1d2fc7 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 16 May 2022 15:42:14 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E7=BB=9F=E8=AE=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 15 ++ .../enums/CertificationProgressEnum.java | 47 +++++++ .../enums/CurrentProjectStatusEnum.java | 47 +++++++ .../mapper/ConditionAssessmentEOMapper.java | 8 +- .../mapper/ProjectLawsInventoryEOMapper.java | 14 ++ .../mapper/ProjectTaskInventoryEOMapper.java | 26 ++++ .../xml/ConditionAssessmentEOMapper.xml | 15 ++ .../xml/ProjectLawsInventoryEOMapper.xml | 24 ++++ .../xml/ProjectTaskInventoryEOMapper.xml | 62 ++++++++- .../service/IProjectLibraryBaseService.java | 7 + .../impl/ProjectLibraryBaseServiceImpl.java | 128 ++++++++++++++++++ 11 files changed, 391 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CurrentProjectStatusEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index dec40b212..789f55ff8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -159,4 +159,19 @@ public class ProjectLibraryBaseController extends JeroController getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id, + @RequestParam(name="cut",required=true) String cut) { + Map data = projectLibraryBaseService.getProjectDetailsStatistics(id); + return Result.OK(cut,data); + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java new file mode 100644 index 000000000..8ce5f5997 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java @@ -0,0 +1,47 @@ +package com.jero.modules.project.enums; + +/** + * 认证进度枚举类 + */ +public enum CertificationProgressEnum { + TEST_PASSED("实验通过","Test passed"), + TEST_FAILED("实验失败","Test failed"), + NOT_START("待开始","Not start"), + IN_PROGRESS("进行中","In progress"), + NA("不涉及","NA"), + ; + + String name; + String value; + + private CertificationProgressEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value) { + CertificationProgressEnum[] values = values(); + for (CertificationProgressEnum certificationProgressEnum : values) { + if (certificationProgressEnum.value.equals(value)) { + return certificationProgressEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CurrentProjectStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CurrentProjectStatusEnum.java new file mode 100644 index 000000000..72e36b199 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CurrentProjectStatusEnum.java @@ -0,0 +1,47 @@ +package com.jero.modules.project.enums; + +/** + * 当前项目状态枚举类 + */ +public enum CurrentProjectStatusEnum { + + BLUE("蓝色","0"), + RED("红色","1"), + YELLOW("黄色","2"), + GREEN("绿色","3"), + ; + + String name; + String value; + + private CurrentProjectStatusEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value) { + CurrentProjectStatusEnum[] values = values(); + for (CurrentProjectStatusEnum currentProjectStatusEnum : values) { + if (currentProjectStatusEnum.value.equals(value)) { + return currentProjectStatusEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java index ec58479e2..609d1c5ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java @@ -1,6 +1,7 @@ package com.jero.modules.project.mapper; import java.util.List; +import java.util.Map; import com.jero.modules.project.entity.ConditionAssessmentEO; import org.apache.ibatis.annotations.Param; @@ -13,5 +14,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface ConditionAssessmentEOMapper extends BaseMapper { - + /** + * 获取当前项目状态统计数据 + * @param projectLawsInventoryIdList + * @return + */ + List> getCurrentProjectStatusStatistics(@Param("projectLawsInventoryIdList") List projectLawsInventoryIdList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryEOMapper.java index fc0f2ce0d..aa7af9818 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryEOMapper.java @@ -1,6 +1,7 @@ package com.jero.modules.project.mapper; import java.util.List; +import java.util.Map; import org.apache.ibatis.annotations.Param; import com.jero.modules.project.entity.ProjectLawsInventoryEO; @@ -14,4 +15,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectLawsInventoryEOMapper extends BaseMapper { + /** + * 获取清单确认统计 + * @param projectLibraryId 项目库id + * @return + */ + List> getlistingToConfirmStatistics(@Param("projectLibraryId") String projectLibraryId); + + /** + * 获取清单确认统计 + * @param projectLibraryId 项目库id + * @return + */ + List> getTaskToConfirmStatistics(@Param("projectLibraryId")String projectLibraryId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java index bb5c79abc..f5ee847d9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java @@ -1,6 +1,7 @@ package com.jero.modules.project.mapper; import java.util.List; +import java.util.Map; import org.apache.ibatis.annotations.Param; import com.jero.modules.project.entity.ProjectTaskInventoryEO; @@ -14,4 +15,29 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectTaskInventoryEOMapper extends BaseMapper { + /** + * 获取认证进度统计数据 + * @param projectLawsInventoryIdList + * @return + */ + List> getCertificationProgressStatistics(@Param("projectLawsInventoryIdList") List projectLawsInventoryIdList); + + /** + * 获取设计符合性统计数据 + * @param projectLawsInventoryIdList + * @return + */ + List> getDesignComplianceStatistice(@Param("projectLawsInventoryIdList") List projectLawsInventoryIdList); + /** + * 获取prehomo确认统计数据 + * @param projectLawsInventoryIdList + * @return + */ + List> getPrehomoStatistice(@Param("projectLawsInventoryIdList") List projectLawsInventoryIdList); + /** + * 获取验证符合性统计数据 + * @param projectLawsInventoryIdList + * @return + */ + List> getVerifyComplianceStatistice(@Param("projectLawsInventoryIdList") List projectLawsInventoryIdList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml index dfe111a08..fda409366 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml @@ -13,4 +13,19 @@ + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml index 3c0b1a42e..58ae4f5ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml @@ -41,4 +41,28 @@ + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml index 822f453be..460876633 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml @@ -18,4 +18,64 @@ - \ No newline at end of file + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index dedae398b..abdee6784 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -69,4 +69,11 @@ public interface IProjectLibraryBaseService extends IService * @return */ IPage queryPageList(Map params); + + /** + * 项目详情-统计接口 + * @param id + * @return + */ + Map getProjectDetailsStatistics(String id); } 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 6c1553114..8cb90354d 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 @@ -5,8 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.enums.CertificationProgressEnum; +import com.jero.modules.project.enums.CurrentProjectStatusEnum; +import com.jero.modules.project.enums.InventoryAffirmStatusEnum; +import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; +import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; +import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysDictItemMapper; @@ -43,6 +52,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl getProjectDetailsStatistics(String id) { + Map result = new HashMap<>(); + + //当前项目状态 + Map currentProjectStatusMap = new HashMap<>(); + //清单确认 + Map listingToConfirmMap = new HashMap<>(); + //任务确认 + Map taskToConfirmMap = new HashMap<>(); + //设计符合性 + Map designComplianceMap = new HashMap<>(); + //prehomo确认 + Map prehomoMap = new HashMap<>(); + //验证符合性 + Map verifyComplianceMap = new HashMap<>(); + //认证进度 + Map certificationProgressMap = new HashMap<>(); + + QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); + lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id); + lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); + lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); + List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); + + //当前项目状态统计 获取一个 最差的结果 统计的数据 就是studio看到的数据。 + List> currentProjectStatusMapList = new ArrayList<>(); + CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values(); + for (CurrentProjectStatusEnum value : values) { + Map map = new HashMap<>(); + map.put("color",value.getValue()); + currentProjectStatusMapList.add(map); + } + int currentProjectStatusTotal; + List projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList); + + for (Map map : currentProjectStatusMapList) { + List collect = projectStatusAssessList.stream().filter( + projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString()) + ).collect(Collectors.toList()); + map.put("conditionAssessmentCount",collect.size()); + } + + currentProjectStatusTotal = currentProjectStatusMapList.stream().filter( + currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0 + ).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum(); + + currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList); + currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal); + result.put("currentProjectStatusMap",currentProjectStatusMap); + + //清单确认统计 + List> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); + listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); + result.put("listingToConfirmMap",listingToConfirmMap); + + //任务确认统计 + List> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id); + taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); + result.put("taskToConfirmMap",taskToConfirmMap); + + //设计符合性 + List> designComplianceMapList = this.projectTaskInventoryEOMapper.getDesignComplianceStatistice(projectLawsInventoryIdList); + designComplianceMap.put("designComplianceMapList",designComplianceMapList); + result.put("designComplianceMap",designComplianceMap); + + //prehomo确认 + List> prehomoMapList = this.projectTaskInventoryEOMapper.getPrehomoStatistice(projectLawsInventoryIdList); + prehomoMap.put("prehomoMapList",prehomoMapList); + result.put("prehomoMap",prehomoMap); + + //验证符合性 + List> verifyComplianceMapList = this.projectTaskInventoryEOMapper.getVerifyComplianceStatistice(projectLawsInventoryIdList); + verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList); + result.put("verifyComplianceMap",verifyComplianceMap); + + //认证进度统计 + int certificationProgressTotal; + List> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList); + certificationProgressTotal = certificationProgressMapList.stream().filter( + certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0 + ).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum(); + + CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values(); + for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) { + boolean flag = true; + for (Map map : certificationProgressMapList) { + if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){ + flag = false; + break; + } + } + if(flag){ + Map map = new HashMap<>(); + map.put("certificationProgress",certificationProgressEnumValue.getValue()); + map.put("certificationProgressCount",0); + certificationProgressMapList.add(map); + } + } + + certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal); + certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList); + result.put("certificationProgressMap",certificationProgressMap); + } + + return result; + } } From 7c38fd66da444dd8083a5fa5d5b31faaea908bc1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 May 2022 16:00:02 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6--=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E7=89=88(=E6=9C=AA=E9=AA=8C=E8=AF=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectStatusBoardController.java | 17 ++ .../service/IProjectStatusBoardService.java | 13 + .../impl/ProjectStatusBoardServiceImpl.java | 244 +++++++++++++++++- 3 files changed, 273 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java index 4ae4878e1..8a823179b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java @@ -47,6 +47,23 @@ public class ProjectStatusBoardController { return Result.OK(result); } + /** + * 项目状态进度 + * + * @param projectLibraryBase + * @return + */ + @AutoLog(value = "项目状态进度") + @ApiOperation(value="项目状态进度", notes="项目状态进度") + @GetMapping(value = "/scheduleInfoList") + public Result scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { + iProjectStatusBoardService.scheduleInfoList(projectLibraryBase, req); + if("result"==null) { + return Result.error("未找到对应数据"); + } + return Result.OK("result"); + } + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java index 660c0e001..0cd115688 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java @@ -13,5 +13,18 @@ import java.util.List; */ public interface IProjectStatusBoardService { + /** + * 时间轴 + * @param projectLibraryBase + * @param req + * @return + */ List> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req); + + /** + * 项目状态进度 + * @param projectLibraryBase + * @param req + */ + void scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 1f8aafef7..824d5645f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -3,8 +3,15 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.dummy.entity.DummyInventoryBaseEO; +import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.enums.CurrentProjectStatusEnum; +import com.jero.modules.project.enums.InventoryAffirmStatusEnum; +import com.jero.modules.project.enums.ReviewResultEnum; +import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectStatusBoardService; import com.jero.modules.project.vo.TimeNodeVO; import org.apache.commons.lang3.StringUtils; @@ -13,7 +20,9 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -27,8 +36,20 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService private ProjectTaskPlanningServiceImpl projectTaskPlanningService; @Autowired private ProjectLibraryBaseServiceImpl projectLibraryBaseService; + @Autowired + private IConditionAssessmentEOService conditionAssessmentEOService; + @Autowired + private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService; + @Autowired + private ProjectTaskInventoryEOServiceImpl projectTaskInventoryEOService; + /** + * 时间轴 + * @param projectLibraryBase + * @param req + * @return + */ @Override public List> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { @@ -46,4 +67,225 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } return result; } + + /** + * 项目状态进度 + * @param projectLibraryBase + * @param req + */ + @Override + public void scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); + + //项目库信息 + List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); + + if(projectLibraryBaseList.size() != 0){ + List LibraryBaseIdList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList()); + + //所有项目的法规清单 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectLawsInventoryEO::getProjectLibraryId,LibraryBaseIdList); + List projectLawsInventoryEOAll = projectLawsInventoryEOService.list(wrapper); + + //所有项目的任务清单 + List projectTaskInventoryEOList = new ArrayList<>(); + if(projectLawsInventoryEOAll.size() != 0){ + //法规清单id + List projectLawsInventoryEOIdAll = projectLawsInventoryEOAll.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll); + projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); + } + + List> result = new ArrayList<>(); + for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { + + //(1)每个项目下的法规清单 + List ProjectLawsInventoryEOS = projectLawsInventoryEOAll.stream().filter(e -> libraryBase.getId().equals(e.getProjectLibraryId())).collect(Collectors.toList()); + List ProjectLawsInventoryIdList = ProjectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); + //(2)每个项目下的任务清单 + List projectTaskInventoryEOS = new ArrayList<>(); + if(projectTaskInventoryEOList.size() != 0){ + projectTaskInventoryEOS = projectTaskInventoryEOList.stream().filter(e -> ProjectLawsInventoryIdList.contains(e.getProjectLawsInventoryId())).collect(Collectors.toList()); + } + Map map = new HashMap<>(); + map.put("projectName",libraryBase.getProjectName());//项目名称 + map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 + + //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据 + if(ProjectLawsInventoryIdList.size() != 0){ + //studio视角下获取项目状态评估数据 + List projectStatusAssessList = conditionAssessmentEOService.getProjectStatusAssessList(ProjectLawsInventoryIdList); + if(projectStatusAssessList.size() != 0){ + int blue = 0; + int red = 0; + int yellow = 0; + int green = 0; + for (ConditionAssessmentEO conditionAssessmentEO : projectStatusAssessList) { + //蓝/红/黄/绿 + String conditionAssessment = conditionAssessmentEO.getConditionAssessment(); + if(StringUtils.isNotBlank(conditionAssessment)){ + if(CurrentProjectStatusEnum.BLUE.getValue().equals(conditionAssessment)){ + blue++; + }else if(CurrentProjectStatusEnum.RED.getValue().equals(conditionAssessment)){ + red++; + }else if(CurrentProjectStatusEnum.YELLOW.getValue().equals(conditionAssessment)){ + yellow++; + }else if(CurrentProjectStatusEnum.GREEN.getValue().equals(conditionAssessment)){ + green++; + } + } + } + String projectState = blue+"/"+red+"/"+yellow+"/"+green; + map.put("projectState",projectState); + } + } + + //2. 认证进度(不涉及/待开始/进行中/实验失败/实验通过) + + + //3. 清单确认状态(未发起,待确认,接收,拒绝) + int inventoryNotStarted=0; + int inventoryListToConfirm=0; + int inventoryAccepted=0; + int inventoryRejected=0; + //4. 任务确认状态(未发起,待确认,接收,拒绝) + int taskNotStarted=0; + int taskListToConfirm=0; + int taskAccepted=0; + int taskRejected=0; + String inventory = ""; + String task = ""; + if(ProjectLawsInventoryEOS.size() != 0){ + for (ProjectLawsInventoryEO projectLawsInventoryEO : ProjectLawsInventoryEOS) { + String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();//清单确认状态 + String taskAffirmStatus = projectLawsInventoryEO.getTaskAffirmStatus();//任务确认状态 + if(StringUtils.isNotBlank(inventoryAffirmStatus)){ + if(InventoryAffirmStatusEnum.NOT_STARTED.getValue().equals(inventoryAffirmStatus)){ + inventoryNotStarted++; + }else if(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue().equals(inventoryAffirmStatus)){ + inventoryListToConfirm++; + }else if(InventoryAffirmStatusEnum.ACCEPTED.getValue().equals(inventoryAffirmStatus)){ + inventoryAccepted++; + }else if(InventoryAffirmStatusEnum.REJECTED.getValue().equals(inventoryAffirmStatus)){ + inventoryRejected++; + } + } + if(StringUtils.isNotBlank(taskAffirmStatus)){ + if(TaskAffirmStatusEnum.NOT_STARTED.getValue().equals(taskAffirmStatus)){ + taskNotStarted++; + }else if(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue().equals(taskAffirmStatus)){ + taskListToConfirm++; + }else if(TaskAffirmStatusEnum.ACCEPTED.getValue().equals(taskAffirmStatus)){ + taskAccepted++; + }else if(TaskAffirmStatusEnum.REJECTED.getValue().equals(taskAffirmStatus)){ + taskRejected++; + } + } + } + inventory = inventoryNotStarted+"/"+inventoryListToConfirm+"/"+inventoryAccepted+"/"+inventoryRejected+"/"; + task = taskNotStarted+"/"+taskListToConfirm+"/"+taskAccepted+"/"+taskRejected+"/"; + } + map.put("inventory",inventory);//清单确认状态 + map.put("task",task);//清单确认状态 + + //5. 设计符合性确认,PreHomo确认,验证符合性确认 + String design = ""; + String pre = ""; + String verify = ""; + if(projectTaskInventoryEOS.size() != 0){ + int designToBeConfirmed = 0;//设计待确认 + int designConformity = 0;//设计符合 + int designInconformity = 0;//设计不符合 + int designToTrack = 0;//设计待追踪 + int designUninvolved = 0;//设计不涉及 + int designTerminationOfTask = 0;//设计任务终止 + + int preToBeConfirmed = 0;//pre待确认 + int preConformity = 0;//pre符合 + int preInconformity = 0;//pre不符合 + int preToTrack = 0;//pre待追踪 + int preUninvolved = 0;//pre不涉及 + int preTerminationOfTask = 0;//pre任务终止 + + int verifyToBeConfirmed = 0;//验证待确认 + int verifyConformity = 0;//验证符合 + int verifyInconformity = 0;//验证不符合 + int verifyToTrack = 0;//验证待追踪 + int verifyUninvolved = 0;//验证不涉及 + int verifyTerminationOfTask = 0;//验证任务终止 + + for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOS) { + //设计符合性流程-任务状态 + String designFlowTaskStatus = projectTaskInventoryEO.getDesignFlowTaskStatus(); + //prehomo确认流程-任务状态 + String prehomoFlowTaskStatus = projectTaskInventoryEO.getPrehomoFlowTaskStatus(); + //verify_flow_task_status + String verifyFlowTaskStatus = projectTaskInventoryEO.getVerifyFlowTaskStatus(); + + //5. 设计符合性确认(待确认/符合/不符合/待追踪/不涉及/任务终止) + if(StringUtils.isNotBlank(designFlowTaskStatus)){ + if(ReviewResultEnum.TO_BE_CONFIRMED.getValue().equals(designFlowTaskStatus)){ + designToBeConfirmed++; + }else if(ReviewResultEnum.CONFORMITY.getValue().equals(designFlowTaskStatus)){ + designConformity++; + }else if(ReviewResultEnum.INCONFORMITY.getValue().equals(designFlowTaskStatus)){ + designInconformity++; + }else if(ReviewResultEnum.TO_TRACK.getValue().equals(designFlowTaskStatus)){ + designToTrack++; + }else if(ReviewResultEnum.UNINVOLVED.getValue().equals(designFlowTaskStatus)){ + designUninvolved++; + }else if(ReviewResultEnum.TERMINATION_OF_TASK.getValue().equals(designFlowTaskStatus)){ + designTerminationOfTask++; + } + } + //6. PreHomo确认(待确认/符合/不符合/待追踪/不涉及/任务终止) + if(StringUtils.isNotBlank(prehomoFlowTaskStatus)){ + if(ReviewResultEnum.TO_BE_CONFIRMED.getValue().equals(prehomoFlowTaskStatus)){ + preToBeConfirmed++; + }else if(ReviewResultEnum.CONFORMITY.getValue().equals(prehomoFlowTaskStatus)){ + preConformity++; + }else if(ReviewResultEnum.INCONFORMITY.getValue().equals(prehomoFlowTaskStatus)){ + preInconformity++; + }else if(ReviewResultEnum.TO_TRACK.getValue().equals(prehomoFlowTaskStatus)){ + preToTrack++; + }else if(ReviewResultEnum.UNINVOLVED.getValue().equals(prehomoFlowTaskStatus)){ + preUninvolved++; + }else if(ReviewResultEnum.TERMINATION_OF_TASK.getValue().equals(prehomoFlowTaskStatus)){ + preTerminationOfTask++; + } + } + //7. 验证符合性确认(待完成/符合/不符合/未验证/不涉及) + if(StringUtils.isNotBlank(verifyFlowTaskStatus)){ + if(ReviewResultEnum.TO_BE_CONFIRMED.getValue().equals(verifyFlowTaskStatus)){ + verifyToBeConfirmed++; + }else if(ReviewResultEnum.CONFORMITY.getValue().equals(verifyFlowTaskStatus)){ + verifyConformity++; + }else if(ReviewResultEnum.INCONFORMITY.getValue().equals(verifyFlowTaskStatus)){ + verifyInconformity++; + }else if(ReviewResultEnum.TO_TRACK.getValue().equals(verifyFlowTaskStatus)){ + verifyToTrack++; + }else if(ReviewResultEnum.UNINVOLVED.getValue().equals(verifyFlowTaskStatus)){ + verifyUninvolved++; + }else if(ReviewResultEnum.TERMINATION_OF_TASK.getValue().equals(verifyFlowTaskStatus)){ + verifyTerminationOfTask++; + } + } + } + + design = designToBeConfirmed+"/"+designConformity+"/"+designInconformity+"/"+designToTrack+"/"+designUninvolved+"/"+designTerminationOfTask; + pre = preToBeConfirmed+"/"+preConformity+"/"+preInconformity+"/"+preToTrack+"/"+preUninvolved+"/"+preTerminationOfTask; + verify = verifyToBeConfirmed+"/"+verifyConformity+"/"+verifyInconformity+"/"+verifyToTrack+"/"+verifyUninvolved+"/"+verifyTerminationOfTask; + } + map.put("design",design);//设计符合性确认 + map.put("design",pre);//PreHomo确认 + map.put("design",verify);//验证符合性确认 + result.add(map); + } + } + } + + + } From 69674d6723d7b7f4628f739e4bf644dec7999160 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 May 2022 16:05:40 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectStatusBoardServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 824d5645f..f1e636c3a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -138,7 +138,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } String projectState = blue+"/"+red+"/"+yellow+"/"+green; - map.put("projectState",projectState); + map.put("projectState",projectState);//项目当前状态 } } @@ -188,7 +188,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService task = taskNotStarted+"/"+taskListToConfirm+"/"+taskAccepted+"/"+taskRejected+"/"; } map.put("inventory",inventory);//清单确认状态 - map.put("task",task);//清单确认状态 + map.put("task",task);//任务确认状态 //5. 设计符合性确认,PreHomo确认,验证符合性确认 String design = ""; @@ -279,13 +279,12 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService verify = verifyToBeConfirmed+"/"+verifyConformity+"/"+verifyInconformity+"/"+verifyToTrack+"/"+verifyUninvolved+"/"+verifyTerminationOfTask; } map.put("design",design);//设计符合性确认 - map.put("design",pre);//PreHomo确认 - map.put("design",verify);//验证符合性确认 + map.put("pre",pre);//PreHomo确认 + map.put("verify",verify);//验证符合性确认 result.add(map); } } } - } From dadb953d5f131f6570b682261bfa14565abe2fb8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 May 2022 16:11:18 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectStatusBoardController.java | 8 +++----- .../project/service/IProjectStatusBoardService.java | 3 ++- .../service/impl/ProjectStatusBoardServiceImpl.java | 7 ++++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java index 8a823179b..05ad207cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * @description @@ -57,11 +58,8 @@ public class ProjectStatusBoardController { @ApiOperation(value="项目状态进度", notes="项目状态进度") @GetMapping(value = "/scheduleInfoList") public Result scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { - iProjectStatusBoardService.scheduleInfoList(projectLibraryBase, req); - if("result"==null) { - return Result.error("未找到对应数据"); - } - return Result.OK("result"); + List> mapList = iProjectStatusBoardService.scheduleInfoList(projectLibraryBase, req); + return Result.OK(mapList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java index 0cd115688..3f0725187 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java @@ -5,6 +5,7 @@ import com.jero.modules.project.vo.TimeNodeVO; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * @description @@ -26,5 +27,5 @@ public interface IProjectStatusBoardService { * @param projectLibraryBase * @param req */ - void scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req); + List> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index f1e636c3a..d09a58124 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -74,12 +74,12 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService * @param req */ @Override - public void scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { + public List> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); - //项目库信息 List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); + List> result = new ArrayList<>(); if(projectLibraryBaseList.size() != 0){ List LibraryBaseIdList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList()); @@ -98,7 +98,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); } - List> result = new ArrayList<>(); + for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { //(1)每个项目下的法规清单 @@ -284,6 +284,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService result.add(map); } } + return result; } From 305ca79397be4d7f0f0549b6aedbefe2937db867 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 16 May 2022 16:31:05 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[add]=20=E6=9D=83=E9=99=90=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?= 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 + .../src/components/tableCollection/index.vue | 6 +- .../ParameterItemCollectionList.vue | 154 +++++++++++++----- 4 files changed, 117 insertions(+), 45 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68c0346af..2ba995ce3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -707,6 +707,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + operatethisbutton: 'You do not have permission to operate this button', ParameterLibrary: 'Parameter Library', referenceparameter: 'reference Parameter', Assignedby: 'Assignedby', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 495bd82b0..44034ddff 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -716,6 +716,7 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + operatethisbutton: '没有权限操作此按钮', ParameterLibrary: '参数库', referenceparameter: '引用参数', Assignedby: '分配填写人', diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 38ee9ab3a..8843e70f5 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -73,6 +73,7 @@ export default { indeterminate: false, columns: [], selectedRowKeys: [], + selectedRowrowValue: [], dataSource: [], pageNo: 1, pageSize: 10, @@ -81,6 +82,7 @@ export default { loading: false, orderBy: '1', orderByField: '', + LoginUserType: '', // 登陆人角色状态 homo: 0, // 认证工程师 sdt: 0, // 工程接口人 dre: 0, // 填写人 @@ -98,6 +100,8 @@ export default { } getAction(this.url.getLoginUserType, params).then((res) => { if (res.success) { + this.LoginUserType = res.result + this.$emit('LoginUserType', this.LoginUserType) res.result.split(',').forEach((item,index) => { if(item === 'homo') { this.homo = 1 @@ -190,8 +194,8 @@ export default { // this.getTableList() }, onSelectChange(value,rowValue) { - console.log(value,rowValue) this.selectedRowKeys = value + this.selectedRowrowValue = rowValue this.$emit('value',value) this.$emit('rowValue', rowValue) }, diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 63a8b687a..cbf1f4267 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -64,12 +64,12 @@ @@ -15,7 +28,37 @@ export default { name: 'certificationProgress', data() { - return {} + return { + loading:false, + dataSource:[], + columns: [ + { + title: this.$t('notInvolved'), + align: 'center', + dataIndex: 'nonConformity', + }, + { + title: this.$t('toBeStarted'), + align: 'center', + dataIndex: 'Tracked', + }, + { + title: this.$t('inProgress'), + align: 'center', + dataIndex: 'accord', + }, + { + title: this.$t('experimentFailed'), + align: 'center', + dataIndex: 'notEvaluated', + }, + { + title: this.$t('experimentPassed'), + align: 'center', + dataIndex: 'notEvaluatedOne', + } + ] + } }, mounted() { this.mainLeftEcharts() @@ -59,11 +102,14 @@ }, mainLeftEcharts() { let data = [ - { value: 1048, name: '待审查' }, - { value: 735, name: '审查中' }, - { value: 580, name: '审查完成' } + { value: 1048, name: this.$t('notInvolved') }, + { value: 735, name: this.$t('toBeStarted') }, + { value: 580, name: this.$t('inProgress') }, + { value: 580, name: this.$t('experimentFailed') }, + { value: 580, name: this.$t('experimentPassed') } ] - this.getEcharts('main-left', '内部审查进度', ['#00BEBE', '#FDB033', '#2F8DF3'], data) + let color = ['#9DB9D4', '#FDB033', '#37CED1', '#FF8543', '#2F8DF3', ] + this.getEcharts('main-left', this.$t('CertificationProgress'), color, data) } } } diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue index e175f9d73..2626209ce 100644 --- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue +++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue @@ -1,5 +1,11 @@