From a289154e97f0fb6c7fd181e551627667215c7712 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 7 May 2024 13:38:10 +0800 Subject: [PATCH] fix --- .../controller/rent/WxBillAllController.java | 98 +++++++++---------- .../domain/po/base/WxBillBaseEntity.java | 5 + .../resources/mapper/WxBillDailyMapper.xml | 5 +- .../resources/mapper/WxBillDepositMapper.xml | 5 +- .../mapper/WxBillOtherDepositMapper.xml | 6 +- .../resources/mapper/WxBillOtherMapper.xml | 6 +- .../mapper/WxBillPropertyDepositMapper.xml | 6 +- .../resources/mapper/WxBillPropertyMapper.xml | 5 +- .../mapper/WxBillRentManageMapper.xml | 5 +- .../resources/mapper/WxBillRentMapper.xml | 6 +- 10 files changed, 82 insertions(+), 65 deletions(-) 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 83d2feed4..dfee69e20 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -317,31 +317,31 @@ public class WxBillAllController extends BaseController { } -// /** -// * 欠缴商户列表 -// * @param wxBillAll -// * @param pageNum -// * @param pageSize -// * @return -// */ -// @GetMapping("oweMerchantlist") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), -// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) -// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") -// public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { -// logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist"); -// if (null == wxBillAll) { -// wxBillAll = new WxBillAll(); -// } -// //默认查当月第一天到今天 -// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ -// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); -// } -// wxBillAll.updateTenantInfo(getTenantInfo()); -// Map result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); -// return new ResultData(result); -// } + /** + * 欠缴商户列表 + * @param wxBillAll + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("oweMerchantlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") + public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + //默认查当月第一天到今天 + if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ + wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); + } + wxBillAll.updateTenantInfo(getTenantInfo()); + Map result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); + return new ResultData(result); + } @@ -422,30 +422,30 @@ public class WxBillAllController extends BaseController { // } -// /** -// * 应收、承付商户列表 -// * @param wxBillAll -// * @param pageNum -// * @param pageSize -// * @return -// */ -// @GetMapping("receiveAndPayMerchantlist") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), -// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) -// @SystemControllerLog(description = "账单管理-应收、承付商户列表") -// @ApiOperation("应收、承付商户列表") -// public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { -// logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); -// if (null == wxBillAll) { -// wxBillAll = new WxBillAll(); -// } -// wxBillAll.updateTenantInfo(getTenantInfo()); -// PageInfo page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); -// Map result = new HashMap<>(); -// result.put("pageInfo", page); -// return new ResultData(result); -// } + /** + * 应收、承付商户列表 + * @param wxBillAll + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("receiveAndPayMerchantlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "账单管理-应收、承付商户列表") + @ApiOperation("应收、承付商户列表") + public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + wxBillAll.updateTenantInfo(getTenantInfo()); + PageInfo page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); + Map result = new HashMap<>(); + result.put("pageInfo", page); + return new ResultData(result); + } /** * 导出应收、承付商户列表 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java index cc6d8458a..fb0404e2d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java @@ -64,9 +64,14 @@ public class WxBillBaseEntity extends TenantEntity { @TableField(exist = false) protected String realReceivePay; + @Excel(name = "实际应收总金额(元)(包括滞纳金服务费等)", width = 20, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") protected String billTypeName; + @Excel(name = "实际应收总金额(元)(包括滞纳金服务费等)", width = 20, orderNum = "9") + @io.swagger.annotations.ApiModelProperty(value="备注",name="billRemark") + protected String billRemark; + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") @TableField(exist = false) protected Long building; diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index a102eb562..adeaaea75 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -33,12 +33,13 @@ + `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`, `tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`, - `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay, + `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`bill_remark`, case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name @@ -119,7 +120,7 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id, br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, - br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, + br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`bill_remark`, case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name from wx_bill_daily br diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 121a9ce14..65a6899cf 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`,`owe`,`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 + `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark @@ -96,7 +97,7 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, br.`owe`,br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, - br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay + br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他押金' bill_type_name,CONCAT(`name`,',',`comments`) bill_remark from wx_bill_other_deposit br order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index f08579135..ced162dfa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -35,12 +35,14 @@ + `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`, - `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`,'其他费用' bill_type_name + `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`, + '其他费用' bill_type_name, CONCAT(`name`,',',`comments`) bill_remark @@ -118,7 +120,7 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, case when br.status=1 then br.owe else 0 end owe,br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`, br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`, - br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他费用' bill_type_name + br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他费用' bill_type_name, CONCAT(br.`name`,',',br.`comments`) bill_remark from wx_bill_other br order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 2b1c9953a..8194019e3 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -32,12 +32,14 @@ + `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, `pay_date`,`createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`, - `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay,'物业押金' bill_type_name + `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay, + '物业押金' bill_type_name,'' bill_remark @@ -127,7 +129,7 @@