|
@ -406,7 +406,7 @@ public class AppBusAdvanceGinvoiceapplyService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
vo.setFinBillTrailers(finBillTrailerVos); |
|
|
vo.setFinBillTrailers(finBillTrailerVos); |
|
|
//附件信息
|
|
|
//《欠款承诺书》(欠款人、担保人同签)
|
|
|
List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); |
|
|
List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); |
|
|
List<String> fj = new ArrayList<>(); |
|
|
List<String> fj = new ArrayList<>(); |
|
|
if (fjApplicationAppendxs != null) { |
|
|
if (fjApplicationAppendxs != null) { |
|
@ -415,6 +415,33 @@ public class AppBusAdvanceGinvoiceapplyService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
vo.setFjApplicationAppendxs(fj); |
|
|
vo.setFjApplicationAppendxs(fj); |
|
|
|
|
|
//《公司股东会对外担保决议》(公司担保)
|
|
|
|
|
|
List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy(); |
|
|
|
|
|
List<String> gsgdhdwdbjy = new ArrayList<>(); |
|
|
|
|
|
if (pcgsgdhdwdbjy != null) { |
|
|
|
|
|
for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { |
|
|
|
|
|
gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
vo.setGsgdhdwdbjy(gsgdhdwdbjy); |
|
|
|
|
|
//《责任人担保承诺书》
|
|
|
|
|
|
List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns(); |
|
|
|
|
|
List<String> zrrdbcns = new ArrayList<>(); |
|
|
|
|
|
if (pczrrdbcns != null) { |
|
|
|
|
|
for (FinBillFileVo pczrrdbcn : pczrrdbcns) { |
|
|
|
|
|
zrrdbcns.add(pczrrdbcn.getFileUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
vo.setZrrdbcns(zrrdbcns); |
|
|
|
|
|
//资方信审截图
|
|
|
|
|
|
List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt(); |
|
|
|
|
|
List<String> zfxsjt = new ArrayList<>(); |
|
|
|
|
|
if (pczfxsjt != null) { |
|
|
|
|
|
for (FinBillFileVo pczfxs : pczfxsjt) { |
|
|
|
|
|
zfxsjt.add(pczfxs.getFileUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
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); |
|
@ -610,8 +637,14 @@ public class AppBusAdvanceGinvoiceapplyService { |
|
|
} |
|
|
} |
|
|
finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); |
|
|
finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); |
|
|
//附件信息
|
|
|
//附件信息
|
|
|
List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs();//证件
|
|
|
List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs(); |
|
|
List<FinBillFileDto> fj = new ArrayList<>();//证件
|
|
|
List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy(); |
|
|
|
|
|
List<String> zrrdbcns = dto.getZrrdbcns(); |
|
|
|
|
|
List<String> zfxsjt = dto.getZfxsjt(); |
|
|
|
|
|
List<FinBillFileDto> fj = new ArrayList<>(); |
|
|
|
|
|
List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>(); |
|
|
|
|
|
List<FinBillFileDto> pczrrdbcns = new ArrayList<>(); |
|
|
|
|
|
List<FinBillFileDto> pczfxsjt = new ArrayList<>(); |
|
|
if (fjApplicationAppendxs != null) { |
|
|
if (fjApplicationAppendxs != null) { |
|
|
for (String fjApplicationAppendx : fjApplicationAppendxs) { |
|
|
for (String fjApplicationAppendx : fjApplicationAppendxs) { |
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
|
FinBillFileDto finBillFileDto = new FinBillFileDto(); |
|
@ -619,7 +652,31 @@ public class AppBusAdvanceGinvoiceapplyService { |
|
|
fj.add(finBillFileDto); |
|
|
fj.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.setFjApplicationAppendxs(fj); |
|
|
finBillApplicationDto.setFjApplicationAppendxs(fj); |
|
|
|
|
|
finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy); |
|
|
|
|
|
finBillApplicationDto.setPczrrdbcns(pczrrdbcns); |
|
|
|
|
|
finBillApplicationDto.setPczfxsjt(pczfxsjt); |
|
|
ResultBean resultBean = finBillApplicationFeign.saveQKLP(finBillApplicationDto); |
|
|
ResultBean resultBean = finBillApplicationFeign.saveQKLP(finBillApplicationDto); |
|
|
return resultBean; |
|
|
return resultBean; |
|
|
} |
|
|
} |
|
@ -1404,22 +1461,67 @@ public class AppBusAdvanceGinvoiceapplyService { |
|
|
} |
|
|
} |
|
|
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); |
|
|
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); |
|
|
if (finBillApplicationDetailsVo != null) { |
|
|
if (finBillApplicationDetailsVo != null) { |
|
|
//附件信息
|
|
|
//《欠款承诺书》(欠款人、担保人同签)
|
|
|
List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); |
|
|
List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); |
|
|
|
|
|
//《公司股东会对外担保决议》(公司担保)
|
|
|
|
|
|
List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy(); |
|
|
|
|
|
//《责任人担保承诺书》
|
|
|
|
|
|
List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns(); |
|
|
|
|
|
//资方信审截图
|
|
|
|
|
|
List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt(); |
|
|
List<String> fj = new ArrayList<>(); |
|
|
List<String> fj = new ArrayList<>(); |
|
|
|
|
|
List<String> gsgdhdwdbjy = new ArrayList<>(); |
|
|
|
|
|
List<String> zrrdbcns = new ArrayList<>(); |
|
|
|
|
|
List<String> zfxsjt = new ArrayList<>(); |
|
|
List<ItemEditTextInfo> itemEditTextInfos = new ArrayList<>(); |
|
|
List<ItemEditTextInfo> itemEditTextInfos = new ArrayList<>(); |
|
|
if (fjApplicationAppendxs != null) { |
|
|
if (fjApplicationAppendxs != null) { |
|
|
for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) { |
|
|
for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) { |
|
|
fj.add(fjApplicationAppendx.getFileUrl()); |
|
|
fj.add(fjApplicationAppendx.getFileUrl()); |
|
|
} |
|
|
} |
|
|
ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); |
|
|
ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); |
|
|
itemEditTextInfo.setTitle("附件"); |
|
|
itemEditTextInfo.setTitle("《欠款承诺书》(欠款人、担保人同签)"); |
|
|
itemEditTextInfo.setType(1); |
|
|
itemEditTextInfo.setType(1); |
|
|
itemEditTextInfo.setNullAble(false); |
|
|
itemEditTextInfo.setNullAble(false); |
|
|
itemEditTextInfo.setKey("fjApplicationAppendxs"); |
|
|
itemEditTextInfo.setKey("fjApplicationAppendxs"); |
|
|
itemEditTextInfo.setFilesPath(fj); |
|
|
itemEditTextInfo.setFilesPath(fj); |
|
|
itemEditTextInfos.add(itemEditTextInfo); |
|
|
itemEditTextInfos.add(itemEditTextInfo); |
|
|
} |
|
|
} |
|
|
|
|
|
if (pcgsgdhdwdbjy != null) { |
|
|
|
|
|
for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { |
|
|
|
|
|
gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); |
|
|
|
|
|
itemEditTextInfo.setTitle("《公司股东会对外担保决议》(公司担保)"); |
|
|
|
|
|
itemEditTextInfo.setType(1); |
|
|
|
|
|
itemEditTextInfo.setNullAble(false); |
|
|
|
|
|
itemEditTextInfo.setKey("gsgdhdwdbjy"); |
|
|
|
|
|
itemEditTextInfo.setFilesPath(gsgdhdwdbjy); |
|
|
|
|
|
itemEditTextInfos.add(itemEditTextInfo); |
|
|
|
|
|
} |
|
|
|
|
|
if (pczrrdbcns != null) { |
|
|
|
|
|
for (FinBillFileVo pczrrdbcn : pczrrdbcns) { |
|
|
|
|
|
zrrdbcns.add(pczrrdbcn.getFileUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); |
|
|
|
|
|
itemEditTextInfo.setTitle("《责任人担保承诺书》"); |
|
|
|
|
|
itemEditTextInfo.setType(1); |
|
|
|
|
|
itemEditTextInfo.setNullAble(false); |
|
|
|
|
|
itemEditTextInfo.setKey("zrrdbcns"); |
|
|
|
|
|
itemEditTextInfo.setFilesPath(zrrdbcns); |
|
|
|
|
|
itemEditTextInfos.add(itemEditTextInfo); |
|
|
|
|
|
} |
|
|
|
|
|
if (pczfxsjt != null) { |
|
|
|
|
|
for (FinBillFileVo pczfxs : pczfxsjt) { |
|
|
|
|
|
zfxsjt.add(pczfxs.getFileUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); |
|
|
|
|
|
itemEditTextInfo.setTitle("资方信审截图"); |
|
|
|
|
|
itemEditTextInfo.setType(1); |
|
|
|
|
|
itemEditTextInfo.setNullAble(false); |
|
|
|
|
|
itemEditTextInfo.setKey("zfxsjt"); |
|
|
|
|
|
itemEditTextInfo.setFilesPath(zfxsjt); |
|
|
|
|
|
itemEditTextInfos.add(itemEditTextInfo); |
|
|
|
|
|
} |
|
|
qkkpFlowListVo.setList(itemEditTextInfos); |
|
|
qkkpFlowListVo.setList(itemEditTextInfos); |
|
|
} |
|
|
} |
|
|
return rb.success().setData(qkkpFlowListVo); |
|
|
return rb.success().setData(qkkpFlowListVo); |
|
|