|
|
|
@ -23,35 +23,31 @@ |
|
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * |
|
|
|
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* |
|
|
|
*********************************************************/ |
|
|
|
package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; |
|
|
|
package com.yxt.anrui.fin.biz.fincollectionconfirmation; |
|
|
|
|
|
|
|
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; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; |
|
|
|
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; |
|
|
|
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; |
|
|
|
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo; |
|
|
|
import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService; |
|
|
|
import com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedService; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.*; |
|
|
|
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; |
|
|
|
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; |
|
|
|
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; |
|
|
|
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; |
|
|
|
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
@ -60,9 +56,9 @@ import java.math.BigDecimal; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
|
* Project: anrui-buscenter(销售相关) <br/> |
|
|
|
* File: BusCollectionConfirmationService.java <br/> |
|
|
|
* Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationService <br/> |
|
|
|
* Project: anrui-fin(销售相关) <br/> |
|
|
|
* File: FinCollectionConfirmationService.java <br/> |
|
|
|
* Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService <br/> |
|
|
|
* Description: 收款确认表 业务逻辑. <br/> |
|
|
|
* Copyright: Copyright (c) 2011 <br/> |
|
|
|
* Company: https://gitee.com/liuzp315 <br/>
|
|
|
|
@ -73,12 +69,12 @@ import java.util.List; |
|
|
|
* @since 1.0 |
|
|
|
*/ |
|
|
|
@Service |
|
|
|
public class BusCollectionConfirmationService extends MybatisBaseService<BusCollectionConfirmationMapper, BusCollectionConfirmation> { |
|
|
|
public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; |
|
|
|
private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService; |
|
|
|
@Autowired |
|
|
|
private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService; |
|
|
|
private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService; |
|
|
|
@Autowired |
|
|
|
private CommonAppendixFeign commonAppendixFeign; |
|
|
|
@Autowired |
|
|
|
@ -88,10 +84,10 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
|
|
|
|
private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) { |
|
|
|
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<BusCollectionConfirmation> qw = new QueryWrapper<>(); |
|
|
|
QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("useOrgSid", query.getUseOrgSid()); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateBySid())) { |
|
|
|
qw.eq("createBySid", query.getCreateBySid()); |
|
|
|
@ -111,27 +107,27 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
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); |
|
|
|
List<BusCollectionConfirmationVo> records = pagging.getRecords(); |
|
|
|
for (BusCollectionConfirmationVo record : records) { |
|
|
|
public PagerVo<FinCollectionConfirmationVo> listPageVo(PagerQuery<FinCollectionConfirmationQuery> pq) { |
|
|
|
FinCollectionConfirmationQuery query = pq.getParams(); |
|
|
|
QueryWrapper<FinCollectionConfirmation> qw = createQueryWrapper(query); |
|
|
|
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
List<FinCollectionConfirmationVo> records = pagging.getRecords(); |
|
|
|
for (FinCollectionConfirmationVo record : records) { |
|
|
|
String s = ""; |
|
|
|
BigDecimal subscriptionMoney = null; |
|
|
|
String sid = record.getSid(); |
|
|
|
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { |
|
|
|
Integer auditState = busSelectedReceivablesDetailedVo.getAuditState(); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { |
|
|
|
Integer auditState = finSelectedReceivablesDetailedVo.getAuditState(); |
|
|
|
s += auditState + ","; |
|
|
|
} |
|
|
|
if (!s.contains("3")) { |
|
|
|
record.setSubscriptionState(1); |
|
|
|
} else if (s.contains("3")) { |
|
|
|
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos1 = busSelectedReceivablesDetailedService.fetchByAuditState(); |
|
|
|
for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos1) { |
|
|
|
BigDecimal subscriptionMoney1 = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(); |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { |
|
|
|
BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); |
|
|
|
subscriptionMoney = subscriptionMoney.add(subscriptionMoney1); |
|
|
|
} |
|
|
|
BigDecimal collectionMoney = new BigDecimal(record.getCollectionMoney()); |
|
|
|
@ -142,23 +138,23 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
PagerVo<FinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveAllDto(BusCollectionConfirmationDto dto) { |
|
|
|
public ResultBean saveAllDto(FinCollectionConfirmationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); |
|
|
|
List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); |
|
|
|
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); |
|
|
|
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetailedDtos(); |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); |
|
|
|
List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); |
|
|
|
String sid1 = busCollectionConfirmation.getSid(); |
|
|
|
BeanUtil.copyProperties(dto, busCollectionConfirmation); |
|
|
|
busCollectionConfirmation.setSid(sid1); |
|
|
|
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); |
|
|
|
List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); |
|
|
|
String sid1 = finCollectionConfirmation.getSid(); |
|
|
|
BeanUtil.copyProperties(dto, finCollectionConfirmation); |
|
|
|
finCollectionConfirmation.setSid(sid1); |
|
|
|
String payFilePath = ""; |
|
|
|
String remFilePath = ""; |
|
|
|
for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { |
|
|
|
for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { |
|
|
|
BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); |
|
|
|
payFilePath = commonAppendixDto.getFilePath(); |
|
|
|
if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
@ -171,8 +167,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
} |
|
|
|
payFilePath += payFilePath + ","; |
|
|
|
} |
|
|
|
busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); |
|
|
|
for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { |
|
|
|
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); |
|
|
|
for (FinCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { |
|
|
|
BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto); |
|
|
|
remFilePath = commonAppendixDto.getFilePath(); |
|
|
|
if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
@ -185,62 +181,62 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
} |
|
|
|
remFilePath += remFilePath + ","; |
|
|
|
} |
|
|
|
busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); |
|
|
|
for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { |
|
|
|
BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); |
|
|
|
BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed); |
|
|
|
busSelectedReceivablesDetailed.setCollSid(sid1); |
|
|
|
busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); |
|
|
|
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); |
|
|
|
for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) { |
|
|
|
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); |
|
|
|
BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed); |
|
|
|
finSelectedReceivablesDetailed.setCollSid(sid1); |
|
|
|
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); |
|
|
|
//已选应收款项-车架号
|
|
|
|
String vin = busSelectedReceivablesDetailed.getVIN(); |
|
|
|
String vin = finSelectedReceivablesDetailed.getVIN(); |
|
|
|
//已选应收款项-应收项目名称
|
|
|
|
String receivablesName = busSelectedReceivablesDetailed.getReceivablesName(); |
|
|
|
BusUncollectedReceivablesDetailedVo busUncollectedReceivablesDetailedVo = busUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); |
|
|
|
String receivablesName = finSelectedReceivablesDetailed.getReceivablesName(); |
|
|
|
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); |
|
|
|
//应收未收款项-当前应收金额
|
|
|
|
BigDecimal currentReceivableMoney = new BigDecimal(busUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); |
|
|
|
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); |
|
|
|
//已选应收款项-认款金额
|
|
|
|
BigDecimal subscriptionMoney = busSelectedReceivablesDetailed.getSubscriptionMoney(); |
|
|
|
BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney(); |
|
|
|
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); |
|
|
|
if (subtract.compareTo(BigDecimal.ZERO) < 0) { |
|
|
|
return rb.setMsg("认款金额超出应收金额，请重新输入"); |
|
|
|
} |
|
|
|
busUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); |
|
|
|
BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDto = new BusUncollectedReceivablesDetailedDto(); |
|
|
|
BeanUtil.copyProperties(busUncollectedReceivablesDetailedVo, busUncollectedReceivablesDetailedDto); |
|
|
|
busUncollectedReceivablesDetailedService.updateBySid(busUncollectedReceivablesDetailedDto, busUncollectedReceivablesDetailedDto.getSid()); |
|
|
|
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); |
|
|
|
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); |
|
|
|
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); |
|
|
|
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); |
|
|
|
} |
|
|
|
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1); |
|
|
|
BigDecimal totalSubscriptionMone = null; |
|
|
|
for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); |
|
|
|
totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); |
|
|
|
} |
|
|
|
BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney(); |
|
|
|
BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); |
|
|
|
BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); |
|
|
|
if (subtract.compareTo(BigDecimal.ZERO) < 0) { |
|
|
|
return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); |
|
|
|
} |
|
|
|
busCollectionConfirmation.setBalance(totalSubscriptionMone); |
|
|
|
busCollectionConfirmation.setAuditState(1); |
|
|
|
save(busCollectionConfirmation); |
|
|
|
finCollectionConfirmation.setBalance(totalSubscriptionMone); |
|
|
|
finCollectionConfirmation.setAuditState(1); |
|
|
|
save(finCollectionConfirmation); |
|
|
|
return rb.success().setMsg("添加成功"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) { |
|
|
|
public ResultBean<FinCollectionConfirmationDetailsVo> 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); |
|
|
|
FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo(); |
|
|
|
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); |
|
|
|
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetailedVos(finSelectedReceivablesDetailedVos); |
|
|
|
return rb.success().setData(finCollectionConfirmationDetailsVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delAllBySids(String[] sids) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
delBySids(sids); |
|
|
|
for (String sid : sids) { |
|
|
|
busSelectedReceivablesDetailedService.deleteByCollSid(sid); |
|
|
|
finSelectedReceivablesDetailedService.deleteByCollSid(sid); |
|
|
|
} |
|
|
|
return rb.success().setMsg("删除成功"); |
|
|
|
} |
|
|
|
@ -251,19 +247,19 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @param pagerQuery |
|
|
|
* @ |
|
|
|
*/ |
|
|
|
public IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { |
|
|
|
IPage<AppBusCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppBusCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams()); |
|
|
|
IPage<AppBusCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw); |
|
|
|
for (AppBusCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) { |
|
|
|
public IPage<AppFinCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) { |
|
|
|
IPage<AppFinCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppFinCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams()); |
|
|
|
IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw); |
|
|
|
for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) { |
|
|
|
Integer balance = record.getBalance(); |
|
|
|
String collectionBillState = record.getCollectionBillState(); |
|
|
|
if (balance <= 0 || collectionBillState.equals("1") || collectionBillState.equals("3")) { |
|
|
|
record.setShowHandle(false); |
|
|
|
} |
|
|
|
record.setShowDownload(false); |
|
|
|
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid()); |
|
|
|
if (busSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") { |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid()); |
|
|
|
if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") { |
|
|
|
record.setShowDelete(false); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -276,8 +272,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @param pagerQuery 查询条件 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private QueryWrapper<AppBusCollectionConfirmationPageVo> appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) { |
|
|
|
QueryWrapper<AppBusCollectionConfirmationPageVo> qw = new QueryWrapper<>(); |
|
|
|
private QueryWrapper<AppFinCollectionConfirmationPageVo> appBuildQueryWrapper(AppFinCollectionConfirmationQuery pagerQuery) { |
|
|
|
QueryWrapper<AppFinCollectionConfirmationPageVo> qw = new QueryWrapper<>(); |
|
|
|
if (pagerQuery != null) { |
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
|
|
|
|
qw.like("bv.vinNo", pagerQuery.getName()); |
|
|
|
@ -293,23 +289,23 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { |
|
|
|
public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid(); |
|
|
|
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); |
|
|
|
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
String sid = busCollectionConfirmation.getSid(); |
|
|
|
busCollectionConfirmation.setSid(sid); |
|
|
|
busCollectionConfirmation.setCollectionDate(dto.getCollectionDate()); |
|
|
|
busCollectionConfirmation.setCollectionBank(dto.getCollectionBank()); |
|
|
|
busCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum()); |
|
|
|
busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); |
|
|
|
busCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey()); |
|
|
|
busCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType()); |
|
|
|
busCollectionConfirmation.setPayerName(dto.getPaymentName()); |
|
|
|
busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); |
|
|
|
busCollectionConfirmation.setRemarks(dto.getRemarks()); |
|
|
|
insert(busCollectionConfirmation); |
|
|
|
String sid = finCollectionConfirmation.getSid(); |
|
|
|
finCollectionConfirmation.setSid(sid); |
|
|
|
finCollectionConfirmation.setCollectionDate(dto.getCollectionDate()); |
|
|
|
finCollectionConfirmation.setCollectionBank(dto.getCollectionBank()); |
|
|
|
finCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum()); |
|
|
|
finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); |
|
|
|
finCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey()); |
|
|
|
finCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType()); |
|
|
|
finCollectionConfirmation.setPayerName(dto.getPaymentName()); |
|
|
|
finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); |
|
|
|
finCollectionConfirmation.setRemarks(dto.getRemarks()); |
|
|
|
insert(finCollectionConfirmation); |
|
|
|
List<String> payFiles = dto.getPayFiles(); |
|
|
|
for (String payFile : payFiles) { |
|
|
|
String payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
@ -329,13 +325,13 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @param userSid |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { |
|
|
|
ResultBean<AppBusCollectionConfirmationInitVo> rb = ResultBean.fireFail(); |
|
|
|
public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { |
|
|
|
ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isNotBlank(userSid)) { |
|
|
|
return rb.fail().setMsg("用户sid不能为空"); |
|
|
|
} |
|
|
|
String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); |
|
|
|
AppBusCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid); |
|
|
|
AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
@ -345,7 +341,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { |
|
|
|
public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@ -359,7 +355,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
public ResultBean deleteCollectionConfirm(String collectionBillSid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
deleteBySid(collectionBillSid); |
|
|
|
busSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid); |
|
|
|
finSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid); |
|
|
|
return rb.success().setMsg("删除成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@ -370,11 +366,11 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @param pagerQuery |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) { |
|
|
|
IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); |
|
|
|
public IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) { |
|
|
|
IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); |
|
|
|
List<String> sidList = pagerQuery.getParams().getSidList(); |
|
|
|
IPage<AppBusSelectedReceivablesPaymentDetailsVo> collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); |
|
|
|
IPage<AppFinSelectedReceivablesPaymentDetailsVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); |
|
|
|
return collectionConfirmList; |
|
|
|
} |
|
|
|
|
|
|
|
@ -384,8 +380,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl |
|
|
|
* @param pagerQuery 查询条件 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> appPaymentDetailsBuildQueryWrapper(AppBusSelectedReceivablesPaymentDetailsQuery pagerQuery) { |
|
|
|
QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = new QueryWrapper<>(); |
|
|
|
private QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) { |
|
|
|
QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw = new QueryWrapper<>(); |
|
|
|
if (pagerQuery != null) { |
|
|
|
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
|
|
|
|
qw.like("bv.vinNo", pagerQuery.getName()); |
God
3 years ago