diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryQuery.java index 73b78862d4..0d8abac753 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryQuery.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; +import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +10,7 @@ import lombok.Data; * @date 2024/11/5 16:12 */ @Data -public class CustomerBillSummaryQuery { +public class CustomerBillSummaryQuery implements Query { @ApiModelProperty("合同编号") private String contractNo; // 合同编号 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java index f03dac2e3b..c110f7640c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java @@ -47,7 +47,7 @@ public class CustomerBillSummaryVo implements Vo { @ApiModelProperty("客户名称") private String customerName; // 客户名称 @ApiModelProperty("应收金额") - private String receivableMoney; // 当前应收金额 + private String reveivableMoney; // 当前应收金额 @ApiModelProperty("认款金额") private String subscriptionMoney; // 认款金额 @ApiModelProperty("未认款金额") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerDetailsVo.java new file mode 100644 index 0000000000..e9eec2a284 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerDetailsVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/6 10:16 + */ +@Data +public class CustomerDetailsVo implements Vo { + + @ApiModelProperty("应收sid") + private String receivablesSid; // 应收sid + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + @ApiModelProperty("应收款项状态 01正常,02作废") + private String kxState; // 应收款项状态 01正常,02作废 + @ApiModelProperty("应收金额") + private String reveivableMoney; // 当前应收金额 + @ApiModelProperty("认款金额") + private String subscriptionMoney; // 认款金额 + @ApiModelProperty("未认款金额") + private String noSubscriptionMoney; // 未认款金额 + @ApiModelProperty("生成时间") + private String createTime; // 生成时间 +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeListVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeListVo.java new file mode 100644 index 0000000000..9a22b3d461 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeListVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/6 10:31 + */ +@Data +public class CustomerThreeListVo { + + private String collectionDate;//收款日期 + private String collectionMoney; //收款金额 + private String payType; //付款方式 + private String billNo;//单据编号 + private String sid; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeVo.java new file mode 100644 index 0000000000..da7f3d39c2 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerThreeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/11/6 10:31 + */ +@Data +public class CustomerThreeVo { + +private String customerName; +private String contractNo; +private String vinNo; +private String receivablesName; +private String reveivableMoney; +private String subscriptionMoney; + +private List list = new ArrayList<>(); + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 69da0119eb..3a1bf8ad2a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -71,7 +71,16 @@ public interface FinUncollectedReceivablesDetailedFeign { @ApiOperation("客户账单汇总分页列表") @PostMapping("/customerBillListPage") - public ResultBean> customerBillListPage(@RequestBody PagerQuery pq); + public ResultBean> customerBillListPage(@RequestBody PagerQuery pq); + + @ApiOperation("客户账单二级列表") + @PostMapping("/customerBillDetailsList") + public ResultBean> customerBillDetailsList(@RequestParam("contractNo") String contractNo); + + @ApiOperation("客户账单三级列表") + @PostMapping("/customerBillThreeDetails") + public ResultBean customerBillThreeDetails(@RequestParam("receivablesSid") String receivablesSid); + @ApiOperation("客户账单明细分页列表") @PostMapping("/customerBillDetailedListPage") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index f90b735399..1494e6a81d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -67,7 +67,17 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll } @Override - public ResultBean> customerBillListPage(PagerQuery pq) { + public ResultBean> customerBillListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> customerBillDetailsList(String contractNo) { + return null; + } + + @Override + public ResultBean customerBillThreeDetails(String receivablesSid) { return null; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 7a5df7d48c..d0b740294b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -130,4 +130,12 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper getCustomerSummaryList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + List customerBillDetailsList(@Param("contractNo") String contractNo); + + CustomerThreeVo selCustomerThreeDetails(@Param("receivablesSid") String receivablesSid); + + List selCustomerThreeListDetails(@Param("receivablesSid") String receivablesSid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index f465e5d4d5..83d6ca12f7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -646,4 +646,238 @@ AND sd.receivablesName = '订金' AND sd.auditState = '3' + + + + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 5f84e72b3b..40dbb953f6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -89,12 +89,22 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece } @Override - public ResultBean> customerBillListPage(PagerQuery pq) { + public ResultBean> customerBillListPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = finUncollectedReceivablesDetailedService.listPageVo(pq); return rb.success().setData(pv); } + @Override + public ResultBean> customerBillDetailsList(String contractNo) { + return finUncollectedReceivablesDetailedService.customerBillDetailsList(contractNo); + } + + @Override + public ResultBean customerBillThreeDetails(String receivablesSid) { + return finUncollectedReceivablesDetailedService.customerBillThreeDetails(receivablesSid); + } + @Override public ResultBean> customerBillDetailedListPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 85b0e80e57..95f5a7958c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -278,83 +278,83 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService baseMapper.updateCurRecMoneyBySid(curRecMoney, sid); } - public PagerVo listPageVo(PagerQuery pq) { - FinUncollectedReceivablesDetailedQuery params = pq.getParams(); - String staffSid = params.getCreateBySid(); - ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); - List data2 = sysStaffOrgListByStaffSid.getData(); - String orgSidPath = ""; - for (SysStaffOrgVo datum : data2) { - orgSidPath = datum.getOrgSidPath(); - String[] split = orgSidPath.split("/"); - for (String s : split) { - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s); - SysOrganizationVo data1 = sysOrganizationVoResultBean.getData(); - Integer isDept = data1.getIsDept(); - String psid = data1.getPsid(); - if (isDept == 0 && !psid.equals(0)) { - orgSidPath = s; - break; - } - } - } - params.setUseOrgSid(orgSidPath); - QueryWrapper qw = createQueryWrapper(params); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (FinUncollectedReceivablesDetailedVo record : records) { - BigDecimal totalDeposit = new BigDecimal(0); - BigDecimal totalPrice = new BigDecimal(0); - BigDecimal noSubscriptionMoney = new BigDecimal(0); - String sid = record.getContractSid(); - String contractNo = record.getContractNo(); - String receivablesName = record.getReceivablesName(); - String paymentTypeValue = record.getPaymentTypeValue(); - ResultBean commonContractVoResultBean = commonContractFeign.fetchBySid(sid); - CommonContractVo data = commonContractVoResultBean.getData(); - if (receivablesName.equals("订金")) { - BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit()); - BigDecimal num = new BigDecimal(data.getNum()); - totalDeposit = oneDeposit.multiply(num); - record.setCurrentReceivableMoney(String.valueOf(totalDeposit)); - } else if (receivablesName.equals("车款")) { - BigDecimal price = new BigDecimal(data.getPrice()); - BigDecimal num = new BigDecimal(data.getNum()); - totalPrice = price.multiply(num); - record.setCurrentReceivableMoney(String.valueOf(totalPrice)); - } - List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectGroupConAndRecAndPay(); - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - String receivablesName1 = finSelectedReceivablesDetailedVo.getReceivablesName(); - String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney(); - if (receivablesName1.equals("订金")) { - record.setSubscriptionMoney(subscriptionMoney); - noSubscriptionMoney = totalDeposit.subtract(new BigDecimal(subscriptionMoney)); - record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney)); - if (subscriptionMoney.equals(0)) { - record.setSubscriptionState("未认款"); - } else if (subscriptionMoney.equals(totalDeposit)) { - record.setSubscriptionState("已认款"); - } else { - record.setSubscriptionState("部分认款"); - } - } else if (receivablesName1.equals("车款")) { - noSubscriptionMoney = totalPrice.subtract(new BigDecimal(subscriptionMoney)); - record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney)); - if (subscriptionMoney.equals(0)) { - record.setSubscriptionState("未认款"); - } else if (subscriptionMoney.equals(totalPrice)) { - record.setSubscriptionState("已认款"); - } else { - record.setSubscriptionState("部分认款"); - } - } - } - } - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } +// public PagerVo listPageVo(PagerQuery pq) { +// FinUncollectedReceivablesDetailedQuery params = pq.getParams(); +// String staffSid = params.getCreateBySid(); +// ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); +// List data2 = sysStaffOrgListByStaffSid.getData(); +// String orgSidPath = ""; +// for (SysStaffOrgVo datum : data2) { +// orgSidPath = datum.getOrgSidPath(); +// String[] split = orgSidPath.split("/"); +// for (String s : split) { +// ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s); +// SysOrganizationVo data1 = sysOrganizationVoResultBean.getData(); +// Integer isDept = data1.getIsDept(); +// String psid = data1.getPsid(); +// if (isDept == 0 && !psid.equals(0)) { +// orgSidPath = s; +// break; +// } +// } +// } +// params.setUseOrgSid(orgSidPath); +// QueryWrapper qw = createQueryWrapper(params); +// IPage page = PagerUtil.queryToPage(pq); +// IPage pagging = baseMapper.selectPageVo(page, qw); +// List records = pagging.getRecords(); +// for (FinUncollectedReceivablesDetailedVo record : records) { +// BigDecimal totalDeposit = new BigDecimal(0); +// BigDecimal totalPrice = new BigDecimal(0); +// BigDecimal noSubscriptionMoney = new BigDecimal(0); +// String sid = record.getContractSid(); +// String contractNo = record.getContractNo(); +// String receivablesName = record.getReceivablesName(); +// String paymentTypeValue = record.getPaymentTypeValue(); +// ResultBean commonContractVoResultBean = commonContractFeign.fetchBySid(sid); +// CommonContractVo data = commonContractVoResultBean.getData(); +// if (receivablesName.equals("订金")) { +// BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit()); +// BigDecimal num = new BigDecimal(data.getNum()); +// totalDeposit = oneDeposit.multiply(num); +// record.setCurrentReceivableMoney(String.valueOf(totalDeposit)); +// } else if (receivablesName.equals("车款")) { +// BigDecimal price = new BigDecimal(data.getPrice()); +// BigDecimal num = new BigDecimal(data.getNum()); +// totalPrice = price.multiply(num); +// record.setCurrentReceivableMoney(String.valueOf(totalPrice)); +// } +// List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectGroupConAndRecAndPay(); +// for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { +// String receivablesName1 = finSelectedReceivablesDetailedVo.getReceivablesName(); +// String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney(); +// if (receivablesName1.equals("订金")) { +// record.setSubscriptionMoney(subscriptionMoney); +// noSubscriptionMoney = totalDeposit.subtract(new BigDecimal(subscriptionMoney)); +// record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney)); +// if (subscriptionMoney.equals(0)) { +// record.setSubscriptionState("未认款"); +// } else if (subscriptionMoney.equals(totalDeposit)) { +// record.setSubscriptionState("已认款"); +// } else { +// record.setSubscriptionState("部分认款"); +// } +// } else if (receivablesName1.equals("车款")) { +// noSubscriptionMoney = totalPrice.subtract(new BigDecimal(subscriptionMoney)); +// record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney)); +// if (subscriptionMoney.equals(0)) { +// record.setSubscriptionState("未认款"); +// } else if (subscriptionMoney.equals(totalPrice)) { +// record.setSubscriptionState("已认款"); +// } else { +// record.setSubscriptionState("部分认款"); +// } +// } +// } +// } +// PagerVo p = PagerUtil.pageToVo(pagging, null); +// return p; +// } private QueryWrapper myCreateQueryWrapper(FinUncollectedReceivablesDetailedQuery query) { QueryWrapper qw = new QueryWrapper<>(); @@ -1233,4 +1233,83 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService BigDecimal ysMoney = baseMapper.selYsByBillSid(billSid); return rb.success().setData(ysMoney); } + + public PagerVo listPageVo(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + CustomerBillSummaryQuery query = pq.getParams(); + String orgPath = query.getOrgPath(); + //授权 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + orgPath = orgPath + "/"; + int i1 = orgPath.indexOf("/"); + int i2 = orgPath.indexOf("/", i1 + 1); + int i3 = orgPath.indexOf("/", i2 + 1); + int i4 = orgPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i1); + qw.like("b.orgSidPath", orgPath); + } else if ("2".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i2); + qw.like("b.orgSidPath", orgPath); + } else if ("3".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i3); + qw.like("b.orgSidPath", orgPath); + } else if ("4".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i4); + qw.like("b.orgSidPath", orgPath); + } else if ("5".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i4); + qw.like("b.orgSidPath", orgPath); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getNoSubscriptionMoneyStart())) { + qw.apply("( b.reveivableMoney - b.subscriptionMoney ) >=" + query.getNoSubscriptionMoneyStart()); + } + if (StringUtils.isNotBlank(query.getNoSubscriptionMoneyEnd())) { + qw.apply("( b.reveivableMoney - b.subscriptionMoney ) <=" + query.getNoSubscriptionMoneyEnd()); + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("b.contractNo",query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("b.customerName",query.getCustomerName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getCustomerSummaryList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean> customerBillDetailsList(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + List vos = baseMapper.customerBillDetailsList(contractNo); + return rb.success().setData(vos); + } + + public ResultBean customerBillThreeDetails(String receivablesSid) { + ResultBean rb = ResultBean.fireFail(); + CustomerThreeVo vo = baseMapper.selCustomerThreeDetails(receivablesSid); + if (vo != null) { + List list = baseMapper.selCustomerThreeListDetails(receivablesSid); + if (!list.isEmpty()) { + vo.setList(list); + } + } + return rb.success().setData(vo); + } }