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 496f6af58..9227507ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -148,4 +148,27 @@ public class WxBillAllController extends BaseController { wxBillAll.setTenantId(getTenantId()); wxBillAllService.exportWaitMerchant(wxBillAll, request, response); } + + + @GetMapping("exportOweBill") + @SystemControllerLog(description = "生成催缴单") + public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + //默认查当月第一天到今天 + if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { + wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); + } + if (StringUtils.isBlank(wxBillAll.getEndtime()) && StringUtils.isBlank(wxBillAll.getStarttime())) { + SimpleDateFormat sb = new SimpleDateFormat("yyyy-MM-dd"); + wxBillAll.setStarttime(sb.format(DateUtils.getFirstDayForCurrMonth(new Date()))); + wxBillAll.setEndtime(sb.format(new Date()) + " 23:59:59"); + } + wxBillAll.setTenantId(getTenantId()); + wxBillAllService.exportOweBill(wxBillAll, request, response); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index a06bea95c..62db32707 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -49,4 +49,6 @@ public interface WxBillAllService { void updateBillStatus(WxBillAll record); + void exportOweBill(WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response); + } \ 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 74c7038f7..4ecde8e9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -95,6 +95,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; + @Autowired + WxMallMapper wxMallMapper; + @Override public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { //更新各账单状态 @@ -580,6 +583,15 @@ public class WxBillAllServiceImpl implements WxBillAllService { logger.info("更新各账单状态结束"); } + @Override + public void exportOweBill(WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { + //商场名称 + WxMall wxMall = wxMallMapper.getByTenantId(wxBillAll.getTenantId()); + //账单总数 + List> data = wxBillAllMapper.getOweBillAsPage(wxBillAll); + + } + @Override public Object getBillInfo(WxBillAll record) { diff --git a/mallinkService/src/main/resources/contract-word-template/owe_bill.docx b/mallinkService/src/main/resources/contract-word-template/owe_bill.docx new file mode 100644 index 000000000..7dddd89ee Binary files /dev/null and b/mallinkService/src/main/resources/contract-word-template/owe_bill.docx differ diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index aefea34a1..5bf2491e8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -100,7 +100,9 @@ and bill.bill_type_value = #{billTypeValue} and bill.`status` = #{status} and bill.rent_shop_type = #{rentShopType} - + + and bill.receive_date between #{starttime} and #{endtime} + order by ${sortColumns} order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc