Browse Source

qiandao

release_toaliyun_real
xhxu 5 years ago
parent
commit
86b4200328
2 changed files with 8 additions and 5 deletions
  1. +2
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java
  2. +6
    -2
      mallinkService/src/main/resources/mapper/WxActivityMapper.xml

+ 2
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java View File

@@ -5,6 +5,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.enums.EnumActivityStatus;
import com.iformall.service.WxActivityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -42,9 +43,7 @@ public class WxActivityController extends BaseController {
public ResultData list(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxActivityController::list");
if (null == wxActivity) wxActivity = new WxActivity();
if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) {
wxActivity.setStatus(null);
}
wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode());
wxActivity.updateTenantInfo(getTenantInfo());
wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize);


+ 6
- 2
mallinkService/src/main/resources/mapper/WxActivityMapper.xml View File

@@ -66,9 +66,13 @@
and `type` = #{type}
</if>
<if test=" null != status ">
<if test=" null != status and status != 3">
and `status` = #{status}
</if>

<if test=" null != status and status == 3">
and `status` &gt;= 2 and `status` &lt;= 3
</if>
<if test=" null != createTime ">
and `create_time` = #{createTime}
@@ -85,7 +89,7 @@
and `is_expired` = #{isExpired}
</if>
<if test=" null != starttime and null!=endtime ">
<if test=" null != starttime and null != endtime ">
and `create_time` between #{starttime} and #{endtime}
</if>


Loading…
Cancel
Save