|
|
|
@@ -27,14 +27,21 @@ import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.SysConfigService; |
|
|
|
import com.iformall.service.WxEnergyService; |
|
|
|
import com.iformall.service.WxFinanceService; |
|
|
|
import com.iformall.utils.StringContentUtils; |
|
|
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.net.URLDecoder; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringEscapeUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@@ -317,6 +324,9 @@ public class WxFinanceController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { |
|
|
|
if (StringUtils.isNotBlank(record.getMerchantName())) { |
|
|
|
record.setMerchantName(StringContentUtils.unescapeHtml(record.getMerchantName())); |
|
|
|
} |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListWithBillsAsPage(record, pageNum, pageSize); |
|
|
|
|