问题优化

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")
+    @ApiModelProperty("用户sid")
-    private String staffSid;
+    private String userSid;
-    @ApiModelProperty("部门sid")
+    @ApiModelProperty("组织全路径")
-    private String deptSid;
+    private String orgPath;
     @ApiModelProperty("客户名称")
-    private String customerName; // 客户名称
+    private String customerName;
 }

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<BusSalesOrde
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
     @Autowired
     private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
+    @Autowired
+    private FinBillVehicleFeign finBillVehicleFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -272,7 +277,13 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
         List<BusVehicleQKKPVo> 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<BusSalesOrde
                         busVehicleQKKPVo.setTrailers(busVehicleQKKPTrailerVos);
                     }
                 }
-                busVehicleQKKPVosNew.add(busVehicleQKKPVo);
             }
-
         }
         return rb.success().setData(busVehicleQKKPVosNew);
     }

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

@@ -57,28 +57,28 @@ import java.util.List;
 @ApiModel(value = "开票申请表 数据传输对象", description = "开票申请表 数据传输对象")
 public class FinBillApplicationDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
     @ApiModelProperty("创建人sid")
-    private String createBySid; // 创建人sid
+    private String createBySid;
 	@ApiModelProperty("创建人接口")
-    private String createByName; // 创建人接口
+    private String createByName;
 	@ApiModelProperty("合同sid")
-    private String contractSid; // 合同sid
+    private String contractSid;
 	@ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
+    private String contractNo;
 	@ApiModelProperty("客户sid")
-    private String customerSid; // 客户sid
+    private String customerSid;
 	@ApiModelProperty("客户名称")
-    private String customerName; // 客户名称
+    private String customerName;
 	@ApiModelProperty("单台开票金额")
-    private String oneBillMoney; // 单台开票金额
+    private String oneBillMoney;
 	@ApiModelProperty("开票金额合计")
-    private String totalBillMoney; // 开票金额合计
+    private String totalBillMoney;
     @ApiModelProperty("申请日期")
-    private String applyDate; // 申请日期
+    private String applyDate;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("环节定义的sid")
@@ -92,7 +92,7 @@ public class FinBillApplicationDto implements Dto {
     @ApiModelProperty(value = "是否高低开")
     private String isHighAndLowOpen;
     @ApiModelProperty("备注")
-    private String remarks; // 备注
+    private String remarks;
     @ApiModelProperty("当前用户部门全路径")
     private String orgSidPath;
 
@@ -135,28 +135,28 @@ public class FinBillApplicationDto implements Dto {
     @ApiModelProperty(value = "欠款开票原因value")
     private String arrearsOpenYYValue;
     @ApiModelProperty("开票状态Value")
-    private String billStateValue; // 开票状态Value
+    private String billStateValue;
     @ApiModelProperty("开票状态key")
-    private String billStateKey;// 开票状态key
+    private String billStateKey;
     @ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
+    private String modelSid;
     @ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
+    private String modelName;
     @ApiModelProperty("单据编号")
-    private String billNo; // 单据编号
+    private String billNo;
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
 
     @ApiModelProperty("开票车辆信息")
-    private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
+    private List<FinBillVehicleDto> finBillVehicles;
     @ApiModelProperty("开票挂车信息")
-    private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
+    private List<FinBillTrailerDto> finBillTrailers;
     @ApiModelProperty("客户开票申请书附件信息")
-    private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
+    private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("款项确认书附件信息")
-    private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 款项确认书附件信息
+    private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("车辆登记合同附件信息")
-    private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
+    private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("证件")
     private List<FinBillFileDto> zjApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("附件")

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<List<FinBillNodeVo>> getPreviousNodesForRejectQKLP(@Valid @SpringQueryMap FinBillNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmitQKLP")
+    ResultBean<List<FinBillNodeVo>> 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接口********************************/
 
 

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<List<FinBillNodeVo>> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillNodeVo>> 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<PagerVo<AppBillApplicationPageVo>> getInvoicedApplyList(PagerQuery<AppBillApplicationPageQuery> pagerQuery) {
 		return null;

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<String> fjApplicationAppendxs;
     @ApiModelProperty("证件")
     private List<String> idCardImages;
     @ApiModelProperty("客户开票申请书")

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(开票挂车信息) <br/>
  * File: FinBillTrailerVo.java <br/>
@@ -73,5 +75,5 @@ public class FinBillTrailerVo implements Vo {
     private String oneBillMoney; // 单台开票金额
 
     @ApiModelProperty("合格证图片")
-    private String hgzImageUrl; // 合格证图片
+    private List<String> hgzImageUrl; // 合格证图片
 }

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<List<FinBillNodeVo>> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) {
+        return finBillApplicationService.getPreviousNodesForRejectQKLP(query);
+    }
+
+    @Override
+    public ResultBean<List<FinBillNodeVo>> 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<PagerVo<AppBillApplicationPageVo>> getInvoicedApplyList(PagerQuery<AppBillApplicationPageQuery> pagerQuery) {
         if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {

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<FinBillApplica
         List<FinBillTrailerVo> 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<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
+                List<String> 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<FinBillApplica
                     //根据挂车车架号查询挂车信息以及合格证照片路径
                     BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
                     List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
+                    List<String> 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<FinBillApplica
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        FinBillApplication finBillApplication1 = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -1625,7 +1630,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> 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<FinBillApplica
     }
 
 
+    public ResultBean submitFinBillApplicationQKLP(SubmitFinBillApplicationDto dto) {
+        return null;
+    }
+
+    public ResultBean completeQKLP(BusinessVariables bv) {
+        return null;
+    }
+
+    public ResultBean completeByQKLP(BusinessVariables bv) {
+        return null;
+    }
+
+    public ResultBean companyToDivisionOperateQKLP(BusinessVariables bv) {
+        return null;
+    }
+
+    public ResultBean<List<FinBillNodeVo>> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) {
+        return null;
+    }
+
+    public ResultBean<List<FinBillNodeVo>> 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;
+    }
 }

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<FinBillVehicle> {
 
 	@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);
 }

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<FinBillVehicleMapp
     public FinBillVehicleVo selByVinNo(String vinNo) {
        return baseMapper.selByVinNo(vinNo);
     }
+
+    public FinBillVehicleVo fetchByMainSid(String sid) {
+        return baseMapper.fetchByMainSid(sid);
+    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -14,6 +14,7 @@ public enum ProcDefEnum {
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
     FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
+    QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:1:1202504"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"),

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -226,6 +226,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             inboundVehicle.setSid(UUID.randomUUID().toString());
             inboundVehicle.setOrgSidPath(orgPath);
             inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
+            inboundVehicle.setOrgPriceDate(DateUtil.formatDate(new Date()));
             save(inboundVehicle);
             String num = dto.getNum();
             if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@@ -360,8 +361,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         }
         vo.setVehicleList(list);
         vo.setScmFiles(scmFileVos);
-        String date = DateUtil.formatDate(new Date());
-        vo.setOrgPriceDate(DateUtil.parseDate(date));
         return vo;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/ItemEditTextInfo.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import java.util.List;
+
+public class ItemEditTextInfo {
+
+    // 标题 如:身份证
+    private String title;
+    // 类型 1（上传图片）
+    private int type;
+    // 是否可空， 可不填 true
+    private boolean nullAble;
+    // 保存
+    private String key;
+    // 保存图片使用 type=1
+    private List<String> 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<String> getFilesPath() {
+        return filesPath;
+    }
+
+    public void setFilesPath(List<String> filesPath) {
+        this.filesPath = filesPath;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}

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;
 }

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<String> idCardImages;
+    private List<ItemEditTextInfo> list;
-    @ApiModelProperty("客户开票申请书")
-    private List<String> customerInvoiceApplyImages;
-    @ApiModelProperty("车辆登记合同")
-    private List<String> registerContractImages;
-    @ApiModelProperty("确认书")
-    private List<String> invoiceApplyConfirmImages;
 }

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<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
         return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleBy(query);
     }
-
-
 }

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

@@ -248,10 +248,8 @@ public class AppBusAdvanceGinvoiceapplyService {
             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<String> hgzImageUrl = finBillTrailer.getHgzImageUrl();
-                List<String> files = new ArrayList<>();
+                finBillTrailerVo.setFiles(hgzImageUrl);
-                files.add(hgzImageUrl);
-                finBillTrailerVo.setFiles(files);
                 finBillTrailerVos.add(finBillTrailerVo);
             }
         }
@@ -357,10 +355,8 @@ public class AppBusAdvanceGinvoiceapplyService {
             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<String> hgzImageUrl = finBillTrailer.getHgzImageUrl();
-                List<String> files = new ArrayList<>();
+                finBillTrailerVo.setFiles(hgzImageUrl);
-                files.add(hgzImageUrl);
-                finBillTrailerVo.setFiles(files);
                 finBillTrailerVos.add(finBillTrailerVo);
             }
         }
@@ -840,10 +836,8 @@ public class AppBusAdvanceGinvoiceapplyService {
             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<String> hgzImageUrl = finBillTrailer.getHgzImageUrl();
-                List<String> files = new ArrayList<>();
+                finBillTrailerVo.setFiles(hgzImageUrl);
-                files.add(hgzImageUrl);
-                finBillTrailerVo.setFiles(files);
                 finBillTrailerVos.add(finBillTrailerVo);
             }
         }
@@ -923,20 +917,9 @@ public class AppBusAdvanceGinvoiceapplyService {
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
         ResultBean<qkkpFlowListVo> 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<List<FinBillNodeVo>> 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<List<FinBillNodeVo>> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmit(getNodeQuery);
         if (nextNodesForSubmit.getSuccess()) {
             nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
@@ -944,9 +927,6 @@ public class AppBusAdvanceGinvoiceapplyService {
         } else {
             return rb.setMsg(nextNodesForSubmit.getMsg());
         }
-        } else {
-            return rb.setMsg("参数错误：next");
-        }
         qkkpFlowListVo.setTitle(data);
         AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
         appBillApplicationDetailsQKQuery.setSid(query.getBusinessSid());
@@ -965,30 +945,56 @@ public class AppBusAdvanceGinvoiceapplyService {
             List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
             List<String> registerContractImages = new ArrayList<>();//车辆登记合同
             List<String> idCardImages = new ArrayList<>();
+            List<ItemEditTextInfo> itemEditTextInfos = new ArrayList<>();
             if (zjApplicationAppendxs != null) {
                 for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
                     idCardImages.add(zjApplicationAppendx.getFileUrl());
                 }
+                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());
                 }
+                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());
                 }
+                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());
                 }
+                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
+                itemEditTextInfo.setTitle("车辆登记合同");
+                itemEditTextInfo.setType(1);
+                itemEditTextInfo.setNullAble(true);
+                itemEditTextInfo.setKey("registerContractImages");
+                itemEditTextInfo.setFilesPath(registerContractImages);
+                itemEditTextInfos.add(itemEditTextInfo);
             }
-            qkkpFlowListVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
+            qkkpFlowListVo.setList(itemEditTextInfos);
-            qkkpFlowListVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
-            qkkpFlowListVo.setRegisterContractImages(registerContractImages);
-            qkkpFlowListVo.setIdCardImages(idCardImages);
         }
         return rb.success().setData(qkkpFlowListVo);
     }

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<String> hgzImageUrl = finBillTrailer.getHgzImageUrl();
-                List<String> files = new ArrayList<>();
+                finBillTrailerVo.setFiles(hgzImageUrl);
-                files.add(hgzImageUrl);
-                finBillTrailerVo.setFiles(files);
                 finBillTrailerVos.add(finBillTrailerVo);
             }
         }