diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQKQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQKQuery.java index 7445f06dbf..bcaee87850 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQKQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQKQuery.java @@ -25,10 +25,10 @@ public class CommonContractQKQuery implements Query { @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("销售专员sid") - private String staffSid; - @ApiModelProperty("部门sid") - private String deptSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; @ApiModelProperty("客户名称") - private String customerName; // 客户名称 + private String customerName; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index c2f083397e..fbd16df18e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; @@ -46,6 +47,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -89,6 +92,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { if (list.size() > 0) { @@ -272,7 +277,13 @@ public class BusSalesOrderVehicleService extends MybatisBaseService busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw); List busVehicleQKKPTrailerVos = new ArrayList<>(); List busVehicleQKKPVosNew = new ArrayList<>(); - for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) { + for (BusVehicleQKKPVo record : busVehicleQKKPVos) { + FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); + if (finBillVehicleDetailsVo == null){ + busVehicleQKKPVosNew.add(record); + } + } + for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew) { if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) { BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData(); busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState()); @@ -288,9 +299,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService finBillVehicles; // 开票车辆信息 + private List finBillVehicles; @ApiModelProperty("开票挂车信息") - private List finBillTrailers; // 开票挂车信息 + private List finBillTrailers; @ApiModelProperty("客户开票申请书附件信息") - private List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 + private List khkpsqsApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("款项确认书附件信息") - private List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 款项确认书附件信息 + private List kpxxqrsApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("车辆登记合同附件信息") - private List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 + private List cldjhtApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("证件") private List zjApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("附件") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index bbe80ef12f..6f9ef2594b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -176,6 +176,47 @@ public interface FinBillApplicationFeign { @PostMapping(value = "/breakProcessQK") public ResultBean breakProcessQK(@Valid @RequestBody FinBillTaskQuery query); + /*************************欠款领票流程管理接口********************************/ + + @ApiOperation("欠款领票审批流程") + @PostMapping("/submitFinBillApplicationQKLP") + public ResultBean submitFinBillApplicationQKLP(@RequestBody @Valid SubmitFinBillApplicationDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/completeQKLP") + public ResultBean completeQKLP(@Valid @RequestBody FinBillCompleteDto query); + + //欠款开票销售内勤审批 + @ApiOperation(value = "办理（同意）") + @PostMapping("/completeByQKLP") + ResultBean completeByQKLP(@Valid @RequestBody FinBillCompleteDto query); + + //分公司到风控中心同意 + @ApiOperation(value = "办理（同意）") + @PostMapping("/companyToDivisionOperateQKLP") + public ResultBean companyToDivisionOperateQKLP(@Valid @RequestBody FinBillCompleteDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForRejectQKLP") + ResultBean> getPreviousNodesForRejectQKLP(@Valid @SpringQueryMap FinBillNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmitQKLP") + ResultBean> getNextNodesForSubmitQKLP(@Valid @SpringQueryMap FinBillNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/rejectQKLP") + public ResultBean rejectQKLP(@Valid @RequestBody FinBillTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcessQKLP") + public ResultBean revokeProcessQKLP(@Valid @RequestBody FinBillTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcessQKLP") + public ResultBean breakProcessQKLP(@Valid @RequestBody FinBillTaskQuery query); + + /*************************App接口********************************/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 6e43597432..6da1780f74 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -187,6 +187,51 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign return null; } + @Override + public ResultBean submitFinBillApplicationQKLP(SubmitFinBillApplicationDto dto) { + return null; + } + + @Override + public ResultBean completeQKLP(FinBillCompleteDto query) { + return null; + } + + @Override + public ResultBean completeByQKLP(FinBillCompleteDto query) { + return null; + } + + @Override + public ResultBean companyToDivisionOperateQKLP(FinBillCompleteDto query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmitQKLP(FinBillNodeQuery query) { + return null; + } + + @Override + public ResultBean rejectQKLP(FinBillTaskQuery query) { + return null; + } + + @Override + public ResultBean revokeProcessQKLP(FinBillTaskQuery query) { + return null; + } + + @Override + public ResultBean breakProcessQKLP(FinBillTaskQuery query) { + return null; + } + @Override public ResultBean> getInvoicedApplyList(PagerQuery pagerQuery) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java index 1a7bbc8ba6..241da184bc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java @@ -37,6 +37,8 @@ public class FinBillCompleteDto implements Dto { @NotBlank(message = "参数错误：businessSid") private String businessSid; + @ApiModelProperty("附件") + private List fjApplicationAppendxs; @ApiModelProperty("证件") private List idCardImages; @ApiModelProperty("客户开票申请书") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java index 91d9a2d1cf..d76ac76892 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-fin(开票挂车信息)
* File: FinBillTrailerVo.java
@@ -73,5 +75,5 @@ public class FinBillTrailerVo implements Vo { private String oneBillMoney; // 单台开票金额 @ApiModelProperty("合格证图片") - private String hgzImageUrl; // 合格证图片 + private List hgzImageUrl; // 合格证图片 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index de735d7e4b..24a301f2d1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -224,6 +224,60 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { return finBillApplicationService.breakProcessQK(query); } + @Override + public ResultBean submitFinBillApplicationQKLP(SubmitFinBillApplicationDto dto) { + return finBillApplicationService.submitFinBillApplicationQKLP(dto); + } + + @Override + public ResultBean completeQKLP(FinBillCompleteDto query) { + BusinessVariables bv=new BusinessVariables(); + BeanUtil.copyProperties(query,bv); + bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId()); + return finBillApplicationService.completeQKLP(bv); + } + + @Override + public ResultBean completeByQKLP(FinBillCompleteDto query) { + BusinessVariables bv=new BusinessVariables(); + BeanUtil.copyProperties(query,bv); + bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId()); + return finBillApplicationService.completeByQKLP(bv); + } + + @Override + public ResultBean companyToDivisionOperateQKLP(FinBillCompleteDto query) { + BusinessVariables bv=new BusinessVariables(); + BeanUtil.copyProperties(query,bv); + bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId()); + return finBillApplicationService.companyToDivisionOperateQKLP(bv); + } + + @Override + public ResultBean> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) { + return finBillApplicationService.getPreviousNodesForRejectQKLP(query); + } + + @Override + public ResultBean> getNextNodesForSubmitQKLP(FinBillNodeQuery query) { + return finBillApplicationService.getNextNodesForSubmitQKLP(query); + } + + @Override + public ResultBean rejectQKLP(FinBillTaskQuery query) { + return finBillApplicationService.rejectQKLP(query); + } + + @Override + public ResultBean revokeProcessQKLP(FinBillTaskQuery query) { + return finBillApplicationService.revokeProcessQKLP(query); + } + + @Override + public ResultBean breakProcessQKLP(FinBillTaskQuery query) { + return finBillApplicationService.breakProcessQKLP(query); + } + @Override public ResultBean> getInvoicedApplyList(PagerQuery pagerQuery) { if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index b229d1d764..c0b2457a10 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -402,15 +402,17 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); if (finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { - FinBillVehicleVo finBillVehicleVo = finBillVehicleService.selByVinNo(finBillTrailerVo.getVinNo()); + FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid); finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks()); BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); + List hgzImageUrls = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { - finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl()); + hgzImageUrls.add(commonAppendixVo.getFileUrl()); } } + finBillTrailerVo.setHgzImageUrl(hgzImageUrls); } vo.setFinBillTrailers(finBillTrailerVos); } else { @@ -430,11 +432,13 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); + List hgzImageUrls = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { - finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl()); + hgzImageUrls.add(commonAppendixVo.getFileUrl()); } } + finBillTrailerVo.setHgzImageUrl(hgzImageUrls); finBillTrailerVos.add(finBillTrailerVo); } } @@ -1618,6 +1622,7 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); - variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); + variables.put("isAdj", finBillApplication1.getIsLQOrigInvoice().equals("是")); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -2151,4 +2156,39 @@ public class FinBillApplicationService extends MybatisBaseService> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) { + return null; + } + + public ResultBean> getNextNodesForSubmitQKLP(FinBillNodeQuery query) { + return null; + } + + public ResultBean rejectQKLP(FinBillTaskQuery query) { + return null; + } + + public ResultBean revokeProcessQKLP(FinBillTaskQuery query) { + return null; + } + + public ResultBean breakProcessQKLP(FinBillTaskQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java index 5bfde38c79..69842909bc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java @@ -79,4 +79,7 @@ public interface FinBillVehicleMapper extends BaseMapper { @Select("select * from fin_bill_vehicle where vinNo = #{vinNo}") FinBillVehicleVo selByVinNo(String vinNo); + + @Select("select * from fin_bill_vehicle where billAppSid = #{sid}") + FinBillVehicleVo fetchByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java index 5b2d3909ae..68fe99d96a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java @@ -145,4 +145,8 @@ public class FinBillVehicleService extends MybatisBaseService filesPath; + // 保存文本使用 + private String text; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public boolean isNullAble() { + return nullAble; + } + + public void setNullAble(boolean nullAble) { + this.nullAble = nullAble; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public List getFilesPath() { + return filesPath; + } + + public void setFilesPath(List filesPath) { + this.filesPath = filesPath; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceQuery.java index d35992392d..72e20d3ba2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceQuery.java @@ -15,6 +15,5 @@ public class AdvanceInvoiceQuery implements Query { @ApiModelProperty(value = "业务sid") private String businessSid; @ApiModelProperty(value = "0 上一环节 1下一环节") - @NotNull(message = "参数错误：next") private Integer next; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpFlowListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpFlowListVo.java index 9154def0aa..a3d7184016 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpFlowListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpFlowListVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.ItemEditTextInfo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,12 +17,6 @@ public class qkkpFlowListVo implements Vo { private static final long serialVersionUID = 835198618461779653L; private String title; - @ApiModelProperty("证件") - private List idCardImages; - @ApiModelProperty("客户开票申请书") - private List customerInvoiceApplyImages; - @ApiModelProperty("车辆登记合同") - private List registerContractImages; - @ApiModelProperty("确认书") - private List invoiceApplyConfirmImages; + + private List list; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java index c48bdc1eea..f947fd3129 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java @@ -144,6 +144,4 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl public ResultBean getFlowOperateTitleBy(AdvanceInvoiceQuery query) { return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleBy(query); } - - } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index f5336b38fa..2743c911b5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -129,10 +129,10 @@ public class AppBusAdvanceGinvoiceapplyService { advanceInvoicePageVo.setModel(record.getModelName()); advanceInvoicePageVo.setType(record.getSaleTypeValue()); advanceInvoicePageVo.setContractType(record.getNodeState()); - if (record.getNodeState().equals("待提交")){ + if (record.getNodeState().equals("待提交")) { advanceInvoicePageVo.setShowUpdateBtn(true); advanceInvoicePageVo.setShowDeleteBtn(true); - }else { + } else { advanceInvoicePageVo.setShowUpdateBtn(false); advanceInvoicePageVo.setShowDeleteBtn(false); } @@ -170,10 +170,10 @@ public class AppBusAdvanceGinvoiceapplyService { advanceInvoicePageVo.setModel(record.getModelName()); advanceInvoicePageVo.setType(record.getSaleTypeValue()); advanceInvoicePageVo.setContractType(record.getNodeState()); - if (record.getNodeState().equals("待提交")){ + if (record.getNodeState().equals("待提交")) { advanceInvoicePageVo.setShowUpdateBtn(true); advanceInvoicePageVo.setShowDeleteBtn(true); - }else { + } else { advanceInvoicePageVo.setShowUpdateBtn(false); advanceInvoicePageVo.setShowDeleteBtn(false); } @@ -225,7 +225,7 @@ public class AppBusAdvanceGinvoiceapplyService { //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); - if (finBillVehicles != null){ + if (finBillVehicles != null) { for (FinBillVehicleVo finBillVehicle : finBillVehicles) { AppCarListVo vinListVo = new AppCarListVo(); vinListVo.setVin(finBillVehicle.getVinNo()); @@ -244,14 +244,12 @@ public class AppBusAdvanceGinvoiceapplyService { //挂车信息 List finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); List finBillTrailerVos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); - BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); - String hgzImageUrl = finBillTrailer.getHgzImageUrl(); - List files = new ArrayList<>(); - files.add(hgzImageUrl); - finBillTrailerVo.setFiles(files); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerVo); + List hgzImageUrl = finBillTrailer.getHgzImageUrl(); + finBillTrailerVo.setFiles(hgzImageUrl); finBillTrailerVos.add(finBillTrailerVo); } } @@ -265,22 +263,22 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); - if (zjApplicationAppendxs != null){ + if (zjApplicationAppendxs != null) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); } } - if (khkpsqsApplicationAppendxs != null){ + if (khkpsqsApplicationAppendxs != null) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } } - if (kpxxqrsApplicationAppendxs != null){ + if (kpxxqrsApplicationAppendxs != null) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } } - if (cldjhtApplicationAppendxs != null){ + if (cldjhtApplicationAppendxs != null) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } @@ -290,10 +288,10 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); - }else { + } else { vo.setIsCanEdit(true); } return rb.success().setData(vo); @@ -334,7 +332,7 @@ public class AppBusAdvanceGinvoiceapplyService { //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); - if (finBillVehicles != null){ + if (finBillVehicles != null) { for (FinBillVehicleVo finBillVehicle : finBillVehicles) { AppCarListVo vinListVo = new AppCarListVo(); vinListVo.setVin(finBillVehicle.getVinNo()); @@ -353,14 +351,12 @@ public class AppBusAdvanceGinvoiceapplyService { //挂车信息 List finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); List finBillTrailerVos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); - BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); - String hgzImageUrl = finBillTrailer.getHgzImageUrl(); - List files = new ArrayList<>(); - files.add(hgzImageUrl); - finBillTrailerVo.setFiles(files); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerVo); + List hgzImageUrl = finBillTrailer.getHgzImageUrl(); + finBillTrailerVo.setFiles(hgzImageUrl); finBillTrailerVos.add(finBillTrailerVo); } } @@ -368,17 +364,17 @@ public class AppBusAdvanceGinvoiceapplyService { //附件信息 List fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); List fj = new ArrayList<>(); - if (fjApplicationAppendxs != null){ + if (fjApplicationAppendxs != null) { for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) { fj.add(fjApplicationAppendx.getFileUrl()); } } vo.setFjApplicationAppendxs(fj); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); - }else { + } else { vo.setIsCanEdit(true); } return rb.success().setData(vo); @@ -434,7 +430,7 @@ public class AppBusAdvanceGinvoiceapplyService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -451,28 +447,28 @@ public class AppBusAdvanceGinvoiceapplyService { List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (customerInvoiceApplyImages != null){ + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); @@ -537,7 +533,7 @@ public class AppBusAdvanceGinvoiceapplyService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -548,7 +544,7 @@ public class AppBusAdvanceGinvoiceapplyService { //附件信息 List fjApplicationAppendxs = dto.getFjApplicationAppendxs();//证件 List fj = new ArrayList<>();//证件 - if (fjApplicationAppendxs != null){ + if (fjApplicationAppendxs != null) { for (String fjApplicationAppendx : fjApplicationAppendxs) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(fjApplicationAppendx); @@ -620,7 +616,7 @@ public class AppBusAdvanceGinvoiceapplyService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -637,28 +633,28 @@ public class AppBusAdvanceGinvoiceapplyService { List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (customerInvoiceApplyImages != null){ + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); @@ -817,7 +813,7 @@ public class AppBusAdvanceGinvoiceapplyService { //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); - if (finBillVehicles != null){ + if (finBillVehicles != null) { for (FinBillVehicleVo finBillVehicle : finBillVehicles) { AppCarListVo vinListVo = new AppCarListVo(); vinListVo.setVin(finBillVehicle.getVinNo()); @@ -836,14 +832,12 @@ public class AppBusAdvanceGinvoiceapplyService { //挂车信息 List finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); List finBillTrailerVos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); - BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); - String hgzImageUrl = finBillTrailer.getHgzImageUrl(); - List files = new ArrayList<>(); - files.add(hgzImageUrl); - finBillTrailerVo.setFiles(files); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerVo); + List hgzImageUrl = finBillTrailer.getHgzImageUrl(); + finBillTrailerVo.setFiles(hgzImageUrl); finBillTrailerVos.add(finBillTrailerVo); } } @@ -857,22 +851,22 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); - if (zjApplicationAppendxs != null){ + if (zjApplicationAppendxs != null) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); } } - if (khkpsqsApplicationAppendxs != null){ + if (khkpsqsApplicationAppendxs != null) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } } - if (kpxxqrsApplicationAppendxs != null){ + if (kpxxqrsApplicationAppendxs != null) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } } - if (cldjhtApplicationAppendxs != null){ + if (cldjhtApplicationAppendxs != null) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } @@ -882,10 +876,10 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); - }else { + } else { vo.setIsCanEdit(true); } return rb.success().setData(vo); @@ -894,9 +888,9 @@ public class AppBusAdvanceGinvoiceapplyService { public ResultBean agreeQKKPInfoBy(qkkpDto dto) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = ""; - if(StringUtils.isNotBlank(dto.getOrgPath())){ + if (StringUtils.isNotBlank(dto.getOrgPath())) { orgSidPath = dto.getOrgPath(); - }else{ + } else { //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -923,29 +917,15 @@ public class AppBusAdvanceGinvoiceapplyService { public ResultBean getFlowOperateTitleBy(AdvanceInvoiceQuery query) { ResultBean rb = ResultBean.fireFail(); qkkpFlowListVo qkkpFlowListVo = new qkkpFlowListVo(); - //0 上一环节 1下一环节 - int next = query.getNext(); FinBillNodeQuery getNodeQuery = new FinBillNodeQuery(); BeanUtil.copyProperties(query, getNodeQuery); String data = ""; - if (next == 0) { - ResultBean> previousNodesForReject = finBillApplicationFeign.getPreviousNodesForReject(getNodeQuery); - if (previousNodesForReject.getSuccess()) { - previousNodesForReject.getData().removeAll(Collections.singleton(null)); - data = previousNodesForReject.getData().get(0).getName(); - } else { - return rb.setMsg(previousNodesForReject.getMsg()); - } - } else if (next == 1) { - ResultBean> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmit(getNodeQuery); - if (nextNodesForSubmit.getSuccess()) { - nextNodesForSubmit.getData().removeAll(Collections.singleton(null)); - data = nextNodesForSubmit.getData().get(0).getName(); - } else { - return rb.setMsg(nextNodesForSubmit.getMsg()); - } + ResultBean> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmit(getNodeQuery); + if (nextNodesForSubmit.getSuccess()) { + nextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = nextNodesForSubmit.getData().get(0).getName(); } else { - return rb.setMsg("参数错误：next"); + return rb.setMsg(nextNodesForSubmit.getMsg()); } qkkpFlowListVo.setTitle(data); AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery(); @@ -955,7 +935,7 @@ public class AppBusAdvanceGinvoiceapplyService { return rb.setMsg(resultBean.getMsg()); } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); - if(finBillApplicationDetailsVo != null){ + if (finBillApplicationDetailsVo != null) { //附件信息 List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); @@ -965,30 +945,56 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); - if (zjApplicationAppendxs != null){ + List itemEditTextInfos = new ArrayList<>(); + if (zjApplicationAppendxs != null) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); } - } - if (khkpsqsApplicationAppendxs != null){ + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("证件"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("idCardImages"); + itemEditTextInfo.setFilesPath(idCardImages); + itemEditTextInfos.add(itemEditTextInfo); + } + if (khkpsqsApplicationAppendxs != null) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } - } - if (kpxxqrsApplicationAppendxs != null){ + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("客户开票申请书"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("customerInvoiceApplyImages"); + itemEditTextInfo.setFilesPath(customerInvoiceApplyImages); + itemEditTextInfos.add(itemEditTextInfo); + } + if (kpxxqrsApplicationAppendxs != null) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } - } - if (cldjhtApplicationAppendxs != null){ + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("款项确认书"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(true); + itemEditTextInfo.setKey("invoiceApplyConfirmImages"); + itemEditTextInfo.setFilesPath(invoiceApplyConfirmImages); + itemEditTextInfos.add(itemEditTextInfo); + } + if (cldjhtApplicationAppendxs != null) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } - } - qkkpFlowListVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); - qkkpFlowListVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); - qkkpFlowListVo.setRegisterContractImages(registerContractImages); - qkkpFlowListVo.setIdCardImages(idCardImages); + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("车辆登记合同"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(true); + itemEditTextInfo.setKey("registerContractImages"); + itemEditTextInfo.setFilesPath(registerContractImages); + itemEditTextInfos.add(itemEditTextInfo); + } + qkkpFlowListVo.setList(itemEditTextInfos); } return rb.success().setData(qkkpFlowListVo); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index b8bf036eeb..5e96d6bfe7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -151,10 +151,8 @@ public class InvoicedService { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); - String hgzImageUrl = finBillTrailer.getHgzImageUrl(); - List files = new ArrayList<>(); - files.add(hgzImageUrl); - finBillTrailerVo.setFiles(files); + List hgzImageUrl = finBillTrailer.getHgzImageUrl(); + finBillTrailerVo.setFiles(hgzImageUrl); finBillTrailerVos.add(finBillTrailerVo); } }