|
|
|
@@ -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.size() ; i++) { |
|
|
|
Integer o = (Integer) jsonArray.get(i); |
|
|
|
wxBillAll.getStatusList().add(o); |
|
|
|
} |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(wxBillAll.getTypeListStr())){ |
|
|
|
wxBillAll.setTypeList(new ArrayList<>()); |
|
|
|
JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr()); |
|
|
|
for (int i = 0; i <jsonArray.size() ; i++) { |
|
|
|
Integer o = (Integer) jsonArray.get(i); |
|
|
|
wxBillAll.getTypeList().add(o); |
|
|
|
} |
|
|
|
} |
|
|
|
Map<String, Object> result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|