yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
God 2 years ago
parent
be0991d40e
commit
0f6a37779f
8 changed files with 310 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java
  2. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  3. 56
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
  5. 289
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  6. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
  7. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java
  8. 60
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java
View File

@ -17,6 +17,7 @@ public class ContractPageQuery implements Query {
private int stateType; private int stateType;
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; private String orgPath;
private String menuSid;
@ApiModelProperty("pc客户名称") @ApiModelProperty("pc客户名称")
private String customerName; private String customerName;

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
View File

@ -224,16 +224,18 @@
<select id="getApprovalContractList" resultType="com.yxt.anrui.base.api.commoncontract.ContractPageVo"> <select id="getApprovalContractList" resultType="com.yxt.anrui.base.api.commoncontract.ContractPageVo">
SELECT SELECT
sid as contractSid, cc.sid AS contractSid,
contractNo as contractId, cc.contractNo AS contractId,
customerSid, cc.customerSid,
partyA, cc.partyA,
partyB as customerName, cc.partyB AS customerName,
DATE_FORMAT(createDate, '%Y-%m-%d') as createDate, DATE_FORMAT(cc.createDate, '%Y-%m-%d') AS createDate,
modelSid, cc.modelSid,
modelName cc.modelName
FROM FROM
common_contract common_contract cc
JOIN anrui_buscenter.`bus_sales_order` bo
ON cc.`contractNo` = bo.`contractNo`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

56
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -69,9 +69,11 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
@ -2655,21 +2657,61 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
QueryWrapper<ContractPageVo> qw = new QueryWrapper<>(); QueryWrapper<ContractPageVo> qw = new QueryWrapper<>();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
if (params.getStateType() == 2) { if (params.getStateType() == 2) {
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); if (StringUtils.isNotBlank(params.getMenuSid())) {
String staffSid = sysUserVo.getStaffSid(); //=======================
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData(); PrivilegeQuery privilegeQuery = new PrivilegeQuery();
qw.eq("staffSid", staffSid); privilegeQuery.setOrgPath(params.getOrgPath());
qw.eq("orgSid", sysOrganizationVo.getSid()); privilegeQuery.setMenuSid(params.getMenuSid());
privilegeQuery.setUserSid(params.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = params.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
String staffSid = sysUserVo.getStaffSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
qw.eq("cc.staffSid", staffSid);
qw.eq("cc.orgSid", sysOrganizationVo.getSid());
} else {
IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>());
return page;
}
} else {
IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>());
return page;
}
}
ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), useOrgSid); ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), useOrgSid);
if (!busList.getData().isEmpty()) { if (!busList.getData().isEmpty()) {
qw.in("busSid", busList.getData()); qw.in("cc.busSid", busList.getData());
} else { } else {
IPage<ContractPageVo> page = PagerUtil.queryToPage(query); IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>()); page.setRecords(new ArrayList<>());
return page; return page;
} }
if (StringUtils.isNotBlank(params.getName())) { if (StringUtils.isNotBlank(params.getName())) {
qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); qw.and(wrapper -> wrapper.like("cc.partyB", params.getName()).or().like("cc.contractNo", params.getName()));
} }
} else { } else {
//欠款提车只允许三方金融贷款业务欠款提车 //欠款提车只允许三方金融贷款业务欠款提车

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
View File

@ -127,7 +127,7 @@ public class FinBillApplicationDto implements Dto {
@ApiModelProperty(value = "开票名称") @ApiModelProperty(value = "开票名称")
private String openTickName; private String openTickName;
@ApiModelProperty(value = "欠款金额") @ApiModelProperty(value = "欠款金额")
private String arrearsMoney; private String arrearsMoney = "0";
@ApiModelProperty(value = "承诺回款日期") @ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate; private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key") @ApiModelProperty(value = "欠款开票原因key")

289
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -1359,7 +1359,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles(); List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
for (FinBillVehicleDto finBillVehicle : finBillVehicles) { for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
int i = finBillVehicleService.checkIsKp(contractNo, finBillVehicle.getVehSid()); int i = finBillVehicleService.checkIsKp(contractNo, finBillVehicle.getVehSid());
if (i > 0){ if (i > 0) {
return rb.setMsg(finBillVehicle.getVinNo() + "已发起过开票申请"); return rb.setMsg(finBillVehicle.getVinNo() + "已发起过开票申请");
} }
} }
@ -1916,6 +1916,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
List<FinBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs(); List<FinBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs();
List<FinBillFileDto> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs(); List<FinBillFileDto> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();
List<FinBillFileDto> pcgsgdhdwdbjy = dto.getPcgsgdhdwdbjy();
List<FinBillFileDto> pczrrdbcns = dto.getPczrrdbcns();
List<FinBillFileDto> pczfxsjt = dto.getPczfxsjt();
if (StringUtils.isBlank(dtoSid)) {//新增 if (StringUtils.isBlank(dtoSid)) {//新增
FinBillApplication finBillApplication = new FinBillApplication(); FinBillApplication finBillApplication = new FinBillApplication();
BeanUtil.copyProperties(dto, finBillApplication, "sid"); BeanUtil.copyProperties(dto, finBillApplication, "sid");
@ -2040,6 +2043,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto); finBillFileService.saveOrUpdateDto(finBillFileDto);
} }
} }
if (pcgsgdhdwdbjy.size() > 0) {
for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczrrdbcns.size() > 0) {
for (FinBillFileDto finBillFileDto : pczrrdbcns) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczfxsjt.size() > 0) {
for (FinBillFileDto finBillFileDto : pczfxsjt) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
} }
FinBillApplication finBillApplication = fetchBySid(dtoSid); FinBillApplication finBillApplication = fetchBySid(dtoSid);
@ -2111,6 +2150,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto); finBillFileService.saveOrUpdateDto(finBillFileDto);
} }
} }
if (pcgsgdhdwdbjy.size() > 0) {
for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczrrdbcns.size() > 0) {
for (FinBillFileDto finBillFileDto : pczrrdbcns) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczfxsjt.size() > 0) {
for (FinBillFileDto finBillFileDto : pczfxsjt) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
finBillVehicleService.delByBillAppSid(dtoSid); finBillVehicleService.delByBillAppSid(dtoSid);
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
FinBillVehicle finBillVehicle = new FinBillVehicle(); FinBillVehicle finBillVehicle = new FinBillVehicle();
@ -2388,7 +2463,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables); bv.setFormVariables(variables);
//======================================= //=======================================
if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())){ if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())) {
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid(); String nextNodeUserSids_ = sysOrganization.getManagerSid();
@ -2497,119 +2572,76 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath()); busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName());
busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid()); busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath());
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData(); busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid());
busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName()); SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData();
busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid()); busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName());
busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName()); busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid());
busValcustFilingDto.setContractNo(finBillApplication.getContractNo()); busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName());
busValcustFilingDto.setModelSid(finBillApplication.getModelSid()); busValcustFilingDto.setContractNo(finBillApplication.getContractNo());
busValcustFilingDto.setModelName(finBillApplication.getModelName()); busValcustFilingDto.setModelSid(finBillApplication.getModelSid());
String vinSid = ""; busValcustFilingDto.setModelName(finBillApplication.getModelName());
String vinNo = ""; String vinSid = "";
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { String vinNo = "";
vinSid = vinSid + finBillVehicleVo.getVehSid() + ","; for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
vinNo = vinNo + finBillVehicleVo.getVinNo() + ","; vinSid = vinSid + finBillVehicleVo.getVehSid() + ",";
} vinNo = vinNo + finBillVehicleVo.getVinNo() + ",";
busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(",")));
busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(",")));
BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice());
int i = money.compareTo(BigDecimal.ZERO);
if (i == 1) {
busValcustFilingDto.setIsGdk("0");
String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData();
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString());
} else {
busValcustFilingDto.setIsGdk("1");
busValcustFilingDto.setYsMoney("0");
}
busValcustFilingDto.setMoney(money.abs().toString());
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid());
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
} else {//不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
} else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
if (crmCustomerTempVo != null){
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
} }
} busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(",")));
if (finBillTrailerVos != null) { busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(",")));
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice());
String gcVinNo = finBillTrailerVo.getGcVinNo(); int i = money.compareTo(BigDecimal.ZERO);
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); if (i == 1) {
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid()); busValcustFilingDto.setIsGdk("0");
String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData();
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString());
} else {
busValcustFilingDto.setIsGdk("1");
busValcustFilingDto.setYsMoney("0");
}
busValcustFilingDto.setMoney(money.abs().toString());
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid());
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
} else {//不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(gcVinNo); finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001"); finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票"); finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001"); finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交"); finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车"); finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
} else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
@ -2617,14 +2649,59 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else { } else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
} }
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
} }
} }
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
} }
} }
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney(); BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
@ -3370,7 +3447,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables); bv.setFormVariables(variables);
//======================================= //=======================================
if (finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName())){ if (finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName())) {
List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/")); List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid(); String nextNodeUserSids_ = sysOrganization.getManagerSid();

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
View File

@ -34,6 +34,10 @@ public class AdvanceInvoiceInfoVo implements Vo {
private String invoicingUnit; private String invoicingUnit;
@ApiModelProperty("是否领取原件") @ApiModelProperty("是否领取原件")
private String getOriginalValue; private String getOriginalValue;
@ApiModelProperty("默认开票类型key")
private String openTickTypeKey;
@ApiModelProperty("默认开票类型value")
private String openTickTypeValue;
@ApiModelProperty("默认开票sid") @ApiModelProperty("默认开票sid")
private String openTickSid; private String openTickSid;
@ApiModelProperty("默认开票名称") @ApiModelProperty("默认开票名称")
@ -58,7 +62,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
private String reasonRemarks; private String reasonRemarks;
@ApiModelProperty("欠款开票挂车信息") @ApiModelProperty("欠款开票挂车信息")
private List<FinBillTrailerVo> finBillTrailers; private List<FinBillTrailerVo> finBillTrailers;
@ApiModelProperty("欠款承诺书(欠款人、担保人同签)") @ApiModelProperty("欠款承诺书(欠款人、担保人同签)(欠款领票上传)")
private List<String> fjApplicationAppendxs; private List<String> fjApplicationAppendxs;
@ApiModelProperty("公司股东会对外担保决议(公司担保)") @ApiModelProperty("公司股东会对外担保决议(公司担保)")
private List<String> gsgdhdwdbjy; private List<String> gsgdhdwdbjy;
@ -76,7 +80,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
private List<String> registerContractImages; private List<String> registerContractImages;
@ApiModelProperty("确认书") @ApiModelProperty("确认书")
private List<String> invoiceApplyConfirmImages; private List<String> invoiceApplyConfirmImages;
@ApiModelProperty("欠款领票附件") @ApiModelProperty("《欠款承诺书》(欠款人、担保人同签)(欠款开票上传)")
private List<String> arrearsCollectionAppendxs; private List<String> arrearsCollectionAppendxs;
@ApiModelProperty("用户sid") @ApiModelProperty("用户sid")
private String userSid; private String userSid;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java
View File

@ -16,4 +16,5 @@ public class RovalContractPageQuery implements Query {
private int stateType; private int stateType;
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; private String orgPath;
private String menuSid;
} }

60
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -224,6 +224,8 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName()); vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
vo.setName(finBillApplicationDetailsVo.getCustomerName()); vo.setName(finBillApplicationDetailsVo.getCustomerName());
vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney()); vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
vo.setOpenTickTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
vo.setOpenTickTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue());
vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid()); vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid());
vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName()); vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
vo.setContractId(finBillApplicationDetailsVo.getContractNo()); vo.setContractId(finBillApplicationDetailsVo.getContractNo());
@ -280,11 +282,17 @@ public class AppBusAdvanceGinvoiceapplyService {
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
List<FinBillFileVo> arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs(); List<FinBillFileVo> arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs();
List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy();
List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns();
List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt();
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同 List<String> registerContractImages = new ArrayList<>();//车辆登记合同
List<String> idCardImages = new ArrayList<>(); List<String> idCardImages = new ArrayList<>();
List<String> qklpfjImages = new ArrayList<>(); List<String> qklpfjImages = new ArrayList<>();
List<String> gsgdhdwdbjy = new ArrayList<>();
List<String> zrrdbcns = new ArrayList<>();
List<String> zfxsjt = new ArrayList<>();
if (zjApplicationAppendxs != null) { if (zjApplicationAppendxs != null) {
for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
idCardImages.add(zjApplicationAppendx.getFileUrl()); idCardImages.add(zjApplicationAppendx.getFileUrl());
@ -310,11 +318,29 @@ public class AppBusAdvanceGinvoiceapplyService {
qklpfjImages.add(arrearsCollectionAppendx.getFileUrl()); qklpfjImages.add(arrearsCollectionAppendx.getFileUrl());
} }
} }
if (pcgsgdhdwdbjy != null) {
for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl());
}
}
if (pczrrdbcns != null) {
for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
zrrdbcns.add(pczrrdbcn.getFileUrl());
}
}
if (pczfxsjt != null) {
for (FinBillFileVo pczfxs : pczfxsjt) {
zfxsjt.add(pczfxs.getFileUrl());
}
}
vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
vo.setRegisterContractImages(registerContractImages); vo.setRegisterContractImages(registerContractImages);
vo.setIdCardImages(idCardImages); vo.setIdCardImages(idCardImages);
vo.setArrearsCollectionAppendxs(qklpfjImages); vo.setArrearsCollectionAppendxs(qklpfjImages);
vo.setGsgdhdwdbjy(gsgdhdwdbjy);
vo.setZrrdbcns(zrrdbcns);
vo.setZfxsjt(zfxsjt);
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
vo.setIsCanEdit(false); vo.setIsCanEdit(false);
@ -522,12 +548,18 @@ public class AppBusAdvanceGinvoiceapplyService {
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
List<String> idCardImages = dto.getIdCardImages();//证件 List<String> idCardImages = dto.getIdCardImages();//证件
List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件 List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();
List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy();
List<String> zrrdbcns = dto.getZrrdbcns();
List<String> zfxsjt = dto.getZfxsjt();
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件 List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
List<FinBillFileDto> qklpfjImages = new ArrayList<>(); // 欠款领票附件 List<FinBillFileDto> qklpfjImages = new ArrayList<>();
List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>();
List<FinBillFileDto> pczrrdbcns = new ArrayList<>();
List<FinBillFileDto> pczfxsjt = new ArrayList<>();
if (customerInvoiceApplyImages != null) { if (customerInvoiceApplyImages != null) {
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto(); FinBillFileDto finBillFileDto = new FinBillFileDto();
@ -563,11 +595,35 @@ public class AppBusAdvanceGinvoiceapplyService {
qklpfjImages.add(finBillFileDto); qklpfjImages.add(finBillFileDto);
} }
} }
if (gsgdhdwdbjy != null) {
for (String gsgdhdwdb : gsgdhdwdbjy) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(gsgdhdwdb);
pcgsgdhdwdbjy.add(finBillFileDto);
}
}
if (zrrdbcns != null) {
for (String zrrdbcn : zrrdbcns) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(zrrdbcn);
pczrrdbcns.add(finBillFileDto);
}
}
if (zfxsjt != null) {
for (String zfxs : zfxsjt) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(zfxs);
pczfxsjt.add(finBillFileDto);
}
}
finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages); finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages);
finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy);
finBillApplicationDto.setPczrrdbcns(pczrrdbcns);
finBillApplicationDto.setPczfxsjt(pczfxsjt);
ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto); ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto);
return resultBean; return resultBean;
} }

Write Preview
Loading…
Cancel
Save