From 5056331d76551609c47cd8981182b2b43bce5d17 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 Jun 2020 14:43:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=BB=B4=E5=BA=A6=E6=97=B6=E5=80=99=EF=BC=8Clast=5Fex?= =?UTF-8?q?ec=5Ftime=E7=9A=84exec=5Ftime=E4=B8=BAnow=E7=9A=84bug=EF=BC=8C?= =?UTF-8?q?=E5=88=9D=E6=AC=A1=E5=88=9B=E5=BB=BA=E6=97=B6=E5=80=99=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=BAnull=EF=BC=8Cinit=E4=B9=8B=E5=90=8E=E6=94=B9?= =?UTF-8?q?=E4=B8=BAnow=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/stats/impl/LastExecRecordServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java index 5fe4e6f924..ba6e33d157 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java @@ -25,9 +25,7 @@ public class LastExecRecordServiceImpl implements LastExecRecordService { */ @Override public LastExecRecordEntity createLastExecRecord(String statsSubject) { - Date now = new Date(); LastExecRecordEntity entity = new LastExecRecordEntity(); - entity.setExecTime(now); entity.setSubject(statsSubject); entity.setCreatedBy(RobotConstant.DIMENSION_ROBOT); entity.setUpdatedBy(RobotConstant.DIMENSION_ROBOT); From 63eeb606a46ba618392468cbba84674fd7224dad Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 24 Jun 2020 14:57:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/topic/impl/TopicServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 128cdf183c..0859bd2632 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -160,7 +160,7 @@ public class TopicServiceImpl implements TopicService { TopicShiftedCountResultDTO shiftedCount = topicDao.getShiftedCount(agencyId); Integer collect = topicSummaryInfo.stream().collect(Collectors.summingInt(TopicSummaryInfoResultDTO::getValue)); String ratio; - ratio = collect == NumConstant.ZERO ? NumConstant.ZERO + TopicConstant.RATIO : (shiftedCount.getShiftedIssueCount() / collect) * NumConstant.ONE_HUNDRED + TopicConstant.RATIO; + ratio = collect == NumConstant.ZERO ? NumConstant.ZERO + TopicConstant.RATIO : ((float)shiftedCount.getShiftedIssueCount() / (float)collect) * NumConstant.ONE_HUNDRED + TopicConstant.RATIO; TopicSummaryInfoResultDTO result = new TopicSummaryInfoResultDTO(); result.setName(TopicConstant.SHIFTED); result.setRatio(ratio);