diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java index 19c45f9f1a..ca93366807 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java @@ -72,9 +72,9 @@ public interface BusCollectionConfirmationFeign { @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); - /* App接口 */ + /*---------------------App接口 ---------------------*/ @ApiOperation("手机端—获取款项确认列表") @PostMapping("/getCollectionConfirmList") - public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pq); + public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java index d381a4ac47..565c8ebb45 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java @@ -69,4 +69,9 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/fetchBySid无法访问"); } + + @Override + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java index 01f9a53fed..36d5ef937f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java @@ -26,9 +26,12 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationQuery; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -53,13 +56,15 @@ import java.util.List; @Mapper public interface BusCollectionConfirmationMapper extends BaseMapper { - //@Update("update bus_collection_confirmation 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_collection_confirmation") - List selectListVo(); + //@Update("update bus_collection_confirmation 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_collection_confirmation") + List selectListVo(); + + IPage getCollectionConfirmList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml index d4f730bad0..234282309a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml @@ -10,4 +10,9 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java index 6716c4f444..d7d206b068 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -54,36 +56,49 @@ import java.util.List; @RequestMapping("/buscollectionconfirmation") public class BusCollectionConfirmationRest implements BusCollectionConfirmationFeign { - @Autowired - private BusCollectionConfirmationService busCollectionConfirmationService; + @Autowired + private BusCollectionConfirmationService busCollectionConfirmationService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busCollectionConfirmationService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busCollectionConfirmationService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改保存") - @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto){ - return busCollectionConfirmationService.saveOrUpdateAllDto(dto); - } + @Override + @ApiOperation("新增或修改保存") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto) { + return busCollectionConfirmationService.saveOrUpdateAllDto(dto); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ return busCollectionConfirmationService.delAllBySids(sids); } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid){ - return busCollectionConfirmationService.fetchByAllSid(sid); - } + public ResultBean fetchBySid(@PathVariable("sid") String sid) { + return busCollectionConfirmationService.fetchByAllSid(sid); + } + + /** + * 手机端—获取款项确认列表 + * + * @param pagerQuery + * @return + */ + @Override + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + IPage page = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery); + return null; + } } 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 f19c4c613f..dea6cff2dc 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 @@ -28,6 +28,8 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleQuery; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; @@ -66,120 +68,148 @@ import java.util.List; @Service public class BusCollectionConfirmationService extends MybatisBaseService { - @Autowired - private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; - @Autowired - private CommonAppendixFeign commonAppendixFeign; - @Autowired - private FileUploadComponent fileUploadComponent; + @Autowired + private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; + @Autowired + private CommonAppendixFeign commonAppendixFeign; + @Autowired + private FileUploadComponent fileUploadComponent; - private QueryWrapper createQueryWrapper(BusCollectionConfirmationQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + private QueryWrapper createQueryWrapper(BusCollectionConfirmationQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getCollectionDate())) { - qw.eq("collectionDate", query.getCollectionDate()); - } - if (StringUtils.isNotBlank(query.getCollectionBank())) { - qw.eq("collectionBank", query.getCollectionBank()); - } - if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { - qw.eq("collectionTypeKey", query.getCollectionTypeKey()); - } - if (StringUtils.isNotBlank(query.getSubscriptionState())) { - qw.eq("subscriptionState", query.getSubscriptionState()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusCollectionConfirmationQuery 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 ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) { - ResultBean rb = ResultBean.fireFail(); - BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); - List busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); - CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); - List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); - List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); - String sid1 = busCollectionConfirmation.getSid(); - String sid = dto.getSid(); - if (StringUtils.isBlank(sid)){//新增 - BeanUtil.copyProperties(dto,busCollectionConfirmation); - busCollectionConfirmation.setSid(sid1); - String payFilePath = ""; - String remFilePath = ""; - for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { - BeanUtil.copyProperties(paymentVoucherAppendix,commonAppendixDto); - payFilePath = commonAppendixDto.getFilePath(); - if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); - commonAppendixDto.setFilePath(payFilePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - } - payFilePath += payFilePath + ","; - } - busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); - for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { - BeanUtil.copyProperties(remittanceConfirmationAppendix,commonAppendixDto); - remFilePath = commonAppendixDto.getFilePath(); - if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); - commonAppendixDto.setFilePath(remFilePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - } - remFilePath += remFilePath + ","; - } - busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); - save(busCollectionConfirmation); - for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { - BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); - BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed); - busSelectedReceivablesDetailed.setCollSid(sid1); - busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); - } - return rb.success().setMsg("添加成功"); - } - updateBySid(dto,sid); - busSelectedReceivablesDetailedService.deleteByCollSid(sid); - for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { - BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); - BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed); - busSelectedReceivablesDetailed.setCollSid(sid); - busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); - } - return rb.success().setMsg("修改成功"); - } + if (StringUtils.isNotBlank(query.getCollectionDate())) { + qw.eq("collectionDate", query.getCollectionDate()); + } + if (StringUtils.isNotBlank(query.getCollectionBank())) { + qw.eq("collectionBank", query.getCollectionBank()); + } + if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { + qw.eq("collectionTypeKey", query.getCollectionTypeKey()); + } + if (StringUtils.isNotBlank(query.getSubscriptionState())) { + qw.eq("subscriptionState", query.getSubscriptionState()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusCollectionConfirmationQuery 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 ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) { + ResultBean rb = ResultBean.fireFail(); + BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); + List busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); + List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); + String sid1 = busCollectionConfirmation.getSid(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)) {//新增 + BeanUtil.copyProperties(dto, busCollectionConfirmation); + busCollectionConfirmation.setSid(sid1); + String payFilePath = ""; + String remFilePath = ""; + for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { + BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); + payFilePath = commonAppendixDto.getFilePath(); + if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + payFilePath += payFilePath + ","; + } + busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); + for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { + BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto); + remFilePath = commonAppendixDto.getFilePath(); + if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setFilePath(remFilePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + remFilePath += remFilePath + ","; + } + busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); + save(busCollectionConfirmation); + for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { + BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); + BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed); + busSelectedReceivablesDetailed.setCollSid(sid1); + busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); + } + return rb.success().setMsg("添加成功"); + } + updateBySid(dto, sid); + busSelectedReceivablesDetailedService.deleteByCollSid(sid); + for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { + BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); + BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed); + busSelectedReceivablesDetailed.setCollSid(sid); + busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); + } + return rb.success().setMsg("修改成功"); + } - public ResultBean fetchByAllSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo(); - BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid); - BeanUtil.copyProperties(busCollectionConfirmation,busCollectionConfirmationDetailsVo); - List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); - busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos); - return rb.success().setData(busCollectionConfirmationDetailsVo); - } + public ResultBean fetchByAllSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo(); + BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid); + BeanUtil.copyProperties(busCollectionConfirmation, busCollectionConfirmationDetailsVo); + List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); + busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos); + return rb.success().setData(busCollectionConfirmationDetailsVo); + } - public ResultBean delAllBySids(String[] sids) { - ResultBean rb = ResultBean.fireFail(); - delBySids(sids); - for (String sid : sids) { - busSelectedReceivablesDetailedService.deleteByCollSid(sid); + public ResultBean delAllBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + delBySids(sids); + for (String sid : sids) { + busSelectedReceivablesDetailedService.deleteByCollSid(sid); + } + return rb.success().setMsg("删除成功"); + } + + /** + * 手机端—获取款项确认列表 + * + * @param pagerQuery + * @return + */ + public IPage getCollectionConfirmList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = appBuildQueryWrapper(pagerQuery.getParams()); + return baseMapper.getCollectionConfirmList(page,qw); + } + + /** + * 构造条件 + * + * @param pagerQuery 查询条件 + * @return + */ + private QueryWrapper appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) { + QueryWrapper qw = new QueryWrapper<>(); + if (pagerQuery != null) { + if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号 + qw.like("bv.vinNo", pagerQuery.getName()); + } } - return rb.success().setMsg("删除成功"); - } + return qw; + } } \ No newline at end of file