Merge branch 'refs/heads/zcwy0813-yang' into dev0525

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 " +

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;
 

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;