|
|
|
@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; |
|
|
|
import com.yxt.anrui.fin.api.fincollectionconfirmation.*; |
|
|
|
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; |
|
|
|
@ -41,6 +42,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec |
|
|
|
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.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
@ -56,6 +58,7 @@ import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Optional; |
|
|
|
|
|
|
|
@ -115,13 +118,32 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
|
|
|
|
public PagerVo<FinCollectionConfirmationVo> listPageVo(PagerQuery<FinCollectionConfirmationQuery> pq) { |
|
|
|
FinCollectionConfirmationQuery query = pq.getParams(); |
|
|
|
String staffSid = query.getCreateBySid(); |
|
|
|
ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); |
|
|
|
List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData(); |
|
|
|
String orgSidPath = ""; |
|
|
|
for (SysStaffOrgVo datum : data) { |
|
|
|
orgSidPath = datum.getOrgSidPath(); |
|
|
|
String[] split = orgSidPath.split("/"); |
|
|
|
for (String s : split) { |
|
|
|
ResultBean<SysOrganizationVo> 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; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
query.setUseOrgSid(orgSidPath); |
|
|
|
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; |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(0); |
|
|
|
String sid = record.getSid(); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { |
|
|
|
@ -167,41 +189,53 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
String orgSidPath = ""; |
|
|
|
for (SysStaffOrgVo datum : data) { |
|
|
|
orgSidPath = datum.getOrgSidPath(); |
|
|
|
orgSidPath = orgSidPath.substring(0, orgSidPath.indexOf("/")); |
|
|
|
String[] split = orgSidPath.split("/"); |
|
|
|
for (String s : split) { |
|
|
|
ResultBean<SysOrganizationVo> 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; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
finCollectionConfirmation.setCreateBySid(staffSid); |
|
|
|
finCollectionConfirmation.setUseOrgSid(orgSidPath); |
|
|
|
for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { |
|
|
|
BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); |
|
|
|
payFilePath = commonAppendixDto.getFilePath(); |
|
|
|
if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
String s = commonAppendixDto.getFilePath(); |
|
|
|
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
s = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
commonAppendixDto.setLinkSid(sid1); |
|
|
|
commonAppendixDto.setFilePath(payFilePath); |
|
|
|
commonAppendixDto.setFilePath(s); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
} |
|
|
|
payFilePath += payFilePath + ","; |
|
|
|
payFilePath += s + ","; |
|
|
|
} |
|
|
|
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) { |
|
|
|
remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
String s = commonAppendixDto.getFilePath(); |
|
|
|
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
s = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
commonAppendixDto.setLinkSid(sid1); |
|
|
|
commonAppendixDto.setFilePath(remFilePath); |
|
|
|
commonAppendixDto.setFilePath(s); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
} |
|
|
|
remFilePath += remFilePath + ","; |
|
|
|
remFilePath += s + ","; |
|
|
|
} |
|
|
|
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); |
|
|
|
for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) { |
|
|
|
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); |
|
|
|
BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed); |
|
|
|
finSelectedReceivablesDetailed.setCollSid(sid1); |
|
|
|
finSelectedReceivablesDetailed.setAuditState(1); |
|
|
|
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); |
|
|
|
//已选应收款项-车架号
|
|
|
|
String vin = finSelectedReceivablesDetailed.getVIN(); |
|
|
|
@ -222,7 +256,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); |
|
|
|
} |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1); |
|
|
|
BigDecimal totalSubscriptionMone = null; |
|
|
|
BigDecimal totalSubscriptionMone = new BigDecimal(0); |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); |
|
|
|
totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); |
|
|
|
@ -242,6 +276,27 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo(); |
|
|
|
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); |
|
|
|
FinCollectionConfirmationAppendixVo finCollectionConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo(); |
|
|
|
ArrayList<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>(); |
|
|
|
ArrayList<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>(); |
|
|
|
String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl(); |
|
|
|
String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl(); |
|
|
|
String[] split1 = remittanceConfirmationUrl.split(","); |
|
|
|
String[] split = paymentVoucherUrl.split(","); |
|
|
|
for (String s : split) { |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
BeanUtil.copyProperties(data,finCollectionConfirmationAppendixVo); |
|
|
|
paymentVoucherAppendixs.add(finCollectionConfirmationAppendixVo); |
|
|
|
} |
|
|
|
for (String s : split1) { |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
BeanUtil.copyProperties(data,finCollectionConfirmationAppendixVo); |
|
|
|
remittanceConfirmationAppendixs.add(finCollectionConfirmationAppendixVo); |
|
|
|
} |
|
|
|
finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs); |
|
|
|
finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs); |
|
|
|
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetailedVos(finSelectedReceivablesDetailedVos); |
|
|
|
@ -338,7 +393,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath); |
|
|
|
} |
|
|
|
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); |
|
|
|
BigDecimal totalSubscriptionMone = null; |
|
|
|
BigDecimal totalSubscriptionMone = new BigDecimal(0); |
|
|
|
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); |
|
|
|
totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); |
|
|
|
|
God
3 years ago