Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/controller/KwoBannerController.java

@@ -1,6 +1,5 @@
 package com.sckw.operation.controller;
 
-import com.sckw.core.exception.SystemException;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.operation.model.vo.req.*;

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerQueryReqVo.java

@@ -2,14 +2,12 @@ package com.sckw.operation.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author czh
@@ -57,4 +55,9 @@ public class BannerQueryReqVo extends PageRequest implements Serializable {
      */
     private Integer district;
 
+    /**
+     * 是否是门户端展示的
+     */
+    private Boolean isShow;
+
 }

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -78,7 +78,7 @@ public class BannerService {
         LambdaQueryWrapper<KwoBanner> wrapper = new LambdaQueryWrapper<>();
         if(Objects.nonNull(reqVo.getDistrict()))
         {
-            reqVo.setStatus(1);
+            reqVo.setStatus(Global.YES);
         }
         wrapper.eq(Objects.nonNull(reqVo.getStatus()), KwoBanner::getStatus, reqVo.getStatus()).
                 eq(KwoBanner::getDelFlag, Global.NO).
@@ -89,6 +89,7 @@ public class BannerService {
         if (Objects.nonNull(reqVo.getStartTime())) {
             wrapper.ge(KwoBanner::getStartTime, reqVo.getStartTime());
         }
+
         if(Objects.nonNull(reqVo.getDistrict())) {
             wrapper.eq(KwoBanner::getDistrict, reqVo.getDistrict());
         }
@@ -100,6 +101,12 @@ public class BannerService {
         if (StringUtils.isNotBlank(reqVo.getIds())) {
             wrapper.in(KwoBanner::getId, Arrays.stream(reqVo.getIds().split(Global.COMMA)).map(Long::parseLong).toList());
         }
+
+        if(Objects.nonNull(reqVo.getIsShow()) && reqVo.getIsShow()) {
+            Date date = new Date();
+            wrapper.le(KwoBanner::getStartTime, date).and(wp -> wp.isNull(KwoBanner::getEntTime).or().ge(KwoBanner::getEntTime, date));
+            wrapper.eq(KwoBanner::getStatus, Global.YES);
+        }
         return kwoBannerMapper.selectList(wrapper);
     }
 
@@ -177,6 +184,7 @@ public class BannerService {
         Long userId = LoginUserHolder.getUserId();
         kwobanner.setUpdateTime(date);
         kwobanner.setUpdateBy(userId);
+        kwobanner.setEntTime(reqVo.getEndTime());
         if (kwoBannerMapper.updateById(kwobanner) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }