From 7a877045c9b5fad621bd2f6c6096c3d724e32300 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 31 Oct 2024 10:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E8=83=BD=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E5=85=A8=E8=BF=87=E7=A8=8B=E6=9C=88=E6=8A=A5=20?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E5=85=B6=E6=89=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PmsTemProcessReportServiceImpl.java | 178 ++++++++++++++++-- 1 file changed, 161 insertions(+), 17 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java index 42e2a3109..631fe8a8d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java @@ -118,6 +118,150 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl{ + + 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 list = iPmsTemUserService.lambdaQuery() + .eq(PmsTemUserPO::getProvinceOrg, province.getCode()) + .list(); + report.setNewUserNum(monthCount); + report.setNewUserCount(list.size()); + + List 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 list = iPmsTemUserService.lambdaQuery() + List 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 userIds = list.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(userIds)){ + List 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