|
|
|
@ -30,12 +30,19 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.nacos.api.config.filter.IFilterConfig; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.TrailerVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.*; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractVo; |
|
|
|
import com.yxt.anrui.base.common.enums.BillTypeEnum; |
|
|
|
import com.yxt.anrui.base.common.enums.DictCommonEnum; |
|
|
|
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; |
|
|
|
import com.yxt.anrui.base.common.utils.Rule; |
|
|
|
import com.yxt.anrui.base.common.utils.domain.BillNo; |
|
|
|
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; |
|
|
|
import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; |
|
|
|
@ -53,12 +60,17 @@ import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic; |
|
|
|
import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFile; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; |
|
|
|
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer; |
|
|
|
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; |
|
|
|
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; |
|
|
|
import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService; |
|
|
|
import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService; |
|
|
|
import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService; |
|
|
|
import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
|
@ -114,6 +126,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
@Autowired |
|
|
|
private FinBillVehicleService finBillVehicleService; |
|
|
|
@Autowired |
|
|
|
private FinBillTrailerService finBillTrailerService; |
|
|
|
@Autowired |
|
|
|
private FinBillFileService finBillFileService; |
|
|
|
@Autowired |
|
|
|
private FinBillApplicationPublicService finBillApplicationPublicService; |
|
|
|
@ -122,79 +136,58 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
@Autowired |
|
|
|
private FlowableFeign flowableFeign; |
|
|
|
@Autowired |
|
|
|
private SysFormLinkFeign sysFormLinkFeign; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
@Autowired |
|
|
|
private CommonContractFeign commonContractFeign; |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderModelFeign busSalesOrderModelFeign; |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderPriceFeign busSalesOrderPriceFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderFeign busSalesOrderFeign; |
|
|
|
@Autowired |
|
|
|
private MessageFeign messageFeign; |
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleFeign baseVehicleFeign; |
|
|
|
@Autowired |
|
|
|
private BaseTrailerFeign baseTrailerFeign; |
|
|
|
|
|
|
|
private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("fba.useOrgSid", query.getUseOrgSid()); |
|
|
|
qw.eq("fba.createBySid", query.getStaffSid()); |
|
|
|
if (StringUtils.isNotBlank(query.getSaleTypeKey())) { |
|
|
|
qw.eq("fba.saleTypeKey", query.getSaleTypeKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getContractNo())) { |
|
|
|
qw.like("fba.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOpenTickUnitName())) { |
|
|
|
qw.like("fba.openTickUnitName", query.getOpenTickUnitName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("fba.customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillTypeKey())) { |
|
|
|
qw.eq("fbv.billTypeKey", query.getBillTypeKey()); |
|
|
|
if (StringUtils.isNotBlank(query.getModelName())) { |
|
|
|
qw.like("fba.modelName", query.getModelName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillName())) { |
|
|
|
qw.eq("fbv.billName", query.getBillName()); |
|
|
|
if (StringUtils.isNotBlank(query.getBillStateKey())) { |
|
|
|
qw.eq("fba.billStateKey", query.getBillStateKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.eq("fba.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
String applyStartDate = query.getApplyStartDate(); |
|
|
|
String applyEndDate = query.getApplyEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (fba.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("fba.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillState())) { |
|
|
|
qw.like("fba.billState", query.getBillState()); |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) { |
|
|
|
FinBillApplicationQuery query = pq.getParams(); |
|
|
|
String staffSid = query.getStaffSid(); |
|
|
|
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 != null) { |
|
|
|
if (isDept == 0 && !psid.equals(0)) { |
|
|
|
orgSidPath = s; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
query.setUseOrgSid(orgSidPath); |
|
|
|
QueryWrapper<FinBillApplication> qw = createQueryWrapper(query); |
|
|
|
IPage<FinBillApplication> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
@ -220,194 +213,113 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); |
|
|
|
dto.setOrgSidPath(orgSidPath); |
|
|
|
} |
|
|
|
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers(); |
|
|
|
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles(); |
|
|
|
List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); |
|
|
|
List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); |
|
|
|
List<FinBillApplicationAppendxDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
List<FinBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); |
|
|
|
List<FinBillFileDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); |
|
|
|
List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); |
|
|
|
if (StringUtils.isBlank(dtoSid)) {//新增
|
|
|
|
FinBillApplication finBillApplication = new FinBillApplication(); |
|
|
|
String sid = finBillApplication.getSid(); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplication); |
|
|
|
finBillApplication.setSid(sid); |
|
|
|
FinBillApplicationPublic finBillApplicationPublic = new FinBillApplicationPublic(); |
|
|
|
String sid2 = finBillApplicationPublic.getSid(); |
|
|
|
BeanUtil.copyProperties(finBillApplication, finBillApplicationPublic); |
|
|
|
finBillApplicationPublic.setSid(sid2); |
|
|
|
finBillApplicationPublicService.save(finBillApplicationPublic); |
|
|
|
finBillApplication.setBillAppPublicSid(sid2); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplication, "sid"); |
|
|
|
finBillApplication.setNodeState("待提交"); |
|
|
|
String billNo = getApplyCode(dto.getUseOrgSid()); |
|
|
|
finBillApplication.setBillNo(billNo); |
|
|
|
save(finBillApplication); |
|
|
|
//主车开票信息
|
|
|
|
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
String sid1 = finBillVehicle.getSid(); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); |
|
|
|
finBillVehicle.setSid(sid1); |
|
|
|
finBillVehicle.setBillAppSid(sid); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid"); |
|
|
|
finBillVehicle.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillVehicleService.save(finBillVehicle); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
//挂车开票信息
|
|
|
|
for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { |
|
|
|
FinBillTrailer finBillTrailer = new FinBillTrailer(); |
|
|
|
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); |
|
|
|
finBillTrailer.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillTrailerService.save(finBillTrailer); |
|
|
|
} |
|
|
|
for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(sid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(sid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setFileType("客户开票申请书"); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(sid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(sid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setFileType("开票信息确认书"); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(sid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(sid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setFileType("车辆登记合同"); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
return rb.success().setMsg("保存成功").setData(sid); |
|
|
|
return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); |
|
|
|
} |
|
|
|
FinBillApplication finBillApplication = fetchBySid(dtoSid); |
|
|
|
if (finBillApplication == null) { |
|
|
|
rb.setMsg("该数据不存在"); |
|
|
|
} |
|
|
|
commonAppendixFeign.deleteFiles(dtoSid); |
|
|
|
finBillFileService.deleteByFinAppSid(dtoSid); |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(dtoSid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(dtoSid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
finBillFile.setCreateByName(commonAppendixDto.getName()); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
if (data == null) { |
|
|
|
return rb.setMsg("请上传相关附件"); |
|
|
|
} |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setFileType("客户开票申请书"); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(dtoSid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(dtoSid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
finBillFile.setCreateByName(commonAppendixDto.getName()); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
if (data == null) { |
|
|
|
return rb.setMsg("请上传相关附件"); |
|
|
|
} |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setFileType("开票信息确认书"); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) { |
|
|
|
String filePath = finBillFileDto.getFileUrl(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(dtoSid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(dtoSid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
finBillFile.setCreateByName(commonAppendixDto.getName()); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
if (data == null) { |
|
|
|
return rb.setMsg("请上传相关附件"); |
|
|
|
} |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
} |
|
|
|
FinBillApplicationPublicDto finBillApplicationPublicDto = new FinBillApplicationPublicDto(); |
|
|
|
String billAppPublicSid = dto.getBillAppPublicSid(); |
|
|
|
FinBillApplicationPublic finBillApplicationPublic = finBillApplicationPublicService.fetchBySid(billAppPublicSid); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplicationPublic); |
|
|
|
finBillApplicationPublic.setSid(billAppPublicSid); |
|
|
|
updateBySid(dto, dtoSid); |
|
|
|
BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto); |
|
|
|
finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid); |
|
|
|
finBillFileDto.setFileUrl(filePath); |
|
|
|
finBillFileDto.setBillAppSid(finBillApplication.getSid()); |
|
|
|
finBillFileDto.setFileType("车辆登记合同"); |
|
|
|
finBillFileService.saveOrUpdateDto(finBillFileDto); |
|
|
|
} |
|
|
|
finBillVehicleService.delByBillAppSid(dtoSid); |
|
|
|
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); |
|
|
|
finBillVehicle.setSid(finBillVehicleDto.getSid()); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid"); |
|
|
|
finBillVehicle.setBillAppSid(dtoSid); |
|
|
|
finBillVehicleService.save(finBillVehicle); |
|
|
|
} |
|
|
|
finBillTrailerService.delByBillAppSid(dtoSid); |
|
|
|
for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { |
|
|
|
FinBillTrailer finBillTrailer = new FinBillTrailer(); |
|
|
|
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); |
|
|
|
finBillTrailer.setBillAppSid(dtoSid); |
|
|
|
finBillTrailerService.save(finBillTrailer); |
|
|
|
} |
|
|
|
return rb.success().setMsg("修改成功").setData(dtoSid); |
|
|
|
} |
|
|
|
|
|
|
|
@ -446,8 +358,51 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
} |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); |
|
|
|
vo.setFinBillVehicles(finBillVehicleVos); |
|
|
|
List<FinBillFileVo> finBillFileVos = finBillFileService.groupByList(sid); |
|
|
|
vo.setFinBillFileVos(finBillFileVos); |
|
|
|
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); |
|
|
|
if (finBillTrailerVos.size() > 0){ |
|
|
|
vo.setFinBillTrailers(finBillTrailerVos); |
|
|
|
}else { |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData(); |
|
|
|
List<TrailerVo> trailerVos = baseTrailerFeign.trailerList(baseVehicle.getSid()).getData(); |
|
|
|
for (TrailerVo trailerVo : trailerVos) { |
|
|
|
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); |
|
|
|
finBillTrailerVo.setBillAppSid(sid); |
|
|
|
finBillTrailerVo.setVinNo(finBillVehicleVo.getVinNo()); |
|
|
|
finBillTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); |
|
|
|
finBillTrailerVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
finBillTrailerVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue()); |
|
|
|
finBillTrailerVo.setOpenTickSid(finBillVehicleVo.getOpenTickSid()); |
|
|
|
finBillTrailerVo.setOpenTickName(finBillVehicleVo.getOpenTickName()); |
|
|
|
finBillTrailerVos.add(finBillTrailerVo); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setFinBillTrailers(finBillTrailerVos); |
|
|
|
} |
|
|
|
List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid); |
|
|
|
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
String fileUrl = khkpsqsApplicationAppendx.getFileUrl(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
fileUrl = urlPrefix + fileUrl; |
|
|
|
khkpsqsApplicationAppendx.setFileUrl(fileUrl); |
|
|
|
} |
|
|
|
List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillFileService.fetchkpxxqrsBySid(sid); |
|
|
|
for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { |
|
|
|
String fileUrl = kpxxqrsApplicationAppendx.getFileUrl(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
fileUrl = urlPrefix + fileUrl; |
|
|
|
kpxxqrsApplicationAppendx.setFileUrl(fileUrl); |
|
|
|
} |
|
|
|
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillFileService.fetchcldjhtBySid(sid); |
|
|
|
for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { |
|
|
|
String fileUrl = cldjhtApplicationAppendx.getFileUrl(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
fileUrl = urlPrefix + fileUrl; |
|
|
|
cldjhtApplicationAppendx.setFileUrl(fileUrl); |
|
|
|
} |
|
|
|
vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); |
|
|
|
vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); |
|
|
|
vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1032,7 +987,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
AppVinListVo appVinListVo = new AppVinListVo(); |
|
|
|
appVinListVo.setVIN(finBillVehicleVo.getVIN()); |
|
|
|
appVinListVo.setVIN(finBillVehicleVo.getVinNo()); |
|
|
|
appVinListVo.setInvoiceName(finBillVehicleVo.getBillName()); |
|
|
|
appVinListVo.setInvoiceNameKey(finBillVehicleVo.getBillNameSid()); |
|
|
|
appVinListVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
@ -1328,4 +1283,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
return complete(variables); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
public String getApplyCode(String useOrgSid) { |
|
|
|
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid); |
|
|
|
String orgCode = resultBean1.getData().getOrgCode(); |
|
|
|
BillNo b = new BillNo(); |
|
|
|
b.setOrgCode(orgCode); |
|
|
|
b.setBillType(BillTypeEnum.KPSQ.getBillType()); |
|
|
|
String bill = Rule.getBill(b); |
|
|
|
String i = baseMapper.selectNum(bill); |
|
|
|
String billNo = ""; |
|
|
|
if (StringUtils.isNotBlank(i)) { |
|
|
|
billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); |
|
|
|
} else { |
|
|
|
billNo = Rule.getBillNo(bill, 0); |
|
|
|
} |
|
|
|
return billNo; |
|
|
|
} |
|
|
|
} |
