Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/TencentCreativeDayDTO.java

@@ -57,6 +57,12 @@ public class TencentCreativeDayDTO extends BasePage {
     @ApiModelProperty(value = "广告状态")
     private String status;
 
+    /**
+     * 创意状态
+     */
+    @ApiModelProperty(value = "创意状态")
+    private String creativeStatus;
+
     /**
      * 创意id
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/AdsCreativeDayServiceImpl.java

@@ -167,6 +167,9 @@ public class AdsCreativeDayServiceImpl implements IAdsCreativeDayService {
         if (StringUtils.isNotBlank(dto.getStatus())) {
             cri.where().andEquals("status", dto.getStatus());
         }
+        if(StringUtils.isNotEmpty(dto.getCreativeStatus())){
+            cri.where().andEquals("configured_status", dto.getCreativeStatus());
+        }
         if (StringUtils.isNotBlank(dto.getDynamicCreativeName())) {
             cri.where().andLike("dynamic_creative_name", dto.getDynamicCreativeName());
         }
@@ -698,6 +701,10 @@ public class AdsCreativeDayServiceImpl implements IAdsCreativeDayService {
         if (StringUtils.isNotBlank(dto.getStatus())) {
             cri.where().andEquals("status", dto.getStatus());
         }
+        if(StringUtils.isNotBlank(dto.getCreativeStatus())){
+            cri.where().andEquals("configured_status", dto.getCreativeStatus());
+        }
+
         if (StringUtils.isNotBlank(dto.getDynamicCreativeName())) {
             cri.where().andLike("dynamic_creative_name", dto.getDynamicCreativeName());
         }