|
|
|
@ -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<BusCollectionConfirmationMapper, BusCollectionConfirmation> { |
|
|
|
|
|
|
|
@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<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<BusCollectionConfirmation> qw = new QueryWrapper<>(); |
|
|
|
private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<BusCollectionConfirmation> 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<BusCollectionConfirmationVo> listPageVo(PagerQuery<BusCollectionConfirmationQuery> pq) { |
|
|
|
BusCollectionConfirmationQuery query = pq.getParams(); |
|
|
|
QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query); |
|
|
|
IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<BusCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); |
|
|
|
List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); |
|
|
|
List<BusCollectionConfirmationAppendixDto> 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<BusCollectionConfirmationVo> listPageVo(PagerQuery<BusCollectionConfirmationQuery> pq) { |
|
|
|
BusCollectionConfirmationQuery query = pq.getParams(); |
|
|
|
QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query); |
|
|
|
IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<BusCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); |
|
|
|
List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); |
|
|
|
List<BusCollectionConfirmationAppendixDto> 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<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo(); |
|
|
|
BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid); |
|
|
|
BeanUtil.copyProperties(busCollectionConfirmation,busCollectionConfirmationDetailsVo); |
|
|
|
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos); |
|
|
|
return rb.success().setData(busCollectionConfirmationDetailsVo); |
|
|
|
} |
|
|
|
public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo(); |
|
|
|
BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid); |
|
|
|
BeanUtil.copyProperties(busCollectionConfirmation, busCollectionConfirmationDetailsVo); |
|
|
|
List<BusSelectedReceivablesDetailedVo> 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<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { |
|
|
|
IPage<AppBusCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppBusCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams()); |
|
|
|
return baseMapper.getCollectionConfirmList(page,qw); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 构造条件 |
|
|
|
* |
|
|
|
* @param pagerQuery 查询条件 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private QueryWrapper<AppBusCollectionConfirmationPageVo> appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) { |
|
|
|
QueryWrapper<AppBusCollectionConfirmationPageVo> 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; |
|
|
|
} |
|
|
|
} |
hanlinghao
3 years ago