Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats

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);

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);