Parcourir la source

qiandao

release_toaliyun_real
xhxu il y a 5 ans
Parent
révision
7f6138bc2a
3 fichiers modifiés avec 10 ajouts et 10 suppressions
  1. +3
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java
  3. +5
    -5
      mallinkService/src/main/resources/mapper/WxActivityMapper.xml

+ 3
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java Voir le fichier

@@ -63,9 +63,9 @@ public class WxActivityController extends BaseController {
wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode());
wxActivity.updateTenantInfo(getTenantInfo());
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);
}


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java Voir le fichier

@@ -72,11 +72,11 @@ public class WxActivity extends TenantEntity {

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime;
private Date startDate;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime;
private Date endDate;


@TableField(exist = false)


+ 5
- 5
mallinkService/src/main/resources/mapper/WxActivityMapper.xml Voir le fichier

@@ -89,12 +89,12 @@
and `is_expired` = #{isExpired}
</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` &gt;= #{starttime} and `activity_end_time` &lt;= #{starttime}
<if test=" null != startDate and null != endDate ">
and `activity_start_time` &gt;= #{startDate} and `activity_end_time` &lt; #{endDate}
</if>
<if test=" null != sendMsg ">


Chargement…
Annuler
Enregistrer