From 0743d40e427a2ac0bd929792b91b25467076a554 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 31 Aug 2019 15:11:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rent/WxBillAllController.java | 18 ++++++++++++++++++ .../com/iformall/tenant/TenantInfoImpl.java | 1 + .../java/com/iformall/domain/vo/WxBillAll.java | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index dba261b37..bdf437eed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -1,5 +1,6 @@ package com.iformall.controller.rent; +import com.alibaba.fastjson.JSONArray; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.Map; /** @@ -51,6 +53,22 @@ public class WxBillAllController extends BaseController { wxBillAll = new WxBillAll(); } wxBillAll.setTenantId(getTenantId()); + if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ + wxBillAll.setStatusList(new ArrayList<>()); + JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); + for (int i = 0; i ()); + JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr()); + for (int i = 0; i result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 016a12d9f..a15f3115c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -129,6 +129,7 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxBillPropertyMapper.insertBillAction".equals(ms.getId())) return true; + return false; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index b04d8fabf..7cd3707f8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import javax.persistence.Transient; +import java.util.ArrayList; import java.util.List; /** @@ -44,6 +45,11 @@ public class WxBillAll extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="商户Id",name="merchantId") private Long merchantId; + @Transient + private String statusListStr; + @Transient + private String typeListStr; + @io.swagger.annotations.ApiModelProperty(value="多个状态",name="statusList") private List statusList;