|
@@ -69,28 +69,28 @@ public class BytedanceVideoEtlInfoController {
|
|
if(type.trim().equals("valid")){
|
|
if(type.trim().equals("valid")){
|
|
//有效
|
|
//有效
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
- queryWrapper.gt("effect_date",startDate);
|
|
|
|
|
|
+ queryWrapper.ge("effect_date",startDate);
|
|
}
|
|
}
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
- queryWrapper.lt("effect_date",endDate);
|
|
|
|
|
|
+ queryWrapper.le("effect_date",endDate);
|
|
}
|
|
}
|
|
- queryWrapper.lt("effect_day_num",7);
|
|
|
|
|
|
+ queryWrapper.le("effect_day_num",7);
|
|
}else if(type.trim().equals("hot")){
|
|
}else if(type.trim().equals("hot")){
|
|
//爆款
|
|
//爆款
|
|
- if(null!=startDate&&!"faddish_date".equals(startDate.trim())){
|
|
|
|
- queryWrapper.gt("",startDate);
|
|
|
|
|
|
+ if(null!=startDate&&!"".equals(startDate.trim())){
|
|
|
|
+ queryWrapper.ge("faddish_date",startDate);
|
|
}
|
|
}
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
- queryWrapper.lt("faddish_date",endDate);
|
|
|
|
|
|
+ queryWrapper.le("faddish_date",endDate);
|
|
}
|
|
}
|
|
- queryWrapper.lt("faddish_day_num",30);
|
|
|
|
|
|
+ queryWrapper.le("faddish_day_num",30);
|
|
}else {
|
|
}else {
|
|
//上线
|
|
//上线
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
- queryWrapper.gt("state_date",startDate);
|
|
|
|
|
|
+ queryWrapper.ge("state_date",startDate);
|
|
}
|
|
}
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
- queryWrapper.lt("state_date",endDate);
|
|
|
|
|
|
+ queryWrapper.le("state_date",endDate);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -181,28 +181,28 @@ public class BytedanceVideoEtlInfoController {
|
|
if(type.trim().equals("valid")){
|
|
if(type.trim().equals("valid")){
|
|
//有效
|
|
//有效
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
- queryWrapper.gt("effect_date",startDate);
|
|
|
|
|
|
+ queryWrapper.ge("effect_date",startDate);
|
|
}
|
|
}
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
- queryWrapper.lt("effect_date",endDate);
|
|
|
|
|
|
+ queryWrapper.le("effect_date",endDate);
|
|
}
|
|
}
|
|
- queryWrapper.lt("effect_day_num",7);
|
|
|
|
|
|
+ queryWrapper.le("effect_day_num",7);
|
|
}else if(type.trim().equals("hot")){
|
|
}else if(type.trim().equals("hot")){
|
|
//爆款
|
|
//爆款
|
|
- if(null!=startDate&&!"faddish_date".equals(startDate.trim())){
|
|
|
|
- queryWrapper.gt("",startDate);
|
|
|
|
|
|
+ if(null!=startDate&&!"".equals(startDate.trim())){
|
|
|
|
+ queryWrapper.ge("faddish_date",startDate);
|
|
}
|
|
}
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
- queryWrapper.lt("faddish_date",endDate);
|
|
|
|
|
|
+ queryWrapper.le("faddish_date",endDate);
|
|
}
|
|
}
|
|
- queryWrapper.lt("faddish_day_num",30);
|
|
|
|
|
|
+ queryWrapper.le("faddish_day_num",30);
|
|
}else {
|
|
}else {
|
|
//上线
|
|
//上线
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
if(null!=startDate&&!"".equals(startDate.trim())){
|
|
- queryWrapper.gt("state_date",startDate);
|
|
|
|
|
|
+ queryWrapper.ge("state_date",startDate);
|
|
}
|
|
}
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
- queryWrapper.lt("state_date",endDate);
|
|
|
|
|
|
+ queryWrapper.le("state_date",endDate);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|