添加电能质量全过程月报
功能及其批处理任务
This commit is contained in:
@@ -118,6 +118,150 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
item.setChildren(getChildren(item, data));
|
||||
}).collect(Collectors.toList());
|
||||
collect.forEach(province->{
|
||||
|
||||
PmsTemProcessReport report = new PmsTemProcessReport();
|
||||
report.setProvinceOrg(province.getCode());
|
||||
report.setProvinceOrgName(province.getName());
|
||||
report.setCityOrg("/");
|
||||
report.setCityOrgName("/");
|
||||
report.setStatisticalLevel("3");
|
||||
report.setStatisticalType("02");
|
||||
report.setStatisticalDate(statisticalDate);
|
||||
|
||||
|
||||
report.setUploadStatus(DataStateEnum.DELETED.getCode());
|
||||
|
||||
|
||||
|
||||
Integer monthCount = iPmsTemUserService.lambdaQuery()
|
||||
.eq(PmsTemUserPO::getProvinceOrg, province.getCode())
|
||||
.between(PmsTemUserPO::getReleaseTime, beginTime, endTime).count();
|
||||
List<PmsTemUserPO> list = iPmsTemUserService.lambdaQuery()
|
||||
.eq(PmsTemUserPO::getProvinceOrg, province.getCode())
|
||||
.list();
|
||||
report.setNewUserNum(monthCount);
|
||||
report.setNewUserCount(list.size());
|
||||
|
||||
List<String> userIds = list.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(userIds)){
|
||||
|
||||
report.setReportAuditNum(0);
|
||||
report.setReportAuditCount(0);
|
||||
report.setApprovalAuditNum(0);
|
||||
report.setApprovalAuditCount(0);
|
||||
report.setApprovalProblemNum(0);
|
||||
report.setApprovalProblemCount(0);
|
||||
report.setApprovalRectificationProblemNum(0);
|
||||
report.setApprovalRectificationProblemCount(0);
|
||||
report.setTestRunUserCount(0);
|
||||
report.setTestRunOvUserNum(0);
|
||||
report.setTestRunOvUserRate(BigDecimal.valueOf(0.00));
|
||||
report.setRunUserCount(0);
|
||||
report.setRunOvUserNum(0);
|
||||
report.setRunOvUserRate(BigDecimal.valueOf(0.00));
|
||||
|
||||
|
||||
}else {
|
||||
//规划可研阶段
|
||||
Integer auditCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.count();
|
||||
|
||||
Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.isNotNull(PmsTemProcessTrackPO::getAuditFinalTime)
|
||||
.count();
|
||||
report.setReportAuditNum(auditCount);
|
||||
report.setReportAuditCount(allAuditCount);
|
||||
|
||||
//规划验收
|
||||
Integer approvalAuditNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessTrackPO::getApprovalTime, beginTime, endTime)
|
||||
.count();
|
||||
Integer approvalAuditCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.isNotNull(PmsTemProcessTrackPO::getApprovalTime)
|
||||
.count();
|
||||
report.setApprovalAuditNum(approvalAuditNum);
|
||||
report.setApprovalAuditCount(approvalAuditCount);
|
||||
|
||||
Integer approvalProblemNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessTrackPO::getApprovalResult,"01")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessTrackPO::getApprovalTime, beginTime, endTime)
|
||||
.count();
|
||||
Integer approvalProblemCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessTrackPO::getApprovalResult,"01")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.isNotNull(PmsTemProcessTrackPO::getApprovalTime)
|
||||
.count();
|
||||
report.setApprovalProblemNum(approvalProblemNum);
|
||||
report.setApprovalProblemCount(approvalProblemCount);
|
||||
|
||||
Integer approvalRectificationProblemNum = pmsTemProcessApprovalService.lambdaQuery()
|
||||
.in(PmsTemProcessApproval::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessApproval::getRectificationStatus, "02")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessApproval::getRectificationTime, beginTime, endTime)
|
||||
.count();
|
||||
|
||||
Integer approvalRectificationProblemCount = pmsTemProcessApprovalService.lambdaQuery()
|
||||
.in(PmsTemProcessApproval::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessApproval::getRectificationStatus, "02")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessApproval::getRectificationTime, beginTime, endTime)
|
||||
.count();
|
||||
|
||||
report.setApprovalRectificationProblemNum(approvalRectificationProblemNum);
|
||||
report.setApprovalRectificationProblemCount(approvalRectificationProblemCount);
|
||||
|
||||
//试运行
|
||||
Integer testRunUserCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"03")
|
||||
.between(PmsTemProcessTrackPO::getMonitorDate, beginTime, endTime)
|
||||
.count();
|
||||
Integer testRunOvUserNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"03")
|
||||
.eq(PmsTemProcessTrackPO::getTestIsOv,"01")
|
||||
.between(PmsTemProcessTrackPO::getMonitorDate, beginTime, endTime)
|
||||
.count();
|
||||
report.setTestRunUserCount(testRunUserCount);
|
||||
report.setTestRunOvUserNum(testRunOvUserNum);
|
||||
report.setTestRunOvUserRate(BigDecimal.valueOf(Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2));
|
||||
|
||||
Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"04")
|
||||
.between(PmsTemProcessTrackPO::getOperateDate, beginTime, endTime)
|
||||
.count();
|
||||
Integer runOvUserNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"04")
|
||||
.isNotNull(PmsTemProcessTrackPO::getOvIndexs)
|
||||
.between(PmsTemProcessTrackPO::getOperateDate, beginTime, endTime)
|
||||
.count();
|
||||
|
||||
|
||||
report.setRunUserCount(runUserCount);
|
||||
report.setRunOvUserNum(runOvUserNum);
|
||||
report.setRunOvUserRate(BigDecimal.valueOf(Double.valueOf(runOvUserNum*100)/runUserCount).setScale(2));
|
||||
|
||||
|
||||
}
|
||||
pmsTemProcessReportList.add(report);
|
||||
province.getChildren().forEach(city->{
|
||||
PmsTemProcessReport pmsTemProcessReport = new PmsTemProcessReport();
|
||||
pmsTemProcessReport.setProvinceOrg(province.getCode());
|
||||
@@ -133,18 +277,18 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
|
||||
|
||||
|
||||
Integer monthCount = iPmsTemUserService.lambdaQuery()
|
||||
Integer monthCount1 = iPmsTemUserService.lambdaQuery()
|
||||
.eq(PmsTemUserPO::getProvinceOrg, province.getCode())
|
||||
.eq(PmsTemUserPO::getCityOrg, city.getCode())
|
||||
.between(PmsTemUserPO::getReleaseTime, beginTime, endTime).count();
|
||||
List<PmsTemUserPO> list = iPmsTemUserService.lambdaQuery()
|
||||
List<PmsTemUserPO> list1 = iPmsTemUserService.lambdaQuery()
|
||||
.eq(PmsTemUserPO::getProvinceOrg, province.getCode())
|
||||
.eq(PmsTemUserPO::getCityOrg, city.getCode()).list();
|
||||
pmsTemProcessReport.setNewUserNum(monthCount);
|
||||
pmsTemProcessReport.setNewUserCount(list.size());
|
||||
pmsTemProcessReport.setNewUserCount(list1.size());
|
||||
|
||||
List<String> userIds = list.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(userIds)){
|
||||
List<String> userIds1 = list1.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(userIds1)){
|
||||
|
||||
pmsTemProcessReport.setReportAuditNum(0);
|
||||
pmsTemProcessReport.setReportAuditCount(0);
|
||||
@@ -165,13 +309,13 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
}else {
|
||||
//规划可研阶段
|
||||
Integer auditCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.count();
|
||||
|
||||
Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.isNotNull(PmsTemProcessTrackPO::getAuditFinalTime)
|
||||
@@ -181,12 +325,12 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
|
||||
//规划验收
|
||||
Integer approvalAuditNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessTrackPO::getApprovalTime, beginTime, endTime)
|
||||
.count();
|
||||
Integer approvalAuditCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
.isNotNull(PmsTemProcessTrackPO::getApprovalTime)
|
||||
@@ -195,13 +339,13 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
pmsTemProcessReport.setApprovalAuditCount(approvalAuditCount);
|
||||
|
||||
Integer approvalProblemNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessTrackPO::getApprovalResult,"01")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessTrackPO::getApprovalTime, beginTime, endTime)
|
||||
.count();
|
||||
Integer approvalProblemCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessTrackPO::getApprovalResult,"01")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
|
||||
@@ -211,14 +355,14 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
pmsTemProcessReport.setApprovalProblemCount(approvalProblemCount);
|
||||
|
||||
Integer approvalRectificationProblemNum = pmsTemProcessApprovalService.lambdaQuery()
|
||||
.in(PmsTemProcessApproval::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessApproval::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessApproval::getRectificationStatus, "02")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
.between(PmsTemProcessApproval::getRectificationTime, beginTime, endTime)
|
||||
.count();
|
||||
|
||||
Integer approvalRectificationProblemCount = pmsTemProcessApprovalService.lambdaQuery()
|
||||
.in(PmsTemProcessApproval::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessApproval::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessApproval::getRectificationStatus, "02")
|
||||
// .eq(PmsTemProcessTrackPO::getProStage,"01")
|
||||
// .between(PmsTemProcessApproval::getRectificationTime, beginTime, endTime)
|
||||
@@ -229,12 +373,12 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
|
||||
//试运行
|
||||
Integer testRunUserCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"03")
|
||||
.between(PmsTemProcessTrackPO::getMonitorDate, beginTime, endTime)
|
||||
.count();
|
||||
Integer testRunOvUserNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"03")
|
||||
.eq(PmsTemProcessTrackPO::getTestIsOv,"01")
|
||||
.between(PmsTemProcessTrackPO::getMonitorDate, beginTime, endTime)
|
||||
@@ -244,12 +388,12 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
pmsTemProcessReport.setTestRunOvUserRate(BigDecimal.valueOf(Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2));
|
||||
|
||||
Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"04")
|
||||
.between(PmsTemProcessTrackPO::getOperateDate, beginTime, endTime)
|
||||
.count();
|
||||
Integer runOvUserNum = iPmsTemProcessTrackService.lambdaQuery()
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
|
||||
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
|
||||
.eq(PmsTemProcessTrackPO::getProStage,"04")
|
||||
.isNotNull(PmsTemProcessTrackPO::getOvIndexs)
|
||||
.between(PmsTemProcessTrackPO::getOperateDate, beginTime, endTime)
|
||||
|
||||
Reference in New Issue
Block a user