From 57bd5af7cf0c2bc7662c3e839edb799e799f7d2f Mon Sep 17 00:00:00 2001
From: Administrator <tuyaping@ykhl.com>
Date: Wed, 19 Jan 2022 15:10:50 +0800
Subject: [PATCH] 优化后版本，跑数据脚本

---
 src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java | 4 ++--
 src/main/java/com/subsidy/service/impl/OprAdmDictServiceImpl.java | 4 ++--
 src/main/java/com/subsidy/vo/opr/GetHistoryVO.java                | 4 ++--
 src/main/resources/mapper/VodPlayHistoryMapper.xml                | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
index 0e8ef2a..0ea2229 100644
--- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
@@ -901,7 +901,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
         // 表头
         List<String> title = new ArrayList<>();
         title.add("姓名");
-        title.add("合计总时长");
+        title.add("合计完成率");
         for (VodDictDO vodDictDO : vodDictDOS){
             title.add(vodDictDO.getVodName());
         }
@@ -961,7 +961,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
                 namecell.setCellValue(memberMapper.selectById(data).getUserName());
                 int total = 0;
                 for (String date : dates) {
-                    if (!date.equals("姓名") && !"合计总时长".equals(date)) {
+                    if (!date.equals("姓名") && !"合计完成率".equals(date)) {
                         Cell cell1 = r.createCell(a.getAndIncrement());
                         if (null != hashMap1) {
                             total += null == hashMap1.get(date) ? 0 : hashMap1.get(date);
diff --git a/src/main/java/com/subsidy/service/impl/OprAdmDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/OprAdmDictServiceImpl.java
index 7fa6f88..415515d 100644
--- a/src/main/java/com/subsidy/service/impl/OprAdmDictServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/OprAdmDictServiceImpl.java
@@ -55,8 +55,8 @@ public class OprAdmDictServiceImpl extends ServiceImpl<OprAdmDictMapper, OprAdmD
 
         //可累加条件
         Query query = new Query(Criteria.where("userName").regex(getHistoryDTO.getUserName())
-                .and("loginDateFormat").gte(getHistoryDTO.getStartDate())
-                .and("loginDateFormat").lte(getHistoryDTO.getEndDate()));
+                .andOperator(Criteria.where("loginDateFormat").gte(getHistoryDTO.getStartDate()),
+                Criteria.where("loginDateFormat").lte(getHistoryDTO.getEndDate())));
         Long count = mongoTemplate.count(query,OprAdmDictDO.class);
         mongoUtil.start(getHistoryDTO.getPageNum(),getHistoryDTO.getPageSize(),query);
         List<OprAdmDictDO> oprAdmDictDOS = mongoTemplate.find(query,OprAdmDictDO.class);
diff --git a/src/main/java/com/subsidy/vo/opr/GetHistoryVO.java b/src/main/java/com/subsidy/vo/opr/GetHistoryVO.java
index bb53071..efba8ef 100644
--- a/src/main/java/com/subsidy/vo/opr/GetHistoryVO.java
+++ b/src/main/java/com/subsidy/vo/opr/GetHistoryVO.java
@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class GetHistoryVO {
 
-    private Integer id;
+    private String _id;
 
     private String userName;
 
@@ -15,6 +15,6 @@ public class GetHistoryVO {
 
     private String createDate;
 
-    private String result;
+    private Integer result;
 
 }
diff --git a/src/main/resources/mapper/VodPlayHistoryMapper.xml b/src/main/resources/mapper/VodPlayHistoryMapper.xml
index 50007c6..3b2a156 100644
--- a/src/main/resources/mapper/VodPlayHistoryMapper.xml
+++ b/src/main/resources/mapper/VodPlayHistoryMapper.xml
@@ -331,7 +331,6 @@
             LEFT JOIN class_member_mapping t2 ON t.member_id = t2.id
         WHERE
             t.delete_date IS NULL
-            AND t2.delete_date IS NULL
             AND t.class_id = #{classId}
         GROUP BY
             t.class_id,
--
libgit2 0.25.0