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 29a43f624..702aadaa3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -106,4 +106,15 @@ public class WxBillAllController extends BaseController { wxBillAllService.exportOweMerchant(wxBillAll, request, response); } + @ApiOperation("导出待缴商户列表") + @GetMapping("/exportWaitMerchantlist") + @SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出") + public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist"); + if (null == wxBillAll){ + wxBillAll = new WxBillAll(); + } + wxBillAll.setTenantId(getTenantId()); + wxBillAllService.exportWaitMerchant(wxBillAll, request, response); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java new file mode 100644 index 000000000..988cd5666 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java @@ -0,0 +1,109 @@ +package com.iformall.domain.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; + +import java.math.BigDecimal; + +public class WaitMerchantVo { + + @Excel(name="商户名",width = 20,orderNum = "1") + private String name; + @Excel(name="楼座",width = 20,orderNum = "2") + private Long building; + @Excel(name="楼层",width = 20,orderNum = "3") + private Long floor; + @Excel(name="负责人",width = 20,orderNum = "4") + private String linkPerson; + @Excel(name="负责人电话",width = 20,orderNum = "5") + private String linkPhone; + @Excel(name="应收租金(元)",width = 20,orderNum = "6") + private BigDecimal rentReceivePay; + @Excel(name="应收物业费(元)",width = 20,orderNum = "7") + private BigDecimal propertyReceivePay; + @Excel(name="应收押金(元)",width = 20,orderNum = "8") + private BigDecimal depositReceivePay; + @Excel(name="应收其他费用(元)",width = 20,orderNum = "9") + private BigDecimal otherReceivePay; + @Excel(name="应收总额(元)",width = 20,orderNum = "10") + private BigDecimal totalReceivePay; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getBuilding() { + return building; + } + + public void setBuilding(Long building) { + this.building = building; + } + + public Long getFloor() { + return floor; + } + + public void setFloor(Long floor) { + this.floor = floor; + } + + public String getLinkPerson() { + return linkPerson; + } + + public void setLinkPerson(String linkPerson) { + this.linkPerson = linkPerson; + } + + public String getLinkPhone() { + return linkPhone; + } + + public void setLinkPhone(String linkPhone) { + this.linkPhone = linkPhone; + } + + public BigDecimal getRentReceivePay() { + return rentReceivePay; + } + + public void setRentReceivePay(BigDecimal rentReceivePay) { + this.rentReceivePay = rentReceivePay; + } + + public BigDecimal getPropertyReceivePay() { + return propertyReceivePay; + } + + public void setPropertyReceivePay(BigDecimal propertyReceivePay) { + this.propertyReceivePay = propertyReceivePay; + } + + public BigDecimal getDepositReceivePay() { + return depositReceivePay; + } + + public void setDepositReceivePay(BigDecimal depositReceivePay) { + this.depositReceivePay = depositReceivePay; + } + + public BigDecimal getOtherReceivePay() { + return otherReceivePay; + } + + public void setOtherReceivePay(BigDecimal otherReceivePay) { + this.otherReceivePay = otherReceivePay; + } + + public BigDecimal getTotalReceivePay() { + return totalReceivePay; + } + + public void setTotalReceivePay(BigDecimal totalReceivePay) { + this.totalReceivePay = totalReceivePay; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index ad8e72a23..a06bea95c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -45,6 +45,8 @@ public interface WxBillAllService { void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); + void exportWaitMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); + void updateBillStatus(WxBillAll record); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 16f1906f6..6d5a11845 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.vo.OweMerchantVo; +import com.iformall.domain.vo.WaitMerchantVo; import com.iformall.domain.vo.WxBillAll; import com.iformall.domain.vo.WxBillAllVo; import com.iformall.enums.*; @@ -791,5 +792,26 @@ public class WxBillAllServiceImpl implements WxBillAllService { excelService.exportExcel(list,null, name, OweMerchantVo.class,name+".xls",response); } + @Override + public void exportWaitMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { + List> data = wxBillAllMapper.getOweBillAsPage(record); + List list = new ArrayList<>(); + for (Map map:data) { + WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); + oweMerchantVo.setBuilding((Long)map.get("building")); + oweMerchantVo.setFloor((Long)map.get("floor")); + oweMerchantVo.setLinkPerson((String)map.get("manager")); + oweMerchantVo.setName((String)map.get("merchantName")); + oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); + oweMerchantVo.setRentReceivePay(new BigDecimal(subZeroAndDot(map.get("rentReceivePay").toString()))); + oweMerchantVo.setPropertyReceivePay(new BigDecimal(subZeroAndDot(map.get("propertyReceivePay").toString()))); + oweMerchantVo.setDepositReceivePay(new BigDecimal(subZeroAndDot(map.get("depositReceivePay").toString()))); + oweMerchantVo.setOtherReceivePay(new BigDecimal(subZeroAndDot(map.get("otherReceivePay").toString()))); + oweMerchantVo.setTotalReceivePay(new BigDecimal(subZeroAndDot(map.get("totalReceivePay").toString()))); + list.add(oweMerchantVo); + } + String name = "待缴商户列表"; + excelService.exportExcel(list,null, name, WaitMerchantVo.class,name+".xls",response); + } }