Merge branch 'zx_1026_1111' into saas

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -262,11 +262,7 @@ public class OpenDouble11StaticsController extends BaseController {
                                Double11StaticWrapper.SaleStaticConfigParam configParam) {
 
         Integer saleStaticsType = query.getSaleStaticsType();
-        query.setGroupType(null);
-        query.setType(null);
-        query.setActivityId(null);
-        query.setGoodId(null);
-        query.setMusicGroupId(null);
+        query.clearValue();
         if (StringUtils.isEmpty(query.getOrganId())) {
             query.setTenantId(Optional.ofNullable(configParam.getTenantId()).orElse(1));
         }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/Double11StaticWrapper.java

@@ -60,6 +60,16 @@ public class Double11StaticWrapper {
         @ApiModelProperty(hidden = true)
         private Date endPayTime;
 
+        public void clearValue() {
+            this.setGroupType(null);
+            this.setType(null);
+            this.setActivityId(null);
+            this.setGoodId(null);
+            this.setMusicGroupId(null);
+            this.setStartPayTime(null);
+            this.setEndPayTime(null);
+        }
+
     }
 
     @ApiModel("分部学生购买")