From f80d27287c79012630d2d31a48e4965cfe3f8658 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Sun, 29 Jan 2023 16:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qs/serve/common/util/PageUtil.java    |  2 +-
 .../serve/modules/bms/entity/BmsSupplier.java |  1 +
 .../TbsActivityTemplateLogController.java     |  1 +
 .../service/TbsBudgetApplicationService.java  |  2 +-
 .../impl/VtbVerificationServiceImpl.java      |  2 +-
 src/main/java/com/qs/serve/task/TbsTask.java  | 35 +++++++++++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/qs/serve/common/util/PageUtil.java b/src/main/java/com/qs/serve/common/util/PageUtil.java
index 73a316aa..2c5e2e0a 100644
--- a/src/main/java/com/qs/serve/common/util/PageUtil.java
+++ b/src/main/java/com/qs/serve/common/util/PageUtil.java
@@ -28,7 +28,7 @@ public class PageUtil {
     private static final String ORDER_TYPE_ASC = "ASC";
     private static final String ORDER_TYPE_DESC = "DESC";
 
-    private static final int MAX_PAGE_SIZE = 66;
+    private static final int MAX_PAGE_SIZE = 100;
 
     public static <T> Page<T> getMbpPage(){
         Integer pageNum = getPageNum();
diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
index 6c5c42a1..d78b85e1 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
@@ -71,6 +71,7 @@ public class BmsSupplier implements Serializable {
     /** 名称 */
     @NotBlank(message = "名称不能为空")
     @Length(max = 20,message = "名称长度不能超过20字")
+    @TableField(condition = SqlCondition.LIKE)
     private String name;
 
     /** 客户编码 */
diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
index 79a2d05a..debd16f0 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
@@ -58,6 +58,7 @@ public class TbsActivityTemplateLogController {
     public R<PageVo<TbsActivityTemplateLog>> getPage(TbsActivityTemplateLogSo param){
         TbsActivityTemplateLog entity = CopierUtil.copy(param,new TbsActivityTemplateLog());
         LambdaQueryWrapper<TbsActivityTemplateLog> lqw = new LambdaQueryWrapper<>(entity);
+        lqw.orderByDesc(TbsActivityTemplateLog::getCreateTime);
         PageUtil.startPage();
         List<TbsActivityTemplateLog> list = tbsActivityTemplateLogService.list(lqw);
         return R.byPageHelperList(list);
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
index 0356a0a2..2a5a3d05 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
@@ -440,7 +440,7 @@ public class TbsBudgetApplicationService {
             //拦截非当前科目
             Long subjectId = null;
             for (TbsActivitySubject activitySubject : activitySubjects) {
-                if(activity.getId().equals(activitySubject.getActivityId())){
+                if(activityCostItem.getSubjectId().equals(activitySubject.getSubjectId())){
                     subjectId = activitySubject.getSubjectId();
                     break;
                 }
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index 7ec8a2cf..46663cf8 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -347,7 +347,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         LocalDate nowDate = LocalDate.now();
         if(activity.getReopenFlag().equals(0)
                 && filterActTime
-                && nowDate.isAfter(activity.getActEndDate())
+                //&& nowDate.isAfter(activity.getActEndDate())
                 && nowDate.isAfter(activity.getPreCheckDate())){
             Assert.throwEx("活动已结束");
         }
diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java
index ca91189c..12f5aa8c 100644
--- a/src/main/java/com/qs/serve/task/TbsTask.java
+++ b/src/main/java/com/qs/serve/task/TbsTask.java
@@ -1,10 +1,14 @@
 package com.qs.serve.task;
 
+import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
+import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
+import com.qs.serve.modules.tbs.service.TbsActivityTemplateService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -19,6 +23,7 @@ import java.time.LocalDateTime;
 public class TbsTask {
 
     private final TbsActivityService activityService;
+    private final TbsActivityTemplateService activityTemplateService;
 
     //todo 每日更新过期的活动，过期则进行冻结
     public void task1(){
@@ -31,5 +36,35 @@ public class TbsTask {
         activityService.update(param,lqw);
     }
 
+    //todo 启用和停用模板规则
+    public void task2(){
+        AuthContextUtils.setTenant("001");
+        LocalDateTime nowTime = LocalDateTime.now();
+        LambdaQueryWrapper<TbsActivityTemplate> lqw = new LambdaQueryWrapper<>();
+        lqw.select(TbsActivityTemplate::getId);
+        lqw.ge(TbsActivityTemplate::getStartTime,nowTime.with(LocalDateTime.MIN));
+        lqw.le(TbsActivityTemplate::getStartTime,nowTime.with(LocalDateTime.MAX));
+        lqw.eq(TbsActivityTemplate::getTemplateState,0);
+        List<TbsActivityTemplate> preStartList = activityTemplateService.list(lqw);
+        if(CollectionUtil.isNotEmpty(preStartList)){
+            preStartList.forEach(a->a.setTemplateState(1));
+            activityTemplateService.updateBatchById(preStartList);
+        }
+
+        LambdaQueryWrapper<TbsActivityTemplate> lqw2 = new LambdaQueryWrapper<>();
+        lqw2.select(TbsActivityTemplate::getId);
+        lqw2.ge(TbsActivityTemplate::getEndTime,nowTime.with(LocalDateTime.MIN));
+        lqw2.le(TbsActivityTemplate::getEndTime,nowTime.with(LocalDateTime.MAX));
+        lqw2.eq(TbsActivityTemplate::getTemplateState,1);
+        List<TbsActivityTemplate> preCloseList = activityTemplateService.list(lqw2);
+        if(CollectionUtil.isNotEmpty(preCloseList)){
+            preCloseList.forEach(a->a.setTemplateState(0));
+            activityTemplateService.updateBatchById(preCloseList);
+        }
+
+    }
+
+
+
 
 }