From fbbafcf8a5c9b1ccd20c86dc974e47c7552de02b Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 8 Oct 2024 09:50:59 +0800 Subject: [PATCH] fix --- .../contract/WxAgileContractController.java | 13 +++++++-- .../po/WxRentContractAgileUnDeposit.java | 2 ++ .../service/WxAgileContractService.java | 4 ++- .../impl/WxAgileContractServiceImpl.java | 28 +++++++++++++++++-- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 1805faa6d..0a9aa1e2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -316,12 +316,21 @@ public class WxAgileContractController extends WxContractBaseController { } /** - * 查询非押金 + * 查询非押金明细 */ @GetMapping("getUnDeposits") public ResultData getUnDeposits(@ModelAttribute WxRentContractAgileUnDeposit unDeposit) { unDeposit.updateTenantInfo(getTenantInfo()); - return new ResultData(wxAgileContractService.findUnDeposit(unDeposit)); + return new ResultData(wxAgileContractService.findUnDepositDetail(unDeposit)); + } + + /** + * 查询非押金 + */ + @GetMapping("getUnDepositList") + public ResultData getUnDepositList(@ModelAttribute WxRentContractAgileUnDeposit unDeposit) { + unDeposit.updateTenantInfo(getTenantInfo()); + return new ResultData(wxAgileContractService.findUnDepositDetail(unDeposit)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java index c27e1ff93..50751852d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java @@ -46,6 +46,8 @@ public class WxRentContractAgileUnDeposit extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId") private Long feesId; + @TableField(exist = false) + private String feesName; @io.swagger.annotations.ApiModelProperty(value="单价",name="price") private String price; diff --git a/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java b/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java index 6b8b13086..9a15b7559 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java @@ -27,7 +27,9 @@ public interface WxAgileContractService { void saveUnDeposit(WxRentContractAgileUnDeposit unDeposit); - WxRentContractAgileUnDeposit findUnDeposit(WxRentContractAgileUnDeposit unDeposit); + WxRentContractAgileUnDeposit findUnDepositDetail(WxRentContractAgileUnDeposit unDeposit); + + List findUnDepositList(WxRentContractAgileUnDeposit unDeposit); void createUnDepositBill(WxRentContractAgileUnDeposit unDeposit,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index b10c4972b..0b0beaa70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -297,8 +297,12 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } @Override - public WxRentContractAgileUnDeposit findUnDeposit(WxRentContractAgileUnDeposit unDeposit) { - WxRentContractAgileUnDeposit ud = wxRentContractAgileUnDepositMapper.selectById(unDeposit.getId(), unDeposit.getTenantId()); + public WxRentContractAgileUnDeposit findUnDepositDetail(WxRentContractAgileUnDeposit unDeposit) { + List list = wxRentContractAgileUnDepositMapper.findList(unDeposit); + if (null == list || list.size() <= 0 ) { + return null; + } + WxRentContractAgileUnDeposit ud = list.get(0); if (null == ud) { return null; } @@ -308,6 +312,26 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { ud.setItems(wxRentContractAgileUnDepositItemMapper.findList(itemq)); return ud; } + + @Override + public List findUnDepositList(WxRentContractAgileUnDeposit unDeposit) { + List list = wxRentContractAgileUnDepositMapper.findList(unDeposit); + if (null == list || list.size() <= 0 ) { + return null; + } + WxEnergyFees fq = new WxEnergyFees(); + fq.updateTenantInfo(unDeposit); + fq.setIsDel(EnumYesOrNo.NO.getCode()); + Map feesMap = wxEnergyService.getFeesMap(fq); + for (int i = 0 ; i < list.size() ; i ++) { + WxRentContractAgileUnDeposit ud = list.get(i); + WxEnergyFees fees = feesMap.get(ud.getFeesId()); + if (null != fees) { + ud.setFeesName(fees.getName()); + } + } + return list; + } @Override