From b8cc3e5b82671afd672a258372d900c18c1a2950 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 24 Oct 2022 10:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=BB=9F=E8=AE=A1=20?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81,=20?=
=?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E7=8A=B6=E6=80=81--=E6=B8=85?=
=?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E8=BF=9B=E5=BA=A6,=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E7=A1=AE=E8=AE=A4=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xml/ProjectLawsInventoryEOMapper.xml | 10 +-
.../impl/ProjectLibraryBaseServiceImpl.java | 113 +++++++++++++++++-
2 files changed, 120 insertions(+), 3 deletions(-)
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 1a3038c6b..333452acb 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
@@ -55,7 +55,10 @@
from
project_laws_inventory
where
- project_library_id = #{projectLibraryId}
+ project_library_id in
+
+ #{item}
+
group by inventory_affirm_status
@@ -67,7 +70,10 @@
from
project_laws_inventory
where
- project_library_id = #{projectLibraryId}
+ project_library_id in
+
+ #{item}
+
group by task_affirm_status
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 c6624ebb8..9d42fd017 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
@@ -699,7 +699,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>();
- lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
+ lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
@@ -780,6 +780,117 @@ 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<>();
+//
+// //清单确认统计
+// 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);
+//
+// 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> 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(map.get("certificationProgress") != null){
+// 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;
+// }
/**
* 项目详情-统计接口-根据领域分组