diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 59ae952cf..aac7cb8fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -64,6 +64,19 @@ public class WxRentContractController extends WxContractBaseController { @Autowired WxMallFloorService floorService; + /** + * 押金类型 + * @return + */ + @GetMapping("depositType") + public ResultData billTypes() { + Map tmap = new HashMap(); + for (EnumRentContractDepositType t : EnumRentContractDepositType.values()) { + tmap.put(t.getCode(), t.getMessage()); + } + return new ResultData(tmap); + } + @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 824485826..383dc45a2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -85,12 +85,31 @@ public class WxBillDailyController extends BillBaseController { wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); } - } final PageInfo page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); return new ResultData(page); } + @GetMapping("exportBill") + @SystemControllerLog(description = "日常费用账单-导出") + public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) { + wxBillDaily.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillDaily.setFloorForRule(dataRule.getFloorIds()); + wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillDaily.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { + wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { + wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + } + wxBillDailyService.exportBill(request, response, wxBillDaily); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillDaily wxBillDaily) { if (StringUtils.isBlank(wxBillDaily.getMonth())) { @@ -278,16 +297,4 @@ public class WxBillDailyController extends BillBaseController { return new ResultData(Result.SUCCESS, "查询成功", entries); } - @GetMapping("exportBill") - @SystemControllerLog(description = "日常费用账单-导出") - public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) { - wxBillDaily.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxBillDaily.setFloorForRule(dataRule.getFloorIds()); - wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); - } - wxBillDailyService.exportBill(request, response, wxBillDaily); - } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index c392a937e..a5a1e13b7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -17,6 +17,10 @@ import com.iformall.service.helper.WxBillAllHelper; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +69,26 @@ public class WxBillDepositController extends BillBaseController { return new ResultData(page); } + @GetMapping("exportBill") + public void exportBill(@ModelAttribute WxBillDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) { + wxBillDeposit.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillDeposit.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { + wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { + wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + + } + wxBillDepositService.exportBill(request, response, wxBillDeposit); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillDeposit wxBillDeposit) { if (StringUtils.isBlank(wxBillDeposit.getMonth())) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index b192b5921..7b54775f6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -60,13 +60,32 @@ public class WxBillOtherController extends BillBaseController { wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); } - } wxBillOther.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); return new ResultData(page); } + @GetMapping("exportBill") + @SystemControllerLog(description = "其它账单-导出") + public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) { + wxBillOther.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillOther.setFloorForRule(dataRule.getFloorIds()); + wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillOther.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { + wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { + wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + } + wxBillOtherService.exportBill(request, response, wxBillOther); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillOther wxBillOther) { if (StringUtils.isBlank(wxBillOther.getMonth())) { @@ -131,16 +150,4 @@ public class WxBillOtherController extends BillBaseController { return wxBillOtherService.updatePaid(id); } - @GetMapping("exportBill") - @SystemControllerLog(description = "其它账单-导出") - public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) { - wxBillOther.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxBillOther.setFloorForRule(dataRule.getFloorIds()); - wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); - } - wxBillOtherService.exportBill(request, response, wxBillOther); - } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index e4415abcd..7560eac19 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -61,13 +61,32 @@ public class WxBillOtherDepositController extends BillBaseController { wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); } - } wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); return new ResultData(page); } + @GetMapping("exportBill") + @SystemControllerLog(description = "其它押金账单-导出") + public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillOtherDeposit, HttpServletRequest request, HttpServletResponse response) { + wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillOtherDeposit.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { + wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { + wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + } + wxBillOtherDepositService.exportBill(request, response, wxBillOtherDeposit); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillOtherDeposit wxBillOtherDeposit) { if (StringUtils.isBlank(wxBillOtherDeposit.getMonth())) { @@ -142,16 +161,4 @@ public class WxBillOtherDepositController extends BillBaseController { return wxBillOtherDepositService.adjustDeposit(wxBillDeposit); } - @GetMapping("exportBill") - @SystemControllerLog(description = "其它押金账单-导出") - public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) { - wxBillDeposit.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxBillDeposit.setFloorForRule(dataRule.getFloorIds()); - wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds()); - } - wxBillOtherDepositService.exportBill(request, response, wxBillDeposit); - } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index f154c9a6b..3d90a74fe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -63,13 +63,32 @@ public class WxBillPropertyController extends BillBaseController { wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); } - } wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); PageInfo result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } + @GetMapping("exportBill") + @SystemControllerLog(description = "物业账单-导出") + public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) { + wxBillProperty.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillProperty.setFloorForRule(dataRule.getFloorIds()); + wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillProperty.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { + wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { + wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + } + wxBillPropertyService.exportBill(request, response, wxBillProperty); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillProperty wxBillProperty) { if (StringUtils.isBlank(wxBillProperty.getMonth())) { @@ -155,15 +174,4 @@ public class WxBillPropertyController extends BillBaseController { return wxBillPropertyService.updateLatePayStatus(wxBillProperty); } - @GetMapping("exportBill") - @SystemControllerLog(description = "物业账单-导出") - public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) { - wxBillProperty.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxBillProperty.setFloorForRule(dataRule.getFloorIds()); - wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); - } - wxBillPropertyService.exportBill(request, response, wxBillProperty); - } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index 31cf9dbc4..d7ffc0e5b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -7,6 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BillBaseController; +import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; @@ -17,6 +18,10 @@ import com.iformall.service.helper.WxBillAllHelper; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +70,26 @@ public class WxBillPropertyDepositController extends BillBaseController { return new ResultData(result); } + @GetMapping("exportBill") + public void exportBill(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit, HttpServletRequest request, HttpServletResponse response) { + wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillPropertyDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillPropertyDeposit.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { + wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { + wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + + } + wxBillPropertyDepositService.exportBill(request, response, wxBillPropertyDeposit); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit) { if (StringUtils.isBlank(wxBillPropertyDeposit.getMonth())) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 09226761c..a2656f762 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -70,6 +70,27 @@ public class WxBillRentController extends BillBaseController { return new ResultData(page); } + @GetMapping("exportBill") + @SystemControllerLog(description = "租赁押金账单-导出") + public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { + wxBillRent.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillRent.setFloorForRule(dataRule.getFloorIds()); + wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillRent.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { + wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { + wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + + } + wxBillRentService.exportBill(request, response, wxBillRent); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillRent wxBillRent) { if (StringUtils.isBlank(wxBillRent.getMonth())) { @@ -166,16 +187,4 @@ public class WxBillRentController extends BillBaseController { return wxBillRentService.updateLatePayStatus(wxBillRent); } - @GetMapping("exportBill") - @SystemControllerLog(description = "租赁押金账单-导出") - public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { - wxBillRent.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxBillRent.setFloorForRule(dataRule.getFloorIds()); - wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); - } - wxBillRentService.exportBill(request, response, wxBillRent); - } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java index aea17e8a5..7952b47bb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -64,13 +64,32 @@ public class WxBillRentManageController extends BillBaseController { wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); } - } wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); return new ResultData(page); } + @GetMapping("exportBill") + @SystemControllerLog(description = "租赁押金账单-导出") + public void exportBill(@ModelAttribute WxBillRentManage wxBillRentManage, HttpServletRequest request, HttpServletResponse response) { + wxBillRentManage.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillRentManage.setFloorForRule(dataRule.getFloorIds()); + wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != wxBillRentManage.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { + wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { + wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + } + } + wxBillRentManageService.exportBill(request, response, wxBillRentManage); + } + @GetMapping("monthBillSum") public ResultData monthBillSum(@ModelAttribute WxBillRentManage wxBillRentManage) { if (StringUtils.isBlank(wxBillRentManage.getMonth())) { @@ -165,17 +184,4 @@ public class WxBillRentManageController extends BillBaseController { return wxBillRentManageService.updateLatePayStatus(wxBillRent); } - @GetMapping("exportBill") - @SystemControllerLog(description = "租赁押金账单-导出") - public void exportBill(@ModelAttribute WxBillRentManage wxBillRent, HttpServletRequest request, HttpServletResponse response) { - wxBillRent.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxBillRent.setFloorForRule(dataRule.getFloorIds()); - wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); - } - wxBillRentManageService.exportBill(request, response, wxBillRent); - } - - } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202405003.sql b/mallinkAdmin/src/main/resources/db/migration/V202405003.sql index 8e30ceb4b..b6ca42425 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202405003.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202405003.sql @@ -5,4 +5,6 @@ ALTER TABLE wx_bill_property DROP COLUMN owe; ALTER TABLE wx_bill_property_deposit DROP COLUMN owe; ALTER TABLE wx_bill_daily DROP COLUMN owe; ALTER TABLE wx_bill_other DROP COLUMN owe; -ALTER TABLE wx_bill_other_deposit DROP COLUMN owe; \ No newline at end of file +ALTER TABLE wx_bill_other_deposit DROP COLUMN owe; + +ALTER TABLE wx_bill_rent_deposit ADD COLUMN contract_depoist_detail VARCHAR(1000) COMMENT '合同押金详细'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 3a3b593db..c86b91d95 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -34,7 +34,7 @@ public class WxBillDaily extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="账单类型EnumBillDailyType",name="type") private Integer type; - @Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd") + //@Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd") @NotNull @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 237b310c6..964c93131 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; +import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,14 +23,17 @@ public class WxBillDeposit extends WxBillBaseEntity { @TableField(exist = false) private String shopNumber; + @Excel(name = "租金合同ID", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; @io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay") private String needPay; @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; + @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; + @Excel(name = "创建日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") @@ -63,6 +67,9 @@ public class WxBillDeposit extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") private String serviceChargePay; + + @io.swagger.annotations.ApiModelProperty(value = "合同押金详细", name = "contractDepoistDetail") + private String contractDepoistDetail; @TableField(exist = false) private String serviceChargePayBefore; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index beca818a2..96adea403 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -37,7 +37,7 @@ public class WxBillOther extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="账单备注",name="comments") private String comments; - @Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") + //@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; @@ -45,10 +45,11 @@ public class WxBillOther extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; + @Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - @Excel(name = "逾期(天)", orderNum = "10", width = 20) + //@Excel(name = "逾期(天)", orderNum = "10", width = 20) @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 9138190a9..5d6c3ae3d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -39,6 +39,7 @@ public class WxBillOtherDeposit extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate") private Date payDate; + @Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") private Date createtime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 61a1239fb..79618cd8a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -35,7 +35,7 @@ public class WxBillProperty extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay") private String needPay; - @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") + //@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; @@ -45,7 +45,7 @@ public class WxBillProperty extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - @Excel(name = "逾期(天) ", width = 20, orderNum = "13") + //@Excel(name = "逾期(天) ", width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus") @@ -104,7 +104,7 @@ public class WxBillProperty extends WxBillBaseEntity { @TableField(exist = false) private String shopNumber; - @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") + //@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @TableField(exist = false) private Integer depositStatus; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 1d555f78f..bf42d80cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.WxBillBaseEntity; +import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,14 +23,17 @@ public class WxBillPropertyDeposit extends WxBillBaseEntity { @TableField(exist = false) private String shopNumber; + @Excel(name = "物业合同ID", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") private Long propertyContractId; @io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay") private String needPay; @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; + @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; + @Excel(name = "创建日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 476b810d8..f07e37397 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -33,7 +33,7 @@ public class WxBillRent extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay") private String needPay; - @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13") + //@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="收款截止日期,过了有手续费",name="receiveDate") private Date receiveDate; @@ -44,7 +44,7 @@ public class WxBillRent extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - @Excel(name = "逾期(天) ", width = 20, orderNum = "14") + //@Excel(name = "逾期(天) ", width = 20, orderNum = "14") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; @@ -148,7 +148,7 @@ public class WxBillRent extends WxBillBaseEntity { @TableField(exist = false) private String shopNumber; - @Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") + //@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @TableField(exist = false) private Integer depositStatus; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java index e284f3f2f..2e3ba94d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java @@ -34,7 +34,7 @@ public class WxBillRentManage extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay") private String needPay; - @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13") + //@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; @@ -45,7 +45,7 @@ public class WxBillRentManage extends WxBillBaseEntity { @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - @Excel(name = "逾期(天) ", width = 20, orderNum = "14") + //@Excel(name = "逾期(天) ", width = 20, orderNum = "14") @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index eaff227b0..20ea31276 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -8,6 +8,7 @@ import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumRentContractAdjustPeriod; +import com.iformall.enums.EnumRentContractDepositType; import com.iformall.enums.EnumRentContractType; import lombok.Data; @@ -245,7 +246,7 @@ public class WxRentContract extends TenantEntity { // @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "depositInfo") // private String depositInfo; - @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeContentLsit") + @io.swagger.annotations.ApiModelProperty(value = "押金详细EnumRentContractDepositType", name = "cashtypeContentLsit") private String cashtypeContentLsit; @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeLsit") private String cashtypeLsit; @@ -480,6 +481,44 @@ public class WxRentContract extends TenantEntity { return shopList; } + public String getRentInfoShopNumber() { + StringBuffer sb = new StringBuffer(""); + String rentInfo = this.getRentInfo(); + if (!StringUtils.isBlank(rentInfo)) { + JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); + int size = rentInfoArray.size(); + for (int i = 0; i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + String shopNumber = rentInfoObject.getString("shopNumber"); + if (StringUtils.isNotBlank(shopNumber)) { + sb.append(shopNumber).append(","); + } + } + } + return sb.toString(); + } + + public String getDepositDetail() { + StringBuffer sb = new StringBuffer(""); + String dsdstr = this.getCashtypeContentLsit(); + if (!StringUtils.isBlank(dsdstr)) { + JSONArray rentInfoArray = JSONArray.parseArray(dsdstr); + int size = rentInfoArray.size(); + for (int i = 0; i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + String depositType = rentInfoObject.getString("value"); + String deposit = rentInfoObject.getString("deposit"); + Integer dt = Integer.parseInt(depositType); + EnumRentContractDepositType de = EnumRentContractDepositType.getEnum(dt); + if (null != dt && StringUtils.isNotBlank(deposit)) { + sb.append(de.getMessage()).append(":").append(deposit).append(","); + } + + } + } + return sb.toString(); + } + @TableField(exist = false) private List merchantIds; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java index 26ea6faae..df08ffd9f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java @@ -25,14 +25,16 @@ public class WxBillDailyExportVo { private String payStr; @Excel(name = "欠缴金额(元)", orderNum = "6", width = 20) private String oweStr; - @Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") + //@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") private Date receiveDate; @Excel(name = "收款日期", orderNum = "8", width = 20, format = "yyyy-MM-dd") private Date payDate; @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "9") private Integer status; - @Excel(name = "逾期(天)", orderNum = "10", width = 20) + //@Excel(name = "逾期(天)", orderNum = "10", width = 20) private Long expiredDay; + @Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss") + private Date createtime; private String receivePay; private String pay; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractDepositType.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractDepositType.java new file mode 100644 index 000000000..b921f9603 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractDepositType.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + + +public enum EnumRentContractDepositType { + + COMMON(0,"一般押金"), + CONTRACT_DEPOSIT(1,"合同保证金"), + QUALITY_DEPOSIT(2,"质量保证金") + ; + + public static EnumRentContractDepositType getEnum(Integer code) { + for (EnumRentContractDepositType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumRentContractDepositType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index f8cc56de7..417ea1460 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -2,6 +2,9 @@ package com.iformall.service; import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; @@ -62,5 +65,7 @@ public interface WxBillDepositService { List getMerchantIds(WxBillDeposit wxBillDeposit); WxBillHotNotify getBillHotNotify(WxBillDeposit wxBillDeposit); + + void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index 2a89e8992..35bd16543 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -2,6 +2,9 @@ package com.iformall.service; import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; @@ -65,4 +68,6 @@ public interface WxBillPropertyDepositService { List getMerchantIds(WxBillPropertyDeposit deposit); WxBillHotNotify getBillHotNotify(WxBillPropertyDeposit deposit); + + public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillPropertyDeposit deposit) ; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index e4f72c7f3..1a3629ace 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -458,6 +458,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDailyExportVo.setExpiredDay(b.getExpiredDay()); wxBillDailyExportVo.setStatus(b.getStatus()); wxBillDailyExportVo.setType(b.getType()); + wxBillDailyExportVo.setCreatetime(b.getCreatetime()); datalist.add(wxBillDailyExportVo); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 39f59ca74..78dfe3609 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -14,6 +15,7 @@ import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.WxBillHotNotify; import com.iformall.domain.vo.WxBillSum; @@ -21,8 +23,11 @@ import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillPayWay; import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumDelStatus; +import com.iformall.enums.EnumRentShopType; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDepositMapper; +import com.iformall.mapper.WxRentContractMapper; +import com.iformall.service.ExcelService; import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillDepositService; import com.iformall.service.WxMerchantService; @@ -40,10 +45,16 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @author gongbiao @@ -68,6 +79,12 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Lazy @Autowired WxShopService wxShopService; + + @Autowired + ExcelService excelService; + + @Autowired + WxRentContractMapper wxRentContractMapper; @Override public PageInfo listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { @@ -109,6 +126,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { private PageInfo getBillDepositPropertyList(WxPayAccountBill wxPayAccountBill,WxBillDeposit record, Integer pageIndex, Integer pageSize) { setQueryParam(record); + PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillDepositMapper.queryBillDepositList(record)); if (null == page) { return null; @@ -118,9 +136,21 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wq.updateTenantInfo(record); Map merchantMap = wxMerchantService.findMerchantMap(wq); - WxShop sq = new WxShop(); - sq.updateTenantInfo(record); - Map shopMap = wxShopService.findShopMap(sq); + List rentContractIdList = wxBillDepositMapper.findRentContractIds(record); + Map rentContractMap = new HashMap(); + Map billDepositMap = new HashMap(); + if ( null != rentContractIdList && rentContractIdList.size() > 0 ) { + WxRentContract rcq = new WxRentContract(); + rcq.updateTenantInfo(record); + rcq.setIds(rentContractIdList); + List rlist = wxRentContractMapper.findList(rcq); + if (null != rlist && rlist.size() > 0 ) { + for (int i = 0 ; i < rlist.size(); i++) { + WxRentContract rc = rlist.get(i); + rentContractMap.put(rc.getId(), rc); + } + } + } if (null != page.getList()) { for (int i = 0 ; i < page.getList().size() ; i ++) { @@ -135,11 +165,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { } } - if (null != e.getShopId()) { - WxShop shop = shopMap.get(e.getShopId()); - if (null != shop) { - e.setShopNumber(shop.getShopNumber()); - } + WxRentContract rent = rentContractMap.get(e.getRentContractId()); + if (null != rent) { + e.setShopNumber(rent.getRentInfoShopNumber()); } } @@ -383,5 +411,17 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return wxBillDepositMapper.getBillHotNotify(wxBillDeposit); } + @Override + public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDeposit wxBillDeposit) { + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDeposit); + String billName = wxBillDeposit.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租赁押金账单" : "多经点位租赁押金账单"; + PageInfo billRentList = getBillDepositPropertyList(wxPayAccountBill,wxBillDeposit,1,10000); + if (null == billRentList || null == billRentList.getList()) { + return ; + } + excelService.exportExcel(billRentList.getList(),null, billName, WxBillDeposit.class, billName + ".xlsx", response, false); + + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index d65a27011..9ab6cf880 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -21,8 +21,10 @@ import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillPayWay; import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumDelStatus; +import com.iformall.enums.EnumRentShopType; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPropertyDepositMapper; +import com.iformall.service.ExcelService; import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillPropertyDepositService; import com.iformall.service.WxMerchantService; @@ -45,6 +47,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @author gongbiao */ @@ -66,6 +71,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Lazy @Autowired WxShopService wxShopService; + + @Autowired + ExcelService excelService; @Override public PageInfo listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { @@ -380,4 +388,16 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe updateQueryParam(deposit); return wxBillPropertyDepositMapper.getBillHotNotify(deposit); } + + @Override + public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillPropertyDeposit deposit) { + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(deposit); + String billName = deposit.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺物业押金账单" : "多经点位物业押金账单"; + PageInfo billRentList = getBillDepositPropertyList(wxPayAccountBill,deposit,1,10000); + if (null == billRentList || null == billRentList.getList()) { + return ; + } + excelService.exportExcel(billRentList.getList(),null, billName, WxBillPropertyDeposit.class, billName + ".xlsx", response, false); + + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 4085549dd..4f660bccd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -902,6 +902,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxBillDeposit wxBillDeposit = new WxBillDeposit(); wxBillDeposit.setId(idWorker.nextId()); wxBillDeposit.setRentContractId(wxRentContract.getId()); + wxBillDeposit.setContractDepoistDetail(wxRentContract.getDepositDetail()); wxBillDeposit.setPay("0"); String needpay = wxRentContract.getDeposit(); wxBillDeposit.setReceivePay(needpay); diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 72b22741b..f298a52e6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -32,12 +32,13 @@ + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`, `expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`, - `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark + `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark,contract_depoist_detail @@ -66,7 +67,27 @@ and `updatetime` = #{updatetime} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} - + + and `contract_depoist_detail` like concat('%', #{contractDepoistDetail},'%') + + + and `starttime` <= #{starttime} + and `endtime` >= #{endtime} + + and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} + + + and (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` > 0 and status not in (3,6)) + + + and (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and status not in (3,6)) + + + and `merchant_id` in + + #{midItem} + + and rent_contract_id in @@ -94,7 +115,7 @@