From 7bc9cb97923c836f292a769760b62ea1103d5165 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 31 Oct 2024 15:02:48 +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=E5=88=A0=E9=99=A4=E6=89=B9?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PmsTemProcessReportServiceImpl.java  | 16 +++++-----
 .../hbPushGw/PmsTemProcessReportRunner.java   | 30 -------------------
 2 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/PmsTemProcessReportRunner.java

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 5f27d3918..ec7746a0b 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
@@ -164,14 +164,14 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
                 Integer auditCount = iPmsTemProcessTrackService.lambdaQuery()
                         .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
 //                        .eq(PmsTemProcessTrackPO::getProStage,"01")
-                        .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
+                        .between(PmsTemProcessTrackPO::getAuditTime, beginTime, endTime)
                         .count();
 
                 Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery()
                         .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
 //                        .eq(PmsTemProcessTrackPO::getProStage,"01")
 //                        .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
-                        .isNotNull(PmsTemProcessTrackPO::getAuditFinalTime)
+                        .isNotNull(PmsTemProcessTrackPO::getAuditTime)
                         .count();
                 report.setReportAuditNum(auditCount);
                 report.setReportAuditCount(allAuditCount);
@@ -238,7 +238,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
                         .count();
                 report.setTestRunUserCount(testRunUserCount);
                 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()
                         .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds)
@@ -255,7 +255,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
 
                 report.setRunUserCount(runUserCount);
                 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()
                             .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
 //                        .eq(PmsTemProcessTrackPO::getProStage,"01")
-                            .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
+                            .between(PmsTemProcessTrackPO::getAuditTime, beginTime, endTime)
                             .count();
 
                     Integer allAuditCount = iPmsTemProcessTrackService.lambdaQuery()
                             .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
 //                        .eq(PmsTemProcessTrackPO::getProStage,"01")
 //                        .between(PmsTemProcessTrackPO::getAuditFinalTime, beginTime, endTime)
-                            .isNotNull(PmsTemProcessTrackPO::getAuditFinalTime)
+                            .isNotNull(PmsTemProcessTrackPO::getAuditTime)
                             .count();
                     pmsTemProcessReport.setReportAuditNum(auditCount);
                     pmsTemProcessReport.setReportAuditCount(allAuditCount);
@@ -383,7 +383,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
                             .count();
                     pmsTemProcessReport.setTestRunUserCount(testRunUserCount);
                     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()
                             .in(PmsTemProcessTrackPO::getTempUserDossierId, userIds1)
@@ -400,7 +400,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
 
                     pmsTemProcessReport.setRunUserCount(runUserCount);
                     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));
 
 
                 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/PmsTemProcessReportRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/PmsTemProcessReportRunner.java
deleted file mode 100644
index 9c46fd4d9..000000000
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/PmsTemProcessReportRunner.java
+++ /dev/null
@@ -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();
-    }
-}