From 738b423d450088c65109bd8b3bc30e2481ac865e Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Mon, 18 Apr 2022 09:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusCollectionConfirmationPageVo.java | 3 + ...usSelectedReceivablesPaymentDetailsVo.java | 3 + ...usUncollectedReceivablesDetailedFeign.java | 1 + .../BusCollectionConfirmationService.java | 3 +- .../BusSelectedReceivablesDetailedMapper.java | 23 +- .../BusSelectedReceivablesDetailedMapper.xml | 25 ++ ...BusSelectedReceivablesDetailedService.java | 227 +++++++++--------- 7 files changed, 161 insertions(+), 124 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java index 5b6a2ad690..b36871bf1d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java @@ -33,5 +33,8 @@ public class AppBusCollectionConfirmationPageVo implements Vo { private boolean showDownload; @ApiModelProperty("是否显示删除") private boolean showDelete; + @ApiModelProperty("认款状态") + private String state; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java index 205c372bd6..7362dcb42a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java @@ -34,4 +34,7 @@ public class AppBusSelectedReceivablesPaymentDetailsVo implements Vo { @ApiModelProperty("认款时间") private String confirmDate; + @ApiModelProperty("认款状态") + private String state; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java index 8f77318fe7..33b3282f14 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java @@ -52,6 +52,7 @@ import java.util.List; @FeignClient( contextId = "anrui-buscenter-BusUncollectedReceivablesDetailed", name = "anrui-buscenter", + path = "busuncollectedreceivablesdetailed", fallback = BusUncollectedReceivablesDetailedFeignFallback.class) public interface BusUncollectedReceivablesDetailedFeign { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java index 6f18237a41..fd2f2960c2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java @@ -373,7 +373,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); - IPage collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw); + List sidList = pagerQuery.getParams().getSidList(); + IPage collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); return collectionConfirmList; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java index 58eaf3aae5..10d66b6483 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java @@ -57,17 +57,17 @@ import java.util.List; @Mapper public interface BusSelectedReceivablesDetailedMapper extends BaseMapper { - //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_selected_receivables_detailed") - List selectListVo(); + //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_selected_receivables_detailed") + List selectListVo(); + + @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") void deleteByCollSid(String sid); @Select("select * from bus_selected_receivables_detailed where collSid = #{sid}") @@ -81,7 +81,8 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper getPaymentDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + @Select("select * from bus_selected_receivables_detailed where auditState = #{auditState}") List fetchByAuditState(int auditState); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml index 316e92bdce..c33e315189 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml @@ -22,5 +22,30 @@ \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java index 12af5261e2..95670e493e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java @@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedRec import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.util.List; @@ -61,112 +62,114 @@ import java.util.List; */ @Service public class BusSelectedReceivablesDetailedService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BusSelectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BusSelectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.eq("createByName", query.getCreateByName()); - } - - if (StringUtils.isNotBlank(query.getContractSid())) { - qw.eq("contractSid", query.getContractSid()); - } - - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.eq("contractNo", query.getContractNo()); - } - - if (StringUtils.isNotBlank(query.getCustomerSid())) { - qw.eq("customerSid", query.getCustomerSid()); - } - - if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.eq("customerName", query.getCustomerName()); - } - - if (StringUtils.isNotBlank(query.getVIN())) { - qw.eq("VIN", query.getVIN()); - } - - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("useOrgSid", query.getUseOrgSid()); - } - - if (StringUtils.isNotBlank(query.getCustomerPhone())) { - qw.eq("customerPhone", query.getCustomerPhone()); - } - - if (StringUtils.isNotBlank(query.getReceivablesName())) { - qw.eq("receivablesName", query.getReceivablesName()); - } - - if (query.getCurrentReceivableMoney() != null) { - qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); - } - - if (query.getSubscriptionMoney() != null) { - qw.eq("subscriptionMoney", query.getSubscriptionMoney()); - } - - if (StringUtils.isNotBlank(query.getSubscriptionDate())) { - qw.eq("subscriptionDate", query.getSubscriptionDate()); - } - - if (StringUtils.isNotBlank(query.getCollSid())) { - qw.eq("collSid", query.getCollSid()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusSelectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BusSelectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){ - BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){ - BusSelectedReceivablesDetailed entity = this.fetchById(id); - BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public void deleteByCollSid(String sid) { - baseMapper.deleteByCollSid(sid); - } + public PagerVo listPage(PagerQuery pq) { + BusSelectedReceivablesDetailedQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(BusSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.eq("createByName", query.getCreateByName()); + } + + if (StringUtils.isNotBlank(query.getContractSid())) { + qw.eq("contractSid", query.getContractSid()); + } + + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.eq("contractNo", query.getContractNo()); + } + + if (StringUtils.isNotBlank(query.getCustomerSid())) { + qw.eq("customerSid", query.getCustomerSid()); + } + + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.eq("customerName", query.getCustomerName()); + } + + if (StringUtils.isNotBlank(query.getVIN())) { + qw.eq("VIN", query.getVIN()); + } + + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("useOrgSid", query.getUseOrgSid()); + } + + if (StringUtils.isNotBlank(query.getCustomerPhone())) { + qw.eq("customerPhone", query.getCustomerPhone()); + } + + if (StringUtils.isNotBlank(query.getReceivablesName())) { + qw.eq("receivablesName", query.getReceivablesName()); + } + + if (query.getCurrentReceivableMoney() != null) { + qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); + } + + if (query.getSubscriptionMoney() != null) { + qw.eq("subscriptionMoney", query.getSubscriptionMoney()); + } + + if (StringUtils.isNotBlank(query.getSubscriptionDate())) { + qw.eq("subscriptionDate", query.getSubscriptionDate()); + } + + if (StringUtils.isNotBlank(query.getCollSid())) { + qw.eq("collSid", query.getCollSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusSelectedReceivablesDetailedQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BusSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) { + BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) { + BusSelectedReceivablesDetailed entity = this.fetchById(id); + BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByCollSid(String sid) { + baseMapper.deleteByCollSid(sid); + } public List fetchByCillSid(String sid) { return baseMapper.fetchByCillSid(sid); @@ -179,12 +182,12 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService getPaymentDetailsList(IPage page, QueryWrapper qw) { - return baseMapper.getPaymentDetailsList(page, qw); + public IPage getPaymentDetailsList(List sidList, IPage page, QueryWrapper qw) { + return baseMapper.getPaymentDetailsList(sidList, page, qw); } - public List fetchByAuditState() { - int auditState = 3; - return baseMapper.fetchByAuditState(auditState); - } + public List fetchByAuditState() { + int auditState = 3; + return baseMapper.fetchByAuditState(auditState); + } } \ No newline at end of file