WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车型项目库统计-关联平台件

Browse Source
This commit is contained in:
zhn
2023-12-05 18:14:02 +08:00
parent 66243f5a54
commit 817f0e5730
5 changed files with 27 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+2 -4
View File
@@ -261,16 +261,14 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
* @param pciEoList * @param pciEoList
* @return * @return
*/ */
List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList, List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList);
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
/** /**
* 获取Pre-Homo统计信息 * 获取Pre-Homo统计信息
* @param pciEoList * @param pciEoList
* @return * @return
*/ */
List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList);
,List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
/** /**
* 获取认证进度统计信息 全部 * 获取认证进度统计信息 全部
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+4 -8
View File
@@ -271,32 +271,28 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
* @param projectLawsInventoryEOList * @param projectLawsInventoryEOList
* @return * @return
*/ */
List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
/** /**
* 验证任务确认 * 验证任务确认
* @param projectLawsInventoryEOList * @param projectLawsInventoryEOList
* @return * @return
*/ */
List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
/** /**
* 获取设计符合性统计信息 * 获取设计符合性统计信息
* @param projectLawsInventoryEOList * @param projectLawsInventoryEOList
* @return * @return
*/ */
List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
/** /**
* 获取验证符合性统计信息 * 获取验证符合性统计信息
* @param projectLawsInventoryEOList * @param projectLawsInventoryEOList
* @return * @return
*/ */
List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
List<Map<String,Object>> queryNotComplianList(Map<String, Object> params); List<Map<String,Object>> queryNotComplianList(Map<String, Object> params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+2 -80
View File
@@ -3296,8 +3296,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
} }
@Override @Override
public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList, public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();
int listToBeReleasedCount = 0;//清单待发布 int listToBeReleasedCount = 0;//清单待发布
@@ -3347,40 +3346,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
return flag; return flag;
}).count(); }).count();
} }
//平台件数据统计-------------------------------------------------------------------------------
if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
// 任务待发起
taskToBeInitiatedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
);
return flag;
}).count();
// 任务待确认
taskToBeConfirmedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
);
return flag;
}).count();
// 责任人接受
acceptedCount += (int) projectCertificationInventoryEOList.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())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
);
return flag;
}).count();
// 责任人拒绝
rejectedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
);
return flag;
}).count();
}
Map<String,Object> listToBeReleasedMap = new HashMap<>(); Map<String,Object> listToBeReleasedMap = new HashMap<>();
Map<String,Object> taskToBeInitiatedMap = new HashMap<>(); Map<String,Object> taskToBeInitiatedMap = new HashMap<>();
@@ -3412,8 +3377,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
} }
@Override @Override
public List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList, public List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList) {
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();
int taskToBeConfirmedCount = 0;//任务待确认 int taskToBeConfirmedCount = 0;//任务待确认
@@ -3464,48 +3428,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
return flag; return flag;
}).count(); }).count();
} }
//平台件数据统计------------------------------------------------------------------------------
if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
// 任务待确认
taskToBeConfirmedCount += (int) projectCertificationInventoryEOList.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())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
);
return flag;
}).count();
// 结果待提交
resultsToBeSubmittedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
);
return flag;
}).count();
// 结果待审查
resultsToBeReviewedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
);
return flag;
}).count();
// 审查通过
reviewAndPassCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue())
);
return flag;
}).count();
// 审查退回
reviewAndReturnCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
);
return flag;
}).count();
}
Map<String,Object> taskToBeConfirmedMap = new HashMap<>(); Map<String,Object> taskToBeConfirmedMap = new HashMap<>();
Map<String,Object> resultsToBeSubmittedMap = new HashMap<>(); Map<String,Object> resultsToBeSubmittedMap = new HashMap<>();
Map<String,Object> resultsToBeReviewedMap = new HashMap<>(); Map<String,Object> resultsToBeReviewedMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+9 -197
View File
@@ -10299,8 +10299,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, public List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();
int listToBeReleasedCount = 0;//清单待发布 int listToBeReleasedCount = 0;//清单待发布
@@ -10308,11 +10307,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
int taskToBeConfirmedCount = 0;//任务待确认 int taskToBeConfirmedCount = 0;//任务待确认
int acceptedCount = 0;//责任人接收 int acceptedCount = 0;//责任人接收
int rejectedCount = 0;//责任人拒绝 int rejectedCount = 0;//责任人拒绝
//如果法规清单关联的平台件，则此时统计的（原法规清单的数据以及平台件的数据）
//车型项目库法规统计数据统计-----------------------------------------------
if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
// 清单待发布 // 清单待发布
listToBeReleasedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = ( boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.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.REGULATORY_ENGINEER_RETURNS.getValue())
@@ -10321,7 +10318,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}).count(); }).count();
// 任务待发起 // 任务待发起
taskToBeInitiatedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = ( boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
); );
@@ -10329,7 +10326,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}).count(); }).count();
// 任务待确认 // 任务待确认
taskToBeConfirmedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = ( boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
); );
@@ -10337,7 +10334,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}).count(); }).count();
// 责任人接收 // 责任人接收
acceptedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = ( boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) 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.RESULTS_TO_BE_REVIEWED.getValue())
@@ -10349,45 +10346,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}).count(); }).count();
// 责任人拒绝 // 责任人拒绝
rejectedCount += (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();
}
//平台件数据统计-----------------------------------------------
if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
// 任务待发起
taskToBeInitiatedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
);
return flag;
}).count();
// 任务待确认
taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
);
return flag;
}).count();
// 责任人接收
acceptedCount += (int) projectLawsInventoryPlatFormList.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) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = ( boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
); );
@@ -10430,8 +10389,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, public List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();
int listToBeReleasedCount = 0;//清单待发布 int listToBeReleasedCount = 0;//清单待发布
@@ -10486,44 +10444,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
return flag; return flag;
}).count(); }).count();
} }
//平台件数据统计-----------------------------------------------
if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
// 任务待发起
taskToBeInitiatedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
);
return flag;
}).count();
// 任务待确认
taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
);
return flag;
}).count();
// 责任人接收
acceptedCount += (int) projectLawsInventoryPlatFormList.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();
// 责任人拒绝
rejectedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
);
return flag;
}).count();
}
Map<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布 Map<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布
Map<String,Object> taskToBeInitiatedMap = new HashMap<>();//任务待发起 Map<String,Object> taskToBeInitiatedMap = new HashMap<>();//任务待发起
@@ -10555,8 +10475,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
@Override @Override
public List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, public List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();
int taskToBeConfirmedCount = 0;//任务待确认 int taskToBeConfirmedCount = 0;//任务待确认
int resultsToBeSubmittedCount = 0;//结果待提交 int resultsToBeSubmittedCount = 0;//结果待提交
@@ -10617,59 +10536,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
return flag; return flag;
}).count(); }).count();
} }
//平台件数据统计------------------------------------------------------------------------
if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
// 任务待确认
taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.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) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
);
return flag;
}).count();
// 结果待审查
resultsToBeReviewedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
);
return flag;
}).count();
// 符合
complianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
);
return flag;
}).count();
// 不符合
nonComplianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
);
return flag;
}).count();
// 待追踪
toBeTrackedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
);
return flag;
}).count();
}
Map<String,Object> taskToBeConfirmedMap = new HashMap<>(); Map<String,Object> taskToBeConfirmedMap = new HashMap<>();
Map<String,Object> resultsToBeSubmittedMap = new HashMap<>(); Map<String,Object> resultsToBeSubmittedMap = new HashMap<>();
@@ -10706,8 +10572,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
@Override @Override
public List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList, public List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
List<Map<String,Object>> result = new ArrayList<>(); List<Map<String,Object>> result = new ArrayList<>();
int taskToBeConfirmedCount = 0;//任务待确认 int taskToBeConfirmedCount = 0;//任务待确认
int resultsToBeSubmittedCount = 0;//结果待提交 int resultsToBeSubmittedCount = 0;//结果待提交
@@ -10768,59 +10633,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
return flag; return flag;
}).count(); }).count();
} }
//平台件数据统计-----------------------------------------------------------------------------------------
if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
// 任务待确认
taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.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())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
);
return flag;
}).count();
// 结果待提交
resultsToBeSubmittedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
);
return flag;
}).count();
// 结果待审查
resultsToBeReviewedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
);
return flag;
}).count();
// 符合
complianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
);
return flag;
}).count();
// 不符合
nonComplianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
);
return flag;
}).count();
// 待追踪
toBeTrackedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
);
return flag;
}).count();
}
Map<String,Object> taskToBeConfirmedMap = new HashMap<>(); Map<String,Object> taskToBeConfirmedMap = new HashMap<>();
Map<String,Object> resultsToBeSubmittedMap = new HashMap<>(); Map<String,Object> resultsToBeSubmittedMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+10 -64
View File
@@ -2202,39 +2202,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//法规符合性管理统计（统计的是法规清单）------------------------------------------------------------------------------------------------------------------------------ //法规符合性管理统计（统计的是法规清单）------------------------------------------------------------------------------------------------------------------------------
if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream() //法规清单绑定平台件，需要特殊处理
.distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); projectLawsInventoryEOList = getProjectLawsInventoryEOS(projectLawsInventoryEOList);
//法规清单关联的所有平台件
LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryIdList);
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
//区分哪些法规清单关联了平台件，哪些法规清单没有关联平台件
List<ProjectLawsInventoryEO> yesList = new ArrayList<>();
List<ProjectLawsInventoryEO> noList = new ArrayList<>();
List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOList)){
//所关联平台件的法规清单id
List<String> idList = lawsInventoryPlatformEOList.stream()
.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
LambdaQueryWrapper<ProjectLawsInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ProjectLawsInventoryEO::getId,idList);
projectLawsInventoryPlatFormList = projectLawsInventoryEOMapper.selectList(queryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
.filter(e -> e.getLawsInventoryId().equals(projectLawsInventoryEO.getId())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect)){
yesList.add(projectLawsInventoryEO);
}else{
noList.add(projectLawsInventoryEO);
}
}
}
if(ObjectUtils.isEmpty(noList)){
noList = projectLawsInventoryEOList;
}
//设计任务确认 //设计任务确认
List<Map<String,Object>> designTaskToConfirmMapList = List<Map<String,Object>> designTaskToConfirmMapList =
this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList); this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList);
int designTaskAffirmStatusCount = 0; int designTaskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){ if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){
@@ -2249,7 +2221,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//验证任务确认 //验证任务确认
List<Map<String,Object>> verifyTaskToConfirmMapList List<Map<String,Object>> verifyTaskToConfirmMapList
= this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList); = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList);
int verifyTaskAffirmStatusCount = 0; int verifyTaskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){ if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){
//taskAffirmStatusCount //taskAffirmStatusCount
@@ -2263,7 +2235,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//设计符合性 //设计符合性
List<Map<String,Object>> designComplianceMapList List<Map<String,Object>> designComplianceMapList
= this.projectLawsInventoryEOService.getDesignComplianceStatistice(noList,projectLawsInventoryPlatFormList); = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
int designFlowTaskStatusCount = 0; int designFlowTaskStatusCount = 0;
if(CollectionUtils.isNotEmpty(designComplianceMapList)){ if(CollectionUtils.isNotEmpty(designComplianceMapList)){
for (Map<String, Object> designCompliance : designComplianceMapList) { for (Map<String, Object> designCompliance : designComplianceMapList) {
@@ -2276,7 +2248,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//验证符合性 //验证符合性
List<Map<String,Object>> verifyComplianceMapList List<Map<String,Object>> verifyComplianceMapList
= this.projectLawsInventoryEOService.getVerifyComplianceStatistice(noList,projectLawsInventoryPlatFormList); = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
int verifyFlowTaskStatusCount = 0; int verifyFlowTaskStatusCount = 0;
if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){ if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){
for (Map<String, Object> verifyCompliance : verifyComplianceMapList) { for (Map<String, Object> verifyCompliance : verifyComplianceMapList) {
@@ -2300,37 +2272,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//认证活动管理统计（统计的是认证清单）------------------------------------------------------------------------------------------------------------------------------ //认证活动管理统计（统计的是认证清单）------------------------------------------------------------------------------------------------------------------------------
if(CollectionUtils.isNotEmpty(pciEoList)){ if(CollectionUtils.isNotEmpty(pciEoList)){
List<String> projectCertificationInventoryIdList = pciEoList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList()); //认证清单绑定平台件，需要特殊处理
//认证清单关联的平台件 pciEoList = getProjectCertificationInventoryEOS(pciEoList);
LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectCertificationInventoryIdList);
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
List<ProjectCertificationInventoryEO> yesList = new ArrayList<>();
List<ProjectCertificationInventoryEO> noList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOList)){
List<String> idList = lawsInventoryPlatformEOList.stream()
.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
LambdaQueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ProjectCertificationInventoryEO::getId,idList);
projectCertificationInventoryEOList = projectCertificationInventoryEOService.list(queryWrapper);
for (ProjectCertificationInventoryEO certificationInventoryEO : pciEoList) {
List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
.filter(e -> e.getLawsInventoryId().equals(certificationInventoryEO.getId()))
.collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect)){
yesList.add(certificationInventoryEO);
}else{
noList.add(certificationInventoryEO);
}
}
}
if(ObjectUtils.isEmpty(noList)){
noList = pciEoList;
}
// 认证清单-任务确认统计 // 认证清单-任务确认统计
List<Map<String,Object>> rzTaskToConfirmMapList = List<Map<String,Object>> rzTaskToConfirmMapList =
this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(noList,projectCertificationInventoryEOList); this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
int taskAffirmStatusCount = 0; int taskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){ if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){
for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) { for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) {
@@ -2343,7 +2289,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
// Pre-Homo 统计 // Pre-Homo 统计
List<Map<String,Object>> prehomoMapList = List<Map<String,Object>> prehomoMapList =
this.projectCertificationInventoryEOService.getPrehomoStatistice(noList,projectCertificationInventoryEOList); this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
int preHomoCount = 0; int preHomoCount = 0;
if (CollectionUtils.isNotEmpty(prehomoMapList)) { if (CollectionUtils.isNotEmpty(prehomoMapList)) {
for (Map<String, Object> prehomo : prehomoMapList) { for (Map<String, Object> prehomo : prehomoMapList) {