医健宝-总后台首页统计新增pad使用数量，销售公司流量充值记录页面

fs-service/src/main/java/com/fs/company/domain/CompanyTrafficRecordLog.java

@@ -1,6 +1,7 @@
 package com.fs.company.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -39,5 +40,6 @@ public class CompanyTrafficRecordLog {
     @Excel(name = "备注")
     private String remark;
     @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyTrafficRecordLogServiceImpl.java

@@ -24,7 +24,7 @@ public class CompanyTrafficRecordLogServiceImpl extends ServiceImpl<CompanyTraff
                 .eq(record.getUserId() != null ,CompanyTrafficRecordLog::getUserId, record.getUserId())
                 .eq(record.getOperationType() != null ,CompanyTrafficRecordLog::getOperationType, record.getOperationType())
                 .eq(record.getCreateTime() != null ,CompanyTrafficRecordLog::getCreateTime, record.getCreateTime())
-                .between(record.getCreateTime() != null,CompanyTrafficRecordLog::getCreateTime, record.getCreateTimeStart(), record.getCreateTimeEnd()));
+                .between(record.getCreateTimeStart() != null && record.getCreateTimeEnd() != null,CompanyTrafficRecordLog::getCreateTime, record.getCreateTimeStart(), record.getCreateTimeEnd()));
     }
 
     @Override

fs-service/src/main/java/com/fs/qw/mapper/QwIpadServerMapper.java

@@ -71,4 +71,7 @@ public interface QwIpadServerMapper extends BaseMapper<QwIpadServer>{
     @Select("select id from qw_ipad_server where count>0 order by count desc limit 1 "  )
     Long selectQwIpadServerByOtherAddressId();
 
+    @Select("select sum(qis.total_count) as total_count ,sum(qis.count) as count from qw_ipad_server qis")
+    QwIpadServer getPadInfo();
+
 }

fs-service/src/main/java/com/fs/qw/service/IQwIpadServerService.java

@@ -67,4 +67,6 @@ public interface IQwIpadServerService extends IService<QwIpadServer>{
     void addServer(Long serverId);
 
     Long selectQwIpadServerByOtherAddressId();
+
+    QwIpadServer getPadInfo();
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwIpadServerServiceImpl.java

@@ -113,4 +113,9 @@ private QwIpadServerMapper qwIpadServerMapper;
     public Long selectQwIpadServerByOtherAddressId() {
         return  qwIpadServerMapper.selectQwIpadServerByOtherAddressId();
     }
+
+    @Override
+    public QwIpadServer getPadInfo() {
+        return qwIpadServerMapper.getPadInfo();
+    }
 }

fs-service/src/main/java/com/fs/statis/dto/DealerAggregatedDTO.java

@@ -67,4 +67,10 @@ public class DealerAggregatedDTO implements Serializable {
      */
     private Long todayGoodsNum;
 
+    /**
+     * pad情况 7/8分数
+     * */
+    private Long padTotalNum;
+    private Long padUsedNum;
+
 }

fs-service/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -12,6 +12,8 @@ import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.service.IFsStorePaymentService;
 import com.fs.his.service.IFsStoreProductService;
 import com.fs.his.service.IFsUserService;
+import com.fs.qw.domain.QwIpadServer;
+import com.fs.qw.service.IQwIpadServerService;
 import com.fs.statis.StatisticsRedisConstant;
 import com.fs.statis.dto.*;
 import com.fs.statis.mapper.ConsumptionBalanceMapper;
@@ -75,6 +77,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
     @Autowired
     private FsCourseWatchLogMapper fsCourseWatchLogMapper;
 
+    @Autowired
+    private IQwIpadServerService qwIpadServerService;
+
     @Override
     public void dataOverviewTask() {
         DealerAggregatedDTO dealerAggregatedDTO = this.dealerAggregated();
@@ -684,6 +689,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
         Long dayPaymentCount=paymentService.selectFsStorePaymentCount(1,null);
         Long productCount=productService.selectFsStoreProductCount(0);
         Long dayProductCount=productService.selectFsStoreProductCount(1);
+        QwIpadServer padInfo=qwIpadServerService.getPadInfo();
         DealerAggregatedDTO dealerAggregatedDTO = consumptionBalanceMapper.dealerAggregated();
         dealerAggregatedDTO.setTodayIncreaseUserNum(dayUserCount);
         dealerAggregatedDTO.setOrderTotalNum(storeOrderCount);
@@ -692,6 +698,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
         dealerAggregatedDTO.setRecvTodayNum(dayPaymentCount);
         dealerAggregatedDTO.setGoodsTotalNum(productCount);
         dealerAggregatedDTO.setTodayGoodsNum(dayProductCount);
+        dealerAggregatedDTO.setPadTotalNum(padInfo.getTotalCount());
+        dealerAggregatedDTO.setPadUsedNum(padInfo.getCount());
         return dealerAggregatedDTO;
     }