| @@ -63,9 +63,9 @@ public class WxActivityController extends BaseController { | |||||
| wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode()); | wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode()); | ||||
| wxActivity.updateTenantInfo(getTenantInfo()); | wxActivity.updateTenantInfo(getTenantInfo()); | ||||
| wxActivity.setSortColumns(BaseEntity.SortField.ActivityStartTime_DESC,BaseEntity.SortField.Id_DESC); | wxActivity.setSortColumns(BaseEntity.SortField.ActivityStartTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| if(wxActivity.getStarttime() == null || wxActivity.getEndtime() == null){ | |||||
| wxActivity.setStarttime(DateUtils.getFirstDayForCurrMonth()); | |||||
| wxActivity.setEndtime(DateUtils.getLastDayForMonth(new Date())); | |||||
| if(wxActivity.getStartDate() == null || wxActivity.getEndDate() == null){ | |||||
| wxActivity.setStartDate(DateUtils.getFirstDayForCurrMonth()); | |||||
| wxActivity.setEndDate(DateUtils.getLastDayForMonth(new Date())); | |||||
| } | } | ||||
| return wxActivityService.getListStatus(wxActivity); | return wxActivityService.getListStatus(wxActivity); | ||||
| } | } | ||||
| @@ -72,11 +72,11 @@ public class WxActivity extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") | @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") | ||||
| private Date starttime; | |||||
| private Date startDate; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") | @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") | ||||
| private Date endtime; | |||||
| private Date endDate; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -89,12 +89,12 @@ | |||||
| and `is_expired` = #{isExpired} | and `is_expired` = #{isExpired} | ||||
| </if> | </if> | ||||
| <if test=" null != starttime and null != endtime "> | |||||
| and `create_time` between #{starttime} and #{endtime} | |||||
| </if> | |||||
| <!-- <if test=" null != startDate and null != endDate ">--> | |||||
| <!-- and `create_time` between #{starttime} and #{endtime}--> | |||||
| <!-- </if>--> | |||||
| <if test=" null != starttime and null != endtime "> | |||||
| and `activity_start_time` >= #{starttime} and `activity_end_time` <= #{starttime} | |||||
| <if test=" null != startDate and null != endDate "> | |||||
| and `activity_start_time` >= #{startDate} and `activity_end_time` < #{endDate} | |||||
| </if> | </if> | ||||
| <if test=" null != sendMsg "> | <if test=" null != sendMsg "> | ||||