diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index bf28061e4..96ecc1822 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -269,4 +269,17 @@ public class WxFinanceController extends BaseController { return new ResultData(); } + @ApiOperation("冲抵列表") + @GetMapping("receiveSetoffList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData receiveSetoffList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + PageInfo page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); + return new ResultData(page); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java index 26bd554ef..78d4690e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java @@ -1,7 +1,10 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumBillAllType; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -33,9 +36,16 @@ public class WxFinanceReceiveSetoff extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "账单类型EnumBillAllType", name = "billType") private Integer billType; + @TableField(exist = false) + private String billTypeName; + public String getBillTypeName() { + return EnumBillAllType.getEnum(billType).getMessage(); + } @io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId") private Long feesId; + @TableField(exist = false) + private String feesName; @io.swagger.annotations.ApiModelProperty(value="冲抵金额",name="setoff") private String setoff; diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index e7631d18d..1b72b0ed0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxFinanceReceiveBill; +import com.iformall.domain.po.WxFinanceReceiveSetoff; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; @@ -34,5 +35,6 @@ public interface WxFinanceService { FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record); List getSetOffList(FinanceSetOffDTO dto,boolean isMerge); void createAdvance(WxFinanceReceive record,MallUserInfo user); + PageInfo receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index bc0ae0a02..483998c09 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -762,6 +762,30 @@ public class WxFinanceServiceImpl implements WxFinanceService { wxFinanceReceiveMapper.insert(record); } + @Override + public PageInfo receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex, + Integer pageSize) { + WxFinanceReceiveSetoff rsq = new WxFinanceReceiveSetoff(); + rsq.updateTenantInfo(record); + rsq.setAdvanceId(record.getId()); + PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceReceiveSetoffMapper.findList(rsq)); + if (null != page && null != page.getList()) { + WxEnergyFees fq = new WxEnergyFees(); + fq.updateTenantInfo(record); + Map feesMap = wxEnergyService.getFeesMap(fq); + for (int i = 0 ; i < page.getList().size(); i++ ) { + WxFinanceReceiveSetoff frs = page.getList().get(i); + if (null != feesMap && null != frs.getFeesId()) { + WxEnergyFees ef = feesMap.get(frs.getFeesId()); + if (null != ef) { + frs.setFeesName(ef.getName()); + } + } + } + } + return page; + } +