From a6bcc50f16aa17f64dc26fbe7fb7a0fac20574e9 Mon Sep 17 00:00:00 2001
From: yang <1175@qq.com>
Date: Tue, 10 Sep 2024 15:56:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A8=E8=8D=90=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xboe/module/boecase/dao/CasesRecordDao.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
index de05a041..0dd0ca46 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
@@ -59,7 +59,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
                     "   IF(:#{#condition.orderField}='recommendPushTime', c.recommendPushTime,null) desc",
             countQuery =
                     " SELECT count(*) FROM ( " +
-                            "   SELECT b.* " +
+                            "   SELECT b.*,a.sys_create_time as recommendPushTime" +
                             "   FROM boe_cases_recommend_push_record a " +
                             "   LEFT JOIN boe_cases b ON a.case_id = b.id " +
                             "   WHERE b.deleted = 0 " +

From 8627a72d91403242c6abe73977ed3140c5c89d5d Mon Sep 17 00:00:00 2001
From: yang <1175@qq.com>
Date: Tue, 10 Sep 2024 16:07:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E6=8E=92=E8=A1=8C=E4=B8=8E=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xboe/module/boecase/entity/CasesRank.java | 6 ------
 .../xboe/module/boecase/service/impl/CasesServiceImpl.java  | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java
index 0b254d72..dd677c0c 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java
@@ -46,12 +46,6 @@ public class CasesRank extends BaseEntity {
     private Integer monthlyIncrement;
 
 
-    /**
-     * 排行类型
-     */
-    @Column(name = "rank_type")
-    private Integer rankType;
-
     @Column(name = "rise_rank_time")
     private LocalDateTime riseRankTime;
 
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
index 1fa45cf5..f49afc09 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
@@ -1158,7 +1158,7 @@ public class CasesServiceImpl implements ICasesService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void refreshViewsRankOfMajor(){
-        LocalDateTime riseRankTime = LocalDateTime.now().plusMonths(1).withDayOfMonth(1).minusDays(1).toLocalDate().atTime(23, 59, 59);  // 上月最后一天的结束时间
+        LocalDateTime riseRankTime = LocalDateTime.now().withDayOfMonth(1).minusDays(1).toLocalDate().atTime(23, 59, 59);  // 上月最后一天的结束时间
         int count = casesRankDao.sqlCount("SELECT count(1) FROM boe_cases_rank WHERE deleted=0 AND rise_rank_time = ?1", riseRankTime);
         if (count > 0){
             return;