Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

添加电能质量全过程月报

Browse Source 
功能及其删除批处理任务
This commit is contained in:
hzj
2024-10-31 15:02:48 +08:00
parent cd4016eb1c
commit 7bc9cb9792
2 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java
View File

@@ -164,14 +164,14 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
Integer auditCount = iPmsTemProcessTrackService.lambdaQuery() Integer auditCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds) .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
// .eq(PmsTemProcessTrackPO::getProStage,"01") // .eq(PmsTemProcessTrackPO::getProStage,"01")
.between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime) .between(PmsTemProcessTrackPO::getAuditTime, beginTime, endTime)
.count(); .count();
Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery() Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds) .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
// .eq(PmsTemProcessTrackPO::getProStage,"01") // .eq(PmsTemProcessTrackPO::getProStage,"01")
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime) // .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
.isNotNull(PmsTemProcessTrackPO::getAuditFinalTime) .isNotNull(PmsTemProcessTrackPO::getAuditTime)
.count(); .count();
report.setReportAuditNum(auditCount); report.setReportAuditNum(auditCount);
report.setReportAuditCount(allAuditCount); report.setReportAuditCount(allAuditCount);
@@ -238,7 +238,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
.count(); .count();
report.setTestRunUserCount(testRunUserCount); report.setTestRunUserCount(testRunUserCount);
report.setTestRunOvUserNum(testRunOvUserNum); report.setTestRunOvUserNum(testRunOvUserNum);
report.setTestRunOvUserRate(BigDecimal.valueOf(Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2)); report.setTestRunOvUserRate(BigDecimal.valueOf(testRunOvUserNum==0?0.00:Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2));
Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery() Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds) .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
@@ -255,7 +255,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
report.setRunUserCount(runUserCount); report.setRunUserCount(runUserCount);
report.setRunOvUserNum(runOvUserNum); report.setRunOvUserNum(runOvUserNum);
report.setRunOvUserRate(BigDecimal.valueOf(Double.valueOf(runOvUserNum*100)/runUserCount).setScale(2)); report.setRunOvUserRate(BigDecimal.valueOf(runOvUserNum==0?0.00:Double.valueOf(runOvUserNum*100)/runUserCount).setScale(2));
} }
@@ -309,14 +309,14 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
Integer auditCount = iPmsTemProcessTrackService.lambdaQuery() Integer auditCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1) .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
// .eq(PmsTemProcessTrackPO::getProStage,"01") // .eq(PmsTemProcessTrackPO::getProStage,"01")
.between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime) .between(PmsTemProcessTrackPO::getAuditTime, beginTime, endTime)
.count(); .count();
Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery() Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1) .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
// .eq(PmsTemProcessTrackPO::getProStage,"01") // .eq(PmsTemProcessTrackPO::getProStage,"01")
// .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime) // .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
.isNotNull(PmsTemProcessTrackPO::getAuditFinalTime) .isNotNull(PmsTemProcessTrackPO::getAuditTime)
.count(); .count();
pmsTemProcessReport.setReportAuditNum(auditCount); pmsTemProcessReport.setReportAuditNum(auditCount);
pmsTemProcessReport.setReportAuditCount(allAuditCount); pmsTemProcessReport.setReportAuditCount(allAuditCount);
@@ -383,7 +383,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
.count(); .count();
pmsTemProcessReport.setTestRunUserCount(testRunUserCount); pmsTemProcessReport.setTestRunUserCount(testRunUserCount);
pmsTemProcessReport.setTestRunOvUserNum(testRunOvUserNum); pmsTemProcessReport.setTestRunOvUserNum(testRunOvUserNum);
pmsTemProcessReport.setTestRunOvUserRate(BigDecimal.valueOf(Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2)); pmsTemProcessReport.setTestRunOvUserRate(BigDecimal.valueOf(testRunOvUserNum==0?0.00:Double.valueOf(testRunOvUserNum*100)/testRunOvUserNum).setScale(2));
Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery() Integer runUserCount = iPmsTemProcessTrackService.lambdaQuery()
.in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1) .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
@@ -400,7 +400,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
pmsTemProcessReport.setRunUserCount(runUserCount); pmsTemProcessReport.setRunUserCount(runUserCount);
pmsTemProcessReport.setRunOvUserNum(runOvUserNum); pmsTemProcessReport.setRunOvUserNum(runOvUserNum);
pmsTemProcessReport.setRunOvUserRate(BigDecimal.valueOf(Double.valueOf(runOvUserNum*100)/runUserCount).setScale(2)); pmsTemProcessReport.setRunOvUserRate(BigDecimal.valueOf(runOvUserNum==0?0.00:Double.valueOf(runOvUserNum*100)/runUserCount).setScale(2));
} }

30
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/PmsTemProcessReportRunner.java
View File

@@ -1,30 +0,0 @@
package com.njcn.system.timer.tasks.hbPushGw;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.njcn.harmonic.api.PmsTemProcessReportFeignClient;
import com.njcn.harmonic.api.UploadGwDataFeignClient;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.system.timer.TimerTaskRunner;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
/**
* Description:
* Date: 2024/10/29 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Component
@RequiredArgsConstructor
public class PmsTemProcessReportRunner implements TimerTaskRunner {
private final PmsTemProcessReportFeignClient pmsTemProcessReportFeignClient;
@Override
public void action(String date) {
pmsTemProcessReportFeignClient.dayCalReport();
}
}