From 8d413d9e8b6f267486cde01278e66afd86ee9c27 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 21 May 2019 13:43:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E5=BA=97=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E5=82=AC=E7=BC=B4?= =?UTF-8?q?=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rent/WxBillAllController.java | 23 ++++++++++++++++++ .../iformall/service/WxBillAllService.java | 2 ++ .../service/impl/WxBillAllServiceImpl.java | 12 +++++++++ .../contract-word-template/owe_bill.docx | Bin 0 -> 8400 bytes .../main/resources/mapper/WxBillAllMapper.xml | 4 ++- 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/resources/contract-word-template/owe_bill.docx 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 0000000000000000000000000000000000000000..7dddd89eed88c2ccef55395c33d2d6e93cae3f5d GIT binary patch literal 8400 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 b4ESGBOGO?5@vq0wpr2dlHfbmQ>+b&mrdyf8 literal 0 HcmV?d00001 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