Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.base.api.basevehicletempstate;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import feign.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -99,4 +100,9 @@ public interface BaseVehicleTempstateFeign {
     @GetMapping("/getList")
     @ResponseBody
     ResultBean<List<BaseVehicleTempstate>> getList(@RequestParam("tempStateKey")String tempStateKey);
+
+    @ApiOperation("查询状态")
+    @GetMapping("/selectByVinSidAndType")
+    @ResponseBody
+    ResultBean<BaseVehicleTempstate> selectByVinSidAndType(@RequestParam("carSid") String carSid, @Param("tempstateKey") String tempstateKey);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java

@@ -90,6 +90,11 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe
 		return null;
 	}
 
+	@Override
+	public ResultBean<BaseVehicleTempstate> selectByVinSidAndType(String carSid, String tempstateKey) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<Integer> selectByVin(String vin) {
 		return null;

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

@@ -11,10 +11,15 @@ public class ContractPageQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-    @ApiModelProperty("车架号 客户名称 合同编号")
+    @ApiModelProperty("app车架号 客户名称 合同编号")
     private String name;
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态:1欠款提车，2欠款开票")
     private int stateType;
     @ApiModelProperty("组织全路径")
     private String orgPath;
+
+    @ApiModelProperty("pc客户名称")
+    private String customerName;
+    @ApiModelProperty("pc合同编号")
+    private String contractNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -28,6 +28,7 @@ public enum BillTypeEnum {
     GCRK("GCRK","挂车入库"),
     SZRK("SZRK","上装入库"),
     XSDDTCSQ("XSDDTCSQ","销售订单退车申请"),
+    QKTCSQ("QKTCSQ","欠款提车申请"),
     ;
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -394,7 +394,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                     if (baseVehmodelConfig == null) {
                         return rb.setMsg("车型配置不存在");
                     }
-                    baseVehmodelConfigMapper.updateGuidedPrice(new BigDecimal(baseModelModpriceModelVo.getGuidedPrice()), new BigDecimal(baseModelModpriceModelVo.getManufactorSettlementPrice()), baseVehmodelConfig.getSid());
+                    baseVehmodelConfigMapper.updateGuidedPrice(new BigDecimal(baseModelModpriceModelVo.getTzhGuidedPrice()), new BigDecimal(baseModelModpriceModelVo.getTzhManufactorSettlementPrice()), baseVehmodelConfig.getSid());
                 }
             } else {
                 //极光推送

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java

@@ -75,4 +75,7 @@ public interface BaseVehicleTempstateMapper extends BaseMapper<BaseVehicleTempst
     Integer selectByVin(@Param("vin") String vin);
 
     List<BaseVehicleTempstate> getList(String tempStateKey);
+
+    @Select("select * from base_vehicle_tempstate where vehSid = #{carSid} and tempStateKey = #{key} limit 1")
+    BaseVehicleTempstate selectByVinSidAndType(@Param("carSid") String carSid, @Param("key") String tempstateKey);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java

@@ -122,6 +122,13 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
         return rb.success().setData(baseVehicleTempstates);
     }
 
+    @Override
+    public ResultBean<BaseVehicleTempstate> selectByVinSidAndType(String carSid, String tempstateKey) {
+        ResultBean<BaseVehicleTempstate> rb = ResultBean.fireFail();
+        BaseVehicleTempstate count = baseVehicleTempstateService.selectByVinSidAndType(carSid,tempstateKey);
+        return rb.setData(count);
+    }
+
     @Override
     public ResultBean<Integer> selectByVin(String vin) {
         ResultBean<Integer> rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@@ -129,4 +129,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleT
     public Integer selectByVin(String vin) {
         return baseMapper.selectByVin(vin);
     }
+
+    public BaseVehicleTempstate selectByVinSidAndType(String carSid, String tempstateKey) {
+        return baseMapper.selectByVinSidAndType(carSid,tempstateKey);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -256,6 +256,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public ResultBean<String> saveOrUpdateDto(BusVehicleApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        if(StringUtils.isBlank(dto.getApplyTypeKey())){
+            return rb.setMsg("采购类型不能为空");
+        }
         List<CommonAppendixDto> commonAppendixs = dto.getCommonAppendixs();
         if (StringUtils.isBlank(sid)) {//新增
             //=======================================

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

@@ -2663,6 +2663,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             if (StringUtils.isNotBlank(params.getName())){
                 qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
             }
+            if(StringUtils.isNotBlank(params.getContractNo())){
+                qw.like("contractNo", params.getContractNo());
+            }
+            if(StringUtils.isNotBlank(params.getCustomerName())){
+                qw.like("partyB",params.getCustomerName());
+            }
             qw.orderByDesc("createDate");
         }
         IPage<ContractPageVo> page = PagerUtil.queryToPage(query);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppSubmitAdvanceInvoiceDto.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable;
 
 
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceVinDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java

@@ -1,9 +1,11 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -11,7 +13,7 @@ import java.util.List;
 public class AppArrearsCarryDto implements Dto {
     private static final long serialVersionUID = -1972581222399264301L;
 
-    @ApiModelProperty("用户sid")
+   /* @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("合同sid")
     private String contractSid;
@@ -42,5 +44,94 @@ public class AppArrearsCarryDto implements Dto {
     @ApiModelProperty("用户sid")
     private String taskId;
     @ApiModelProperty("当前用户部门的全路径")
-    private String orgSidPath;
+    private String orgSidPath;*/
+
+    @ApiModelProperty("欠款提车申请sid")
+    private String sid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("发起部门-发起人")
+    private String publishInfo;
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    @ApiModelProperty("发起部门名称")
+    private String applyDept;
+    @ApiModelProperty("发起部门sid")
+    private String applyDeptSid;
+    @ApiModelProperty("申请人用户sid")
+    private String applyUserSid;
+    @ApiModelProperty("申请人名称")
+    private String applyName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
+    @ApiModelProperty("销售部门")
+    private String staffDept;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
+    private String paymentMethodKey;
+    @ApiModelProperty("开票单位")
+    private String openTickName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    //是否金融部复核
+    @ApiModelProperty("是否金融部复核，1是，0否")
+    private String isFinance;
+    private String financeUserSid;
+    private String financeName;
+
+    @ApiModelProperty("实例id")
+    @JsonProperty("procInsId")
+    private String procInstId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("选择车辆列表")
+    private List<AdCarListVo> vinList = new ArrayList<>();
+
+    @ApiModelProperty("欠款提车挂车列表")
+    private List<GCarListVo> trailersList = new ArrayList<>();
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> zjlLetter = new ArrayList<>();
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("欠款原因key")
+    private String reasonKey;
+    @ApiModelProperty("欠款原因value")
+    private String reasonValue;
+    @ApiModelProperty("欠款提车原因")
+    private String reason;
+    @ApiModelProperty("回款日期")
+    @NotBlank(message = "承诺回购日期不能为空")
+    private String commitmentMoneyDate;
+    @ApiModelProperty("合同总金额")
+    private String contractMoney;
+    @ApiModelProperty("平台收款总金额")
+    private String contractCollectionMoney;
+    @ApiModelProperty("其他附件")
+    private List<String> fileList = new ArrayList<>();
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@@ -116,6 +116,14 @@ public class AppArrearsCarryInfoVo implements Vo {
     private List<String> gdLetter = new ArrayList<>();
     @ApiModelProperty("总经理担保书")
     private List<String> zjlLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书下载地址")
+    private String zjlLetterDownloadUrl;
+    @ApiModelProperty("车辆买卖合同下载地址")
+    private String carContractDownloadUrl;
+    @ApiModelProperty("欠款提车担保承诺书下载地址")
+    private String guaranteeLetterDownloadUrl;
+    @ApiModelProperty("股东会对外担保决议下载地址")
+    private String gdLetterDownloadUrl;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -100,6 +101,7 @@ public class AppArrearsCarryVinDto implements Dto {
     @ApiModelProperty("欠款提车原因")
     private String reason;
     @ApiModelProperty("回款日期")
+    @NotBlank(message = "承诺回购日期不能为空")
     private String commitmentMoneyDate;
     @ApiModelProperty("合同总金额")
     private String contractMoney;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java

@@ -78,8 +78,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     private String reasonKey;
     @ApiModelProperty("欠款原因value")
     private String reasonValue;
-    @ApiModelProperty("累计欠款金额")
-    private BigDecimal cumulativeArrearsMoney;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
     @ApiModelProperty("分公司名称")
@@ -98,6 +96,10 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     private String taskId;
     @ApiModelProperty("当前用户部门的全路径")
     private String orgSidPath;
-    @ApiModelProperty("单台整体成交价")
-    private BigDecimal price;
+
+    private String carContractFile;
+    private String guaranteeLetterFile;
+    private String gdLetterFile;
+    private String zjlLetterFile;
+    private String otherFile;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -1,15 +1,11 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceVinDto;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -42,22 +38,22 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusArrearsCarryVehicleApplyPageVo>> listPage(@RequestBody PagerQuery<BusArrearsCarryVehicleApplyQuery> pagerQuery);
 
-    @ApiOperation("新增欠款提车")
+  /*  @ApiOperation("新增欠款提车")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BusArrearsCarryVehicleApplyDto dto);
 
     @ApiOperation("修改欠款提车")
     @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody BusArrearsCarryVehicleApplyDto dto, @PathVariable("sid") String sid);
+    public ResultBean update(@RequestBody BusArrearsCarryVehicleApplyDto dto, @PathVariable("sid") String sid);*/
 
     @ApiOperation("根据sid批量删除欠款提车单")
     @PostMapping("/deleteBySids")
     public ResultBean deleteBySids(@RequestBody String[] sids);
 
-    @ApiOperation("欠款提车复核回显/修改回显/详情回显")
+   /* @ApiOperation("欠款提车复核回显/修改回显/详情回显")
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<BusArrearsCarryVehicleApplyVo> fetchSid(@PathVariable("sid") String sid);
-
+*/
     @ApiOperation("欠款提车-车辆列表")
     @PostMapping("/getArrearsVehicleList")
     public ResultBean<PagerVo<ArrearsCarryVehicleVo>> getArrearsVehicleList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pq);
@@ -87,16 +83,21 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
 
-    @ApiOperation("移动端-新增欠款提车申请")
+ /*   @ApiOperation("移动端-新增欠款提车申请")
     @PostMapping("/addArrearsApply")
     @ResponseBody
-    public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);
+    public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);*/
 
     @ApiOperation("移动端-保存欠款提车申请")
     @PostMapping("/saveArrearsApply")
     @ResponseBody
     public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto);
 
+    @ApiOperation("点击生成附件")
+    @PostMapping("/saveArrearsApplyPdf")
+    @ResponseBody
+    public ResultBean saveArrearsApplyPdf(@Valid @RequestBody AppArrearsCarryDto dto);
+
     @ApiOperation("手机端-删除欠款提车")
     @DeleteMapping("/deleteArrearsTakeCar")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -31,7 +30,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 		return rb.setMsg("接口bus/busarrearscarryvehicleapply/listPage无法访问");
 	}
 
-	@Override
+/*	@Override
 	public ResultBean save(BusArrearsCarryVehicleApplyDto dto){
 		return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/save无法访问");
 	}
@@ -39,18 +38,18 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
     @Override
 	public ResultBean update(BusArrearsCarryVehicleApplyDto dto,String sid){
 		return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/update无法访问");
-	}
+	}*/
 
 	@Override
 	public ResultBean deleteBySids(String[] sids){
 		return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/del无法访问");
 	}
 
-	@Override
+/*	@Override
 	public ResultBean<BusArrearsCarryVehicleApplyVo> fetchSid(String sid) {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口bus/busarrearscarryvehicleapply/fetchSid无法访问");
-	}
+	}*/
 
 	@Override
 	public ResultBean<PagerVo<ArrearsCarryVehicleVo>> getArrearsVehicleList(PagerQuery<ArrearsCarryVehicleQuery> pq) {
@@ -82,16 +81,21 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 		return null;
 	}
 
-	@Override
+	/*@Override
 	public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {
 		return null;
 	}
 
+	@Override
+	public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) {
 		return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java

@@ -25,11 +25,11 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo {
     @ApiModelProperty("车型名称")
     private String modelName;
 
-//    @ApiModelProperty("欠款金额")
-//    private BigDecimal arrearsMoney;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
 
-    @ApiModelProperty("累计欠款金额")
-    private BigDecimal cumulativeArrearsMoney;
+/*    @ApiModelProperty("累计欠款金额")
+    private BigDecimal cumulativeArrearsMoney;*/
 
     @ApiModelProperty("承诺回款日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyQuery.java

@@ -2,13 +2,10 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
 
 import com.yxt.common.core.query.Query;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: bus(bus) <br/>
  * File: BusArrearsCarryVehicleApplyQuery.java <br/>
@@ -26,22 +23,19 @@ import java.math.BigDecimal;
 @Data
 public class BusArrearsCarryVehicleApplyQuery implements Query {
 
-    
-	@ApiModelProperty("客户名称")
+
+    @ApiModelProperty("客户名称")
     private String customerName;
-    
-	@ApiModelProperty("合同编号")
+
+    @ApiModelProperty("合同编号")
     private String contractNo;
-    
-//	@ApiModelProperty("申请日期")
-//    private String applyDate;
 
     @ApiModelProperty("申请开始日期")
-    private String applyStartDate; // 申请开始日期
+    private String applyStartDate;
     @ApiModelProperty("申请结束日期")
-    private String applyEndDate; // 申请结束日期
-    
-	@ApiModelProperty("申请人")
+    private String applyEndDate;
+
+    @ApiModelProperty("申请人")
     private String applyName;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/CreatePdfVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/27 10:39
+ * @Description
+ */
+@Data
+public class CreatePdfVo implements Vo {
+    private static final long serialVersionUID = -8947887096343100380L;
+    @ApiModelProperty("车辆是否发生变化")
+    private boolean isChange;
+    @ApiModelProperty("回购日期是否发生变化")
+    private boolean dateChange;
+    @ApiModelProperty("生成的附件地址")
+    private List<PdfVo> fileList = new ArrayList<>();
+
+    private String sid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/DownloadUrlVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/27 15:28
+ * @Description
+ */
+@Data
+public class DownloadUrlVo {
+
+    @ApiModelProperty("总经理担保书下载地址")
+    private String zjlLetterDownloadUrl;
+    @ApiModelProperty("车辆买卖合同下载地址")
+    private String carContractDownloadUrl;
+    @ApiModelProperty("欠款提车担保承诺书下载地址")
+    private String guaranteeLetterDownloadUrl;
+    @ApiModelProperty("股东会对外担保决议下载地址")
+    private String gdLetterDownloadUrl;
+    private String sid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/27 9:35
+ * @Description
+ */
+@Data
+public class PdfVo implements Vo {
+    private static final long serialVersionUID = 8072514740863334811L;
+
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("下载地址")
+    private String downUrl;
+    @ApiModelProperty("类型")
+    private String type;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 public class AppCompleteAdvanceArrearsDto implements Dto {
@@ -14,7 +15,7 @@ public class AppCompleteAdvanceArrearsDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -30,6 +31,4 @@ public class AppCompleteAdvanceArrearsDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
-//    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java

@@ -7,9 +7,7 @@ import lombok.Data;
 @Data
 public class AppSubmitAdvanceArrearsDto extends AppArrearsCarryDto {
     private static final long serialVersionUID = 9148028768206972924L;
-
-    @ApiModelProperty("意见")
-    private String comment;
+    
     @ApiModelProperty("流程实例id")
     private String instanceId;
     @ApiModelProperty("任务id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java

@@ -14,6 +14,8 @@ public class GetNodeQuery implements Query {
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
 
+    private String businessSid;
+
 //    @ApiModelProperty(value = "分支字段及业务字段")
 //    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetails.java

@@ -27,7 +27,7 @@ import java.math.BigDecimal;
 public class BusArrearsCarryVehicleDetails extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("车辆sid")
+ /*   @ApiModelProperty("车辆sid")
     private String vehicleSid;
 
 	@ApiModelProperty("车架号")
@@ -37,5 +37,19 @@ public class BusArrearsCarryVehicleDetails extends BaseEntity {
     private BigDecimal dealMoney;
     
 	@ApiModelProperty("欠款提车申请表sid")
-    private String arrearsVehicleSid;
+    private String arrearsVehicleSid;*/
+
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("成交价")
+    private BigDecimal price;
+
+    @ApiModelProperty("欠款提车申请表sid")
+    private String applySid;
+
+    private BigDecimal subscribedAll;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java

@@ -19,6 +19,10 @@ public enum BuscenterFileEnum {
     HANDOVER_POLICY("010", "保单照片"),
     HANDOVER_LICENCE("011", "临时牌照"),
     HANDOVER_OTHRRDATA("012", "其他资料"),
+    CARCONTRACT_DOWNLOADURL("013", "新车买卖合同(欠款)"),
+    GUARANTEELETTER_DOWNLOADURL("014", "欠款提车担保承诺书"),
+    GDLETTER_DOWNLOADURL("015", "股东会对外担保决议"),
+    ZJLLETTER_DOWNLOADURL("016", "总经理担保书"),
     ;
 
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -25,7 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordervehicle;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -87,4 +89,8 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("欠款提车选择车辆")
     @PostMapping("/getCanUseCars")
     ResultBean<List<QCarVo>> getCanUseCars(@RequestBody QCarQuery query);
+
+    @ApiOperation("PC欠款提车选择车辆")
+    @PostMapping("/getCanUseCarsPage")
+    ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(@RequestBody PagerQuery<QCarQuery> pagerQuery);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -83,4 +83,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(PagerQuery<QCarQuery> pagerQuery) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesordervehicle;
 
+import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,10 +12,12 @@ import java.util.List;
  * @Description
  */
 @Data
-public class QCarQuery {
+public class QCarQuery implements Query {
 
     @ApiModelProperty(value = "合同编号")
     private String contractNo;
     @ApiModelProperty(value = "车辆sid")
     private List<String> vinSids;
+    @ApiModelProperty("车架号检索")
+    private String vinNo;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,8 +30,13 @@ public class QCarVo implements Vo {
     @ApiModelProperty("销售订单车辆sid")
     @JsonIgnore
     private String busVinSid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 
+    @ApiModelProperty("移动端使用")
     private AdCarListVo vinDto;
 
-    private List<GCarListVo> gcList;
+    private List<GCarListVo> gcList = new ArrayList<>();
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -76,4 +76,8 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
     int updateFlowFiled(Map<String, Object> map);
 
     void updateType(@Param("businessSid") String businessSid);
+
+    String selectNum(String bill);
+
+    int selectBySids(String join);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -9,18 +9,19 @@
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo">
         SELECT
         bacva.sid,
+        if(length(bacva.nodeState)>0,bacva.nodeState,'待提交') as nodeState,
         <!-- 合同编号 -->
         bacva.contractNo,
         <!-- 客户名称 -->
         bacva.customerName,
         <!-- 车型名称 -->
         bacva.modelName,
-        <!-- 累计欠款金额 -->
-        bacva.cumulativeArrearsMoney,
+        <!-- 欠款金额 -->
+        bacva.arrearsMoney,
         <!-- 承诺回款日期 -->
         bacva.commitmentMoneyDate,
         <!-- 申请日期 -->
-        bacva.applyDate,
+        DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate,
         <!-- 申请人 -->
         bacva.applyName
         FROM bus_arrears_carry_vehicle_apply bacva
@@ -67,7 +68,7 @@
         arrearsMoney,
         commitmentMoneyDate,
         applyName,
-        applyDate
+        DATE_FORMAT(createTime,'%Y-%m-%d') as applyDate
         FROM bus_arrears_carry_vehicle_apply
         <where>
             ${ew.sqlSegment}
@@ -86,7 +87,7 @@
     <update id="updateFlowFiled">
         UPDATE bus_arrears_carry_vehicle_apply
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+        , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -104,4 +105,19 @@
         set `type` = '2'
         where sid = #{businessSid}
     </update>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from bus_arrears_carry_vehicle_apply
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+        limit 1
+    </select>
+
+    <select id="selectBySids" resultType="int">
+        select count(*)
+        from bus_arrears_carry_vehicle_apply
+        where length(nodeState) > 0
+        and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -2,7 +2,6 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -12,8 +11,10 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -59,12 +60,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
      * @param dto
      * @return
      */
-    @Override
+  /*  @Override
     public ResultBean save(BusArrearsCarryVehicleApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         busArrearsCarryVehicleApplyService.saveOrUpdateDto(dto);
         return rb.success();
-    }
+    }*/
 
     /**
      * 修改欠款提车
@@ -73,12 +74,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
      * @param sid
      * @return
      */
-    @Override
+  /*  @Override
     public ResultBean update(BusArrearsCarryVehicleApplyDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         busArrearsCarryVehicleApplyService.updateByArrearsSid(dto, sid);
         return rb.success();
-    }
+    }*/
 
     /**
      * 根据sid批量删除欠款提车单
@@ -89,8 +90,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
     @Override
     public ResultBean deleteBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
-        if (sids == null || sids.length == 0) {
-            return rb.setMsg("删除成功，欠款提车单sid不能为空");
+        //查询该sid中是否有流程不是待提交的
+        int count = busArrearsCarryVehicleApplyService.selectBySids(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
         }
         return busArrearsCarryVehicleApplyService.deleteBySids(sids);
 
@@ -102,12 +105,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
      * @param sid
      * @return
      */
-    @Override
+   /* @Override
     public ResultBean<BusArrearsCarryVehicleApplyVo> fetchSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusArrearsCarryVehicleApplyVo vo = busArrearsCarryVehicleApplyService.selectBySid(sid);
         return rb.success().setData(vo);
-    }
+    }*/
 
     /**
      * 欠款提车-车辆列表
@@ -165,16 +168,21 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.initArrearsApply(query);
     }
 
-    @Override
+/*    @Override
     public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
         return busArrearsCarryVehicleApplyService.addArrearsApply(dto);
-    }
+    }*/
 
     @Override
     public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {
         return busArrearsCarryVehicleApplyService.saveArrearsApply(dto);
     }
 
+    @Override
+    public ResultBean saveArrearsApplyPdf(AppArrearsCarryDto dto) {
+        return busArrearsCarryVehicleApplyService.saveArrearsApplyPdf(dto);
+    }
+
     @Override
     public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) {
         return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java

@@ -30,8 +30,6 @@ import java.util.List;
 @Mapper
 public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrearsCarryVehicleDetails> {
 
-    //@Update("update bus_arrears_carry_vehicle_details set name=#{msg} where id=#{id}")
-    //IPage<BusArrearsCarryVehicleDetailsVo> voPage(IPage<BusArrearsCarryVehicleDetails> page, @Param(Constants.WRAPPER) QueryWrapper<BusArrearsCarryVehicleDetails> qw);
 
     IPage<BusArrearsCarryVehicleDetailsVo> selectPageVo(IPage<BusArrearsCarryVehicleDetails> page, @Param(Constants.WRAPPER) Wrapper<BusArrearsCarryVehicleDetails> qw);
 
@@ -46,7 +44,7 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
      * @param sid 欠款提车Sid
      * @return
      */
-    @Select("select * from bus_arrears_carry_vehicle_details where arrearsVehicleSid = #{sid}")
+    @Select("select * from bus_arrears_carry_vehicle_details where applySid = #{sid}")
     List<BusArrearsCarryVehicleDetailsVo> selByArrearsSidList(String sid);
 
     /**
@@ -55,6 +53,16 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
      * @param sid
      * @return
      */
-    @Delete("delete from bus_arrears_carry_vehicle_details where arrearsVehicleSid = #{sid}")
+    @Delete("delete from bus_arrears_carry_vehicle_details where applySid = #{sid}")
     int deleteByArrearsVehicleSid(String sid);
+
+    List<String> selectByApplySid(String sid);
+
+    /**
+     * 根据欠款提车申请sid查询车辆信息
+     *
+     * @param sid
+     * @return
+     */
+    List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml

@@ -5,13 +5,32 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo">
-        SELECT * FROM bus_arrears_carry_vehicle_details
-        <where>${ew.sqlSegment}</where>
+        SELECT *
+        FROM bus_arrears_carry_vehicle_details
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo"
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo">
-        SELECT * FROM bus_arrears_carry_vehicle_details
-        <where>${ew.sqlSegment}</where>
+        SELECT *
+        FROM bus_arrears_carry_vehicle_details
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectByApplySid" resultType="java.lang.String">
+        select vinSid
+        from bus_arrears_carry_vehicle_details
+        where applySid = #{sid}
+    </select>
+
+    <select id="selectDetailsByApplySid"
+            resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails">
+        select *
+        from bus_arrears_carry_vehicle_details
+        where applySid = #{sid}
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@@ -123,4 +123,12 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
     public int deleteByArrearsVehicleSid(String sid) {
         return baseMapper.deleteByArrearsVehicleSid(sid);
     }
+
+    public List<String> selectByApplySid(String sid) {
+        return baseMapper.selectByApplySid(sid);
+    }
+
+    public List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid) {
+        return baseMapper.selectDetailsByApplySid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java

@@ -1,8 +1,6 @@
 package com.yxt.anrui.buscenter.biz.buscenterfile;
 
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
-import com.yxt.anrui.crm.api.crmfile.CrmFile;
-import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,16 +19,16 @@ public class BuscenterFileService extends MybatisBaseService<BuscenterFileMapper
     @Autowired
     private FileUploadComponent fileUploadComponent;
 
-    public List<BuscenterFile> selectByLinkSid(String sid,String attachType) {
-        return baseMapper.selectByLinkSid(sid,attachType);
+    public List<BuscenterFile> selectByLinkSid(String sid, String attachType) {
+        return baseMapper.selectByLinkSid(sid, attachType);
     }
 
     public int deleteByLinkSid(String sid) {
         return baseMapper.deleteByLinkSid(sid);
     }
 
-    public void saveAll(String sid, List<String> entrustConfirmImages, String attachType) {
-        entrustConfirmImages.stream().forEach(str -> {
+    public void saveAll(String sid, List<String> imageFiles, String attachType) {
+        imageFiles.stream().forEach(str -> {
             BuscenterFile buscenterFile = new BuscenterFile();
             File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator));
             if (file != null) {
@@ -50,6 +48,21 @@ public class BuscenterFileService extends MybatisBaseService<BuscenterFileMapper
     }
 
     public void delByLinkSidOrType(String sid, String attachType) {
-        baseMapper.delByLinkSidOrType(sid,attachType);
+        baseMapper.delByLinkSidOrType(sid, attachType);
+    }
+
+    public void saveFile(String sid, String filePath, String attachType) {
+        BuscenterFile buscenterFile = new BuscenterFile();
+        String str = filePath;
+        File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator));
+        if (file != null) {
+            buscenterFile.setFileSize(fileUploadComponent.getPrintSize(file.length()));
+        }
+        buscenterFile.setLinkSid(sid);
+        buscenterFile.setFileName(str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf(".")));
+        buscenterFile.setFileType(str.substring(str.lastIndexOf(".") + 1));
+        buscenterFile.setAttachType(attachType);
+        buscenterFile.setFilePath(str.replace(fileUploadComponent.getUrlPrefix(), ""));
+        save(buscenterFile);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -699,7 +699,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDiscountpackageHandoverDto.setVehCount(String.valueOf(detailsList.size()));
                 List<String> vinList = detailsList.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 String vins = String.join(",", vinList);
-                busDiscountpackageHandoverDto.setVins(vins);
+                busDiscountpackageHandoverDto.setVinNo(vins);
                 busDiscountpackageHandoverDto.setRecUserSid(busDeliveredApply.getApplySid());
                 busDiscountpackageHandoverDto.setCustomerName(busDeliveredApply.getName());
                 busDiscountpackageHandoverDto.setRecName(busDeliveredApply.getApplyName());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -3439,27 +3439,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //挂车
             if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
                 if (priceInfo != null) {
-                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
+//                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
                     BigDecimal finalPriceAll = BigDecimal.ZERO;
                     if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
                         finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
                     }
-                    /*if(StringUtils.isNotBlank(priceInfo.getGcPrice())){
-                        finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getGcPrice()));
-                    }
-                    priceInfo.setSingleFinalPrice(finalPriceAll.toString());*/
-                }
-            }
-
-        }/*else{
-            BigDecimal finalPriceAll = BigDecimal.ZERO;
-            if(priceInfo != null){
-                if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
-                    finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
                 }
-                priceInfo.setSingleFinalPrice(finalPriceAll.toString());
             }
-        }*/
+        }
 
         if (priceInfo != null) {
             if (StringUtils.isNotBlank(topPriice)) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
@@ -117,4 +118,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     List<QCarVo> getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper<BaseVehicle> qw);
+
+    IPage<QCarVo> selectPageVo(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -114,7 +114,25 @@
         select bv.linkNo as vin,
         bv.linkSid carSid,
         bm.finalPrice as price,
-        bv.sid busVinSid
+        bv.sid busVinSid,
+        bo.contractNo,
+        bo.customerName
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid
+        <where>
+            ${ew.sqlSegment}
+            and length(bv.linkSid)>0
+        </where>
+    </select>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo">
+        select bv.linkNo as vin,
+        bv.linkSid carSid,
+        bm.finalPrice as price,
+        bv.sid busVinSid,
+        bo.contractNo,
+        bo.customerName
         from bus_sales_order_vehicle bv
         left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -26,7 +26,9 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -92,5 +94,12 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.getCanUseCars(query);
     }
 
+    @Override
+    public ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(PagerQuery<QCarQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<QCarVo> pv = busSalesOrderVehicleService.getCanUseCarsPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -27,18 +27,20 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 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.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPTrailerVo;
-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;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
@@ -46,7 +48,10 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehi
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +59,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -81,6 +87,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
     @Autowired
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -265,7 +273,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
         List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();
         for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) {
-            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())){
+            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) {
                 BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData();
                 busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
                 busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
@@ -298,6 +306,19 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.eq("bo.contractNo", query.getContractNo());
         }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bv.linkNo", query.getVinNo());
+        }
+        //查询已提交申请的欠款提车车辆
+        ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+        if (!resultBean.getData().isEmpty()) {
+            resultBean.getData().removeAll(Collections.singleton(null));
+            List<String> vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList());
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                qw.notIn("bv.linkSid", vinSidList);
+            }
+        }
         List<QCarVo> list = baseMapper.getCanUseCars(qw);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
@@ -310,21 +331,75 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 if (stringResultBean.getData() != null) {
                     adCarListVo.setSubscribedAll(stringResultBean.getData());
                 }
+                qCarVo.setVinDto(adCarListVo);
                 List<GCarListVo> gcList = new ArrayList<>();
-                TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
-                List<TrailerVo> trailerVos = traliveredVo.getList();
-                if (!trailerVos.isEmpty()) {
-                    for (TrailerVo trailerVo : trailerVos) {
-                        GCarListVo gCarListVo = new GCarListVo();
-                        gCarListVo.setVinNo(traliveredVo.getVinNo());
-                        gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
-                        gCarListVo.setPrice(trailerVo.getDealPrice());
-                        gcList.add(gCarListVo);
+                ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo());
+                if (voResultBean.getData() != null) {
+                    TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
+                    List<TrailerVo> trailerVos = traliveredVo.getList();
+                    if (!trailerVos.isEmpty()) {
+                        for (TrailerVo trailerVo : trailerVos) {
+                            GCarListVo gCarListVo = new GCarListVo();
+                            gCarListVo.setVinNo(traliveredVo.getVinNo());
+                            gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                            gCarListVo.setPrice(trailerVo.getDealPrice());
+                            gcList.add(gCarListVo);
+                        }
+                        qCarVo.setGcList(gcList);
                     }
-                    qCarVo.setGcList(gcList);
                 }
             }
         }
         return rb.success().setData(list);
     }
+
+    public PagerVo<QCarVo> getCanUseCarsPage(PagerQuery<QCarQuery> pagerQuery) {
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(pagerQuery);
+        QCarQuery params = pagerQuery.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (params.getVinSids() != null) {
+            if (params.getVinSids().size() > 0) {
+                qw.notIn("bv.linkSid", params.getVinSids());
+            }
+        }
+        if (StringUtils.isNotBlank(params.getContractNo())) {
+            qw.eq("bo.contractNo", params.getContractNo());
+        }
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("bv.linkNo", params.getVinNo());
+        }
+        IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
+        List<QCarVo> list = pagging.getRecords();
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            for (int i = 0; i < list.size(); i++) {
+                QCarVo qCarVo = list.get(i);
+                AdCarListVo adCarListVo = new AdCarListVo();
+                BeanUtil.copyProperties(qCarVo, adCarListVo);
+                //查询该车辆已收款
+                ResultBean<String> stringResultBean = finSelectedReceivablesDetailedFeign.selectByBusVinSid(qCarVo.getBusVinSid());
+                if (stringResultBean.getData() != null) {
+                    adCarListVo.setSubscribedAll(stringResultBean.getData());
+                }
+                List<GCarListVo> gcList = new ArrayList<>();
+                ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo());
+                if (voResultBean.getData() != null) {
+                    TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()).getData();
+                    List<TrailerVo> trailerVos = traliveredVo.getList();
+                    if (!trailerVos.isEmpty()) {
+                        for (TrailerVo trailerVo : trailerVos) {
+                            GCarListVo gCarListVo = new GCarListVo();
+                            gCarListVo.setVinNo(traliveredVo.getVinNo());
+                            gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                            gCarListVo.setPrice(trailerVo.getDealPrice());
+                            gcList.add(gCarListVo);
+                        }
+                        qCarVo.setGcList(gcList);
+                    }
+                }
+            }
+        }
+        return p;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl

@@ -0,0 +1,834 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?mso-application progid="Word.Document"?>
+<w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
+                xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
+                xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex"
+                xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"
+                xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex"
+                xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex"
+                xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex"
+                xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex"
+                xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex"
+                xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex"
+                xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex"
+                xmlns:cr="http://schemas.microsoft.com/office/comments/2020/reactions"
+                xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+                xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink"
+                xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d"
+                xmlns:o="urn:schemas-microsoft-com:office:office"
+                xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:v="urn:schemas-microsoft-com:vml"
+                xmlns:w10="urn:schemas-microsoft-com:office:word"
+                xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"
+                xmlns:w16du="http://schemas.microsoft.com/office/word/2023/wordml/word16du"
+                xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
+                xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
+                xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2"
+                xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no"
+                w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"><w:ignoreSubtree
+            w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
+    <o:DocumentProperties>
+        <o:Author>dimengzhe</o:Author>
+        <o:LastAuthor>孟哲</o:LastAuthor>
+        <o:Revision>2</o:Revision>
+        <o:TotalTime>1</o:TotalTime>
+        <o:Created>2023-04-27T07:39:00Z</o:Created>
+        <o:LastSaved>2023-04-27T07:39:00Z</o:LastSaved>
+        <o:Pages>1</o:Pages>
+        <o:Words>42</o:Words>
+        <o:Characters>245</o:Characters>
+        <o:Lines>2</o:Lines>
+        <o:Paragraphs>1</o:Paragraphs>
+        <o:CharactersWithSpaces>286</o:CharactersWithSpaces>
+        <o:Version>16</o:Version>
+    </o:DocumentProperties>
+    <o:CustomDocumentProperties>
+        <o:KSOProductBuildVer dt:dt="string">2052-11.1.0.14036</o:KSOProductBuildVer>
+        <o:ICV dt:dt="string">8D9EF930347E48428DF2F06AAB2A4FF2_12</o:ICV>
+    </o:CustomDocumentProperties>
+    <w:fonts>
+        <w:defaultFonts w:ascii="Calibri" w:fareast="宋体" w:h-ansi="Calibri" w:cs="Times New Roman"/>
+        <w:font w:name="Times New Roman">
+            <w:panose-1 w:val="02020603050405020304"/>
+            <w:charset w:val="00"/>
+            <w:family w:val="Roman"/>
+            <w:pitch w:val="variable"/>
+            <w:sig w:usb-0="E0002EFF" w:usb-1="C000785B" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF"
+                   w:csb-1="00000000"/>
+        </w:font>
+        <w:font w:name="宋体">
+            <w:altName w:val="SimSun"/>
+            <w:panose-1 w:val="02010600030101010101"/>
+            <w:charset w:val="86"/>
+            <w:family w:val="auto"/>
+            <w:pitch w:val="variable"/>
+            <w:sig w:usb-0="00000203" w:usb-1="288F0000" w:usb-2="00000016" w:usb-3="00000000" w:csb-0="00040001"
+                   w:csb-1="00000000"/>
+        </w:font>
+        <w:font w:name="Cambria Math">
+            <w:panose-1 w:val="02040503050406030204"/>
+            <w:charset w:val="00"/>
+            <w:family w:val="Roman"/>
+            <w:pitch w:val="variable"/>
+            <w:sig w:usb-0="00000003" w:usb-1="00000000" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="00000001"
+                   w:csb-1="00000000"/>
+        </w:font>
+        <w:font w:name="Calibri">
+            <w:panose-1 w:val="020F0502020204030204"/>
+            <w:charset w:val="00"/>
+            <w:family w:val="Swiss"/>
+            <w:pitch w:val="variable"/>
+            <w:sig w:usb-0="E4002EFF" w:usb-1="C000247B" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF"
+                   w:csb-1="00000000"/>
+        </w:font>
+        <w:font w:name="@宋体">
+            <w:panose-1 w:val="02010600030101010101"/>
+            <w:charset w:val="86"/>
+            <w:family w:val="auto"/>
+            <w:pitch w:val="variable"/>
+            <w:sig w:usb-0="00000203" w:usb-1="288F0000" w:usb-2="00000016" w:usb-3="00000000" w:csb-0="00040001"
+                   w:csb-1="00000000"/>
+        </w:font>
+    </w:fonts>
+    <w:styles>
+        <w:versionOfBuiltInStylenames w:val="7"/>
+        <w:latentStyles w:defLockedState="off" w:latentStyleCount="376">
+            <w:lsdException w:name="Normal"/>
+            <w:lsdException w:name="heading 1"/>
+            <w:lsdException w:name="heading 2"/>
+            <w:lsdException w:name="heading 3"/>
+            <w:lsdException w:name="heading 4"/>
+            <w:lsdException w:name="heading 5"/>
+            <w:lsdException w:name="heading 6"/>
+            <w:lsdException w:name="heading 7"/>
+            <w:lsdException w:name="heading 8"/>
+            <w:lsdException w:name="heading 9"/>
+            <w:lsdException w:name="caption"/>
+            <w:lsdException w:name="Title"/>
+            <w:lsdException w:name="Default Paragraph Font"/>
+            <w:lsdException w:name="Subtitle"/>
+            <w:lsdException w:name="Strong"/>
+            <w:lsdException w:name="Emphasis"/>
+            <w:lsdException w:name="HTML Top of Form"/>
+            <w:lsdException w:name="HTML Bottom of Form"/>
+            <w:lsdException w:name="Normal Table"/>
+            <w:lsdException w:name="No List"/>
+            <w:lsdException w:name="Outline List 1"/>
+            <w:lsdException w:name="Outline List 2"/>
+            <w:lsdException w:name="Outline List 3"/>
+            <w:lsdException w:name="Table Simple 1"/>
+            <w:lsdException w:name="Table Simple 2"/>
+            <w:lsdException w:name="Table Simple 3"/>
+            <w:lsdException w:name="Table Classic 1"/>
+            <w:lsdException w:name="Table Classic 2"/>
+            <w:lsdException w:name="Table Classic 3"/>
+            <w:lsdException w:name="Table Classic 4"/>
+            <w:lsdException w:name="Table Colorful 1"/>
+            <w:lsdException w:name="Table Colorful 2"/>
+            <w:lsdException w:name="Table Colorful 3"/>
+            <w:lsdException w:name="Table Columns 1"/>
+            <w:lsdException w:name="Table Columns 2"/>
+            <w:lsdException w:name="Table Columns 3"/>
+            <w:lsdException w:name="Table Columns 4"/>
+            <w:lsdException w:name="Table Columns 5"/>
+            <w:lsdException w:name="Table Grid 1"/>
+            <w:lsdException w:name="Table Grid 2"/>
+            <w:lsdException w:name="Table Grid 3"/>
+            <w:lsdException w:name="Table Grid 4"/>
+            <w:lsdException w:name="Table Grid 5"/>
+            <w:lsdException w:name="Table Grid 6"/>
+            <w:lsdException w:name="Table Grid 7"/>
+            <w:lsdException w:name="Table Grid 8"/>
+            <w:lsdException w:name="Table List 1"/>
+            <w:lsdException w:name="Table List 2"/>
+            <w:lsdException w:name="Table List 3"/>
+            <w:lsdException w:name="Table List 4"/>
+            <w:lsdException w:name="Table List 5"/>
+            <w:lsdException w:name="Table List 6"/>
+            <w:lsdException w:name="Table List 7"/>
+            <w:lsdException w:name="Table List 8"/>
+            <w:lsdException w:name="Table 3D effects 1"/>
+            <w:lsdException w:name="Table 3D effects 2"/>
+            <w:lsdException w:name="Table 3D effects 3"/>
+            <w:lsdException w:name="Table Contemporary"/>
+            <w:lsdException w:name="Table Elegant"/>
+            <w:lsdException w:name="Table Professional"/>
+            <w:lsdException w:name="Table Subtle 1"/>
+            <w:lsdException w:name="Table Subtle 2"/>
+            <w:lsdException w:name="Table Web 1"/>
+            <w:lsdException w:name="Table Web 2"/>
+            <w:lsdException w:name="Table Web 3"/>
+            <w:lsdException w:name="Table Theme"/>
+            <w:lsdException w:name="Placeholder Text"/>
+            <w:lsdException w:name="No Spacing"/>
+            <w:lsdException w:name="Light Shading"/>
+            <w:lsdException w:name="Light List"/>
+            <w:lsdException w:name="Light Grid"/>
+            <w:lsdException w:name="Medium Shading 1"/>
+            <w:lsdException w:name="Medium Shading 2"/>
+            <w:lsdException w:name="Medium List 1"/>
+            <w:lsdException w:name="Medium List 2"/>
+            <w:lsdException w:name="Medium Grid 1"/>
+            <w:lsdException w:name="Medium Grid 2"/>
+            <w:lsdException w:name="Medium Grid 3"/>
+            <w:lsdException w:name="Dark List"/>
+            <w:lsdException w:name="Colorful Shading"/>
+            <w:lsdException w:name="Colorful List"/>
+            <w:lsdException w:name="Colorful Grid"/>
+            <w:lsdException w:name="Light Shading Accent 1"/>
+            <w:lsdException w:name="Light List Accent 1"/>
+            <w:lsdException w:name="Light Grid Accent 1"/>
+            <w:lsdException w:name="Medium Shading 1 Accent 1"/>
+            <w:lsdException w:name="Medium Shading 2 Accent 1"/>
+            <w:lsdException w:name="Medium List 1 Accent 1"/>
+            <w:lsdException w:name="Revision"/>
+            <w:lsdException w:name="List Paragraph"/>
+            <w:lsdException w:name="Quote"/>
+            <w:lsdException w:name="Intense Quote"/>
+            <w:lsdException w:name="Medium List 2 Accent 1"/>
+            <w:lsdException w:name="Medium Grid 1 Accent 1"/>
+            <w:lsdException w:name="Medium Grid 2 Accent 1"/>
+            <w:lsdException w:name="Medium Grid 3 Accent 1"/>
+            <w:lsdException w:name="Dark List Accent 1"/>
+            <w:lsdException w:name="Colorful Shading Accent 1"/>
+            <w:lsdException w:name="Colorful List Accent 1"/>
+            <w:lsdException w:name="Colorful Grid Accent 1"/>
+            <w:lsdException w:name="Light Shading Accent 2"/>
+            <w:lsdException w:name="Light List Accent 2"/>
+            <w:lsdException w:name="Light Grid Accent 2"/>
+            <w:lsdException w:name="Medium Shading 1 Accent 2"/>
+            <w:lsdException w:name="Medium Shading 2 Accent 2"/>
+            <w:lsdException w:name="Medium List 1 Accent 2"/>
+            <w:lsdException w:name="Medium List 2 Accent 2"/>
+            <w:lsdException w:name="Medium Grid 1 Accent 2"/>
+            <w:lsdException w:name="Medium Grid 2 Accent 2"/>
+            <w:lsdException w:name="Medium Grid 3 Accent 2"/>
+            <w:lsdException w:name="Dark List Accent 2"/>
+            <w:lsdException w:name="Colorful Shading Accent 2"/>
+            <w:lsdException w:name="Colorful List Accent 2"/>
+            <w:lsdException w:name="Colorful Grid Accent 2"/>
+            <w:lsdException w:name="Light Shading Accent 3"/>
+            <w:lsdException w:name="Light List Accent 3"/>
+            <w:lsdException w:name="Light Grid Accent 3"/>
+            <w:lsdException w:name="Medium Shading 1 Accent 3"/>
+            <w:lsdException w:name="Medium Shading 2 Accent 3"/>
+            <w:lsdException w:name="Medium List 1 Accent 3"/>
+            <w:lsdException w:name="Medium List 2 Accent 3"/>
+            <w:lsdException w:name="Medium Grid 1 Accent 3"/>
+            <w:lsdException w:name="Medium Grid 2 Accent 3"/>
+            <w:lsdException w:name="Medium Grid 3 Accent 3"/>
+            <w:lsdException w:name="Dark List Accent 3"/>
+            <w:lsdException w:name="Colorful Shading Accent 3"/>
+            <w:lsdException w:name="Colorful List Accent 3"/>
+            <w:lsdException w:name="Colorful Grid Accent 3"/>
+            <w:lsdException w:name="Light Shading Accent 4"/>
+            <w:lsdException w:name="Light List Accent 4"/>
+            <w:lsdException w:name="Light Grid Accent 4"/>
+            <w:lsdException w:name="Medium Shading 1 Accent 4"/>
+            <w:lsdException w:name="Medium Shading 2 Accent 4"/>
+            <w:lsdException w:name="Medium List 1 Accent 4"/>
+            <w:lsdException w:name="Medium List 2 Accent 4"/>
+            <w:lsdException w:name="Medium Grid 1 Accent 4"/>
+            <w:lsdException w:name="Medium Grid 2 Accent 4"/>
+            <w:lsdException w:name="Medium Grid 3 Accent 4"/>
+            <w:lsdException w:name="Dark List Accent 4"/>
+            <w:lsdException w:name="Colorful Shading Accent 4"/>
+            <w:lsdException w:name="Colorful List Accent 4"/>
+            <w:lsdException w:name="Colorful Grid Accent 4"/>
+            <w:lsdException w:name="Light Shading Accent 5"/>
+            <w:lsdException w:name="Light List Accent 5"/>
+            <w:lsdException w:name="Light Grid Accent 5"/>
+            <w:lsdException w:name="Medium Shading 1 Accent 5"/>
+            <w:lsdException w:name="Medium Shading 2 Accent 5"/>
+            <w:lsdException w:name="Medium List 1 Accent 5"/>
+            <w:lsdException w:name="Medium List 2 Accent 5"/>
+            <w:lsdException w:name="Medium Grid 1 Accent 5"/>
+            <w:lsdException w:name="Medium Grid 2 Accent 5"/>
+            <w:lsdException w:name="Medium Grid 3 Accent 5"/>
+            <w:lsdException w:name="Dark List Accent 5"/>
+            <w:lsdException w:name="Colorful Shading Accent 5"/>
+            <w:lsdException w:name="Colorful List Accent 5"/>
+            <w:lsdException w:name="Colorful Grid Accent 5"/>
+            <w:lsdException w:name="Light Shading Accent 6"/>
+            <w:lsdException w:name="Light List Accent 6"/>
+            <w:lsdException w:name="Light Grid Accent 6"/>
+            <w:lsdException w:name="Medium Shading 1 Accent 6"/>
+            <w:lsdException w:name="Medium Shading 2 Accent 6"/>
+            <w:lsdException w:name="Medium List 1 Accent 6"/>
+            <w:lsdException w:name="Medium List 2 Accent 6"/>
+            <w:lsdException w:name="Medium Grid 1 Accent 6"/>
+            <w:lsdException w:name="Medium Grid 2 Accent 6"/>
+            <w:lsdException w:name="Medium Grid 3 Accent 6"/>
+            <w:lsdException w:name="Dark List Accent 6"/>
+            <w:lsdException w:name="Colorful Shading Accent 6"/>
+            <w:lsdException w:name="Colorful List Accent 6"/>
+            <w:lsdException w:name="Colorful Grid Accent 6"/>
+            <w:lsdException w:name="Subtle Emphasis"/>
+            <w:lsdException w:name="Intense Emphasis"/>
+            <w:lsdException w:name="Subtle Reference"/>
+            <w:lsdException w:name="Intense Reference"/>
+            <w:lsdException w:name="Book Title"/>
+            <w:lsdException w:name="Bibliography"/>
+            <w:lsdException w:name="TOC Heading"/>
+            <w:lsdException w:name="Plain Table 1"/>
+            <w:lsdException w:name="Plain Table 2"/>
+            <w:lsdException w:name="Plain Table 3"/>
+            <w:lsdException w:name="Plain Table 4"/>
+            <w:lsdException w:name="Plain Table 5"/>
+            <w:lsdException w:name="Grid Table Light"/>
+            <w:lsdException w:name="Grid Table 1 Light"/>
+            <w:lsdException w:name="Grid Table 2"/>
+            <w:lsdException w:name="Grid Table 3"/>
+            <w:lsdException w:name="Grid Table 4"/>
+            <w:lsdException w:name="Grid Table 5 Dark"/>
+            <w:lsdException w:name="Grid Table 6 Colorful"/>
+            <w:lsdException w:name="Grid Table 7 Colorful"/>
+            <w:lsdException w:name="Grid Table 1 Light Accent 1"/>
+            <w:lsdException w:name="Grid Table 2 Accent 1"/>
+            <w:lsdException w:name="Grid Table 3 Accent 1"/>
+            <w:lsdException w:name="Grid Table 4 Accent 1"/>
+            <w:lsdException w:name="Grid Table 5 Dark Accent 1"/>
+            <w:lsdException w:name="Grid Table 6 Colorful Accent 1"/>
+            <w:lsdException w:name="Grid Table 7 Colorful Accent 1"/>
+            <w:lsdException w:name="Grid Table 1 Light Accent 2"/>
+            <w:lsdException w:name="Grid Table 2 Accent 2"/>
+            <w:lsdException w:name="Grid Table 3 Accent 2"/>
+            <w:lsdException w:name="Grid Table 4 Accent 2"/>
+            <w:lsdException w:name="Grid Table 5 Dark Accent 2"/>
+            <w:lsdException w:name="Grid Table 6 Colorful Accent 2"/>
+            <w:lsdException w:name="Grid Table 7 Colorful Accent 2"/>
+            <w:lsdException w:name="Grid Table 1 Light Accent 3"/>
+            <w:lsdException w:name="Grid Table 2 Accent 3"/>
+            <w:lsdException w:name="Grid Table 3 Accent 3"/>
+            <w:lsdException w:name="Grid Table 4 Accent 3"/>
+            <w:lsdException w:name="Grid Table 5 Dark Accent 3"/>
+            <w:lsdException w:name="Grid Table 6 Colorful Accent 3"/>
+            <w:lsdException w:name="Grid Table 7 Colorful Accent 3"/>
+            <w:lsdException w:name="Grid Table 1 Light Accent 4"/>
+            <w:lsdException w:name="Grid Table 2 Accent 4"/>
+            <w:lsdException w:name="Grid Table 3 Accent 4"/>
+            <w:lsdException w:name="Grid Table 4 Accent 4"/>
+            <w:lsdException w:name="Grid Table 5 Dark Accent 4"/>
+            <w:lsdException w:name="Grid Table 6 Colorful Accent 4"/>
+            <w:lsdException w:name="Grid Table 7 Colorful Accent 4"/>
+            <w:lsdException w:name="Grid Table 1 Light Accent 5"/>
+            <w:lsdException w:name="Grid Table 2 Accent 5"/>
+            <w:lsdException w:name="Grid Table 3 Accent 5"/>
+            <w:lsdException w:name="Grid Table 4 Accent 5"/>
+            <w:lsdException w:name="Grid Table 5 Dark Accent 5"/>
+            <w:lsdException w:name="Grid Table 6 Colorful Accent 5"/>
+            <w:lsdException w:name="Grid Table 7 Colorful Accent 5"/>
+            <w:lsdException w:name="Grid Table 1 Light Accent 6"/>
+            <w:lsdException w:name="Grid Table 2 Accent 6"/>
+            <w:lsdException w:name="Grid Table 3 Accent 6"/>
+            <w:lsdException w:name="Grid Table 4 Accent 6"/>
+            <w:lsdException w:name="Grid Table 5 Dark Accent 6"/>
+            <w:lsdException w:name="Grid Table 6 Colorful Accent 6"/>
+            <w:lsdException w:name="Grid Table 7 Colorful Accent 6"/>
+            <w:lsdException w:name="List Table 1 Light"/>
+            <w:lsdException w:name="List Table 2"/>
+            <w:lsdException w:name="List Table 3"/>
+            <w:lsdException w:name="List Table 4"/>
+            <w:lsdException w:name="List Table 5 Dark"/>
+            <w:lsdException w:name="List Table 6 Colorful"/>
+            <w:lsdException w:name="List Table 7 Colorful"/>
+            <w:lsdException w:name="List Table 1 Light Accent 1"/>
+            <w:lsdException w:name="List Table 2 Accent 1"/>
+            <w:lsdException w:name="List Table 3 Accent 1"/>
+            <w:lsdException w:name="List Table 4 Accent 1"/>
+            <w:lsdException w:name="List Table 5 Dark Accent 1"/>
+            <w:lsdException w:name="List Table 6 Colorful Accent 1"/>
+            <w:lsdException w:name="List Table 7 Colorful Accent 1"/>
+            <w:lsdException w:name="List Table 1 Light Accent 2"/>
+            <w:lsdException w:name="List Table 2 Accent 2"/>
+            <w:lsdException w:name="List Table 3 Accent 2"/>
+            <w:lsdException w:name="List Table 4 Accent 2"/>
+            <w:lsdException w:name="List Table 5 Dark Accent 2"/>
+            <w:lsdException w:name="List Table 6 Colorful Accent 2"/>
+            <w:lsdException w:name="List Table 7 Colorful Accent 2"/>
+            <w:lsdException w:name="List Table 1 Light Accent 3"/>
+            <w:lsdException w:name="List Table 2 Accent 3"/>
+            <w:lsdException w:name="List Table 3 Accent 3"/>
+            <w:lsdException w:name="List Table 4 Accent 3"/>
+            <w:lsdException w:name="List Table 5 Dark Accent 3"/>
+            <w:lsdException w:name="List Table 6 Colorful Accent 3"/>
+            <w:lsdException w:name="List Table 7 Colorful Accent 3"/>
+            <w:lsdException w:name="List Table 1 Light Accent 4"/>
+            <w:lsdException w:name="List Table 2 Accent 4"/>
+            <w:lsdException w:name="List Table 3 Accent 4"/>
+            <w:lsdException w:name="List Table 4 Accent 4"/>
+            <w:lsdException w:name="List Table 5 Dark Accent 4"/>
+            <w:lsdException w:name="List Table 6 Colorful Accent 4"/>
+            <w:lsdException w:name="List Table 7 Colorful Accent 4"/>
+            <w:lsdException w:name="List Table 1 Light Accent 5"/>
+            <w:lsdException w:name="List Table 2 Accent 5"/>
+            <w:lsdException w:name="List Table 3 Accent 5"/>
+            <w:lsdException w:name="List Table 4 Accent 5"/>
+            <w:lsdException w:name="List Table 5 Dark Accent 5"/>
+            <w:lsdException w:name="List Table 6 Colorful Accent 5"/>
+            <w:lsdException w:name="List Table 7 Colorful Accent 5"/>
+            <w:lsdException w:name="List Table 1 Light Accent 6"/>
+            <w:lsdException w:name="List Table 2 Accent 6"/>
+            <w:lsdException w:name="List Table 3 Accent 6"/>
+            <w:lsdException w:name="List Table 4 Accent 6"/>
+            <w:lsdException w:name="List Table 5 Dark Accent 6"/>
+            <w:lsdException w:name="List Table 6 Colorful Accent 6"/>
+            <w:lsdException w:name="List Table 7 Colorful Accent 6"/>
+            <w:lsdException w:name="Mention"/>
+            <w:lsdException w:name="Smart Hyperlink"/>
+            <w:lsdException w:name="Hashtag"/>
+            <w:lsdException w:name="Unresolved Mention"/>
+            <w:lsdException w:name="Smart Link"/>
+        </w:latentStyles>
+        <w:style w:type="paragraph" w:default="on" w:styleId="a">
+            <w:name w:val="Normal"/>
+            <wx:uiName wx:val="正文"/>
+            <w:pPr>
+                <w:widowControl w:val="off"/>
+                <w:jc w:val="both"/>
+            </w:pPr>
+            <w:rPr>
+                <w:rFonts w:ascii="Times New Roman" w:h-ansi="Times New Roman"/>
+                <wx:font wx:val="Times New Roman"/>
+                <w:kern w:val="2"/>
+                <w:sz w:val="21"/>
+                <w:sz-cs w:val="24"/>
+                <w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>
+            </w:rPr>
+        </w:style>
+        <w:style w:type="character" w:default="on" w:styleId="a0">
+            <w:name w:val="Default Paragraph Font"/>
+            <wx:uiName wx:val="默认段落字体"/>
+        </w:style>
+        <w:style w:type="table" w:default="on" w:styleId="a1">
+            <w:name w:val="Normal Table"/>
+            <wx:uiName wx:val="普通表格"/>
+            <w:rPr>
+                <wx:font wx:val="Calibri"/>
+                <w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>
+            </w:rPr>
+            <w:tblPr>
+                <w:tblInd w:w="0" w:type="dxa"/>
+                <w:tblCellMar>
+                    <w:top w:w="0" w:type="dxa"/>
+                    <w:left w:w="108" w:type="dxa"/>
+                    <w:bottom w:w="0" w:type="dxa"/>
+                    <w:right w:w="108" w:type="dxa"/>
+                </w:tblCellMar>
+            </w:tblPr>
+        </w:style>
+        <w:style w:type="list" w:default="on" w:styleId="a2">
+            <w:name w:val="No List"/>
+            <wx:uiName wx:val="无列表"/>
+        </w:style>
+    </w:styles>
+    <w:shapeDefaults>
+        <o:shapedefaults v:ext="edit" spidmax="1026"/>
+        <o:shapelayout v:ext="edit">
+            <o:idmap v:ext="edit" data="1"/>
+        </o:shapelayout>
+    </w:shapeDefaults>
+    <w:docPr>
+        <w:view w:val="print"/>
+        <w:zoom w:percent="100"/>
+        <w:bordersDontSurroundHeader/>
+        <w:bordersDontSurroundFooter/>
+        <w:proofState w:spelling="clean" w:grammar="clean"/>
+        <w:defaultTabStop w:val="420"/>
+        <w:drawingGridVerticalSpacing w:val="156"/>
+        <w:displayHorizontalDrawingGridEvery w:val="0"/>
+        <w:displayVerticalDrawingGridEvery w:val="2"/>
+        <w:punctuationKerning/>
+        <w:characterSpacingControl w:val="CompressPunctuation"/>
+        <w:validateAgainstSchema/>
+        <w:saveInvalidXML w:val="off"/>
+        <w:ignoreMixedContent w:val="off"/>
+        <w:alwaysShowPlaceholderText w:val="off"/>
+        <w:compat>
+            <w:spaceForUL/>
+            <w:balanceSingleByteDoubleByteWidth/>
+            <w:doNotLeaveBackslashAlone/>
+            <w:ulTrailSpace/>
+            <w:doNotExpandShiftReturn/>
+            <w:adjustLineHeightInTable/>
+            <w:breakWrappedTables/>
+            <w:snapToGridInCell/>
+            <w:wrapTextWithPunct/>
+            <w:useAsianBreakRules/>
+            <w:dontGrowAutofit/>
+            <w:useFELayout/>
+        </w:compat>
+        <w:docVars>
+            <w:docVar w:name="commondata" w:val="eyJoZGlkIjoiN2YzNjBkOTgyNWQ1YTMxYzM3MzMwNWFiODNmOWIzYWMifQ=="/>
+        </w:docVars>
+        <wsp:rsids>
+            <wsp:rsidRoot wsp:val="00B67617"/>
+            <wsp:rsid wsp:val="00B67617"/>
+            <wsp:rsid wsp:val="00E63E8D"/>
+            <wsp:rsid wsp:val="05C27610"/>
+        </wsp:rsids>
+    </w:docPr>
+    <w:body>
+        <wx:sect>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00B67617">
+                <w:pPr>
+                    <w:spacing w:line="440" w:line-rule="exact"/>
+                    <w:ind w:first-line-chars="2300" w:first-line="4830"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:sz-cs w:val="21"/>
+                    </w:rPr>
+                </w:pPr>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:tabs>
+                        <w:tab w:val="left" w:pos="1320"/>
+                    </w:tabs>
+                    <w:spacing w:line="360" w:line-rule="auto"/>
+                    <w:jc w:val="center"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:b/>
+                        <w:sz w:val="36"/>
+                        <w:sz-cs w:val="36"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:b/>
+                        <w:sz w:val="36"/>
+                        <w:sz-cs w:val="36"/>
+                    </w:rPr>
+                    <w:t>股东会对外担保决议</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:widowControl/>
+                    <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+                    <w:ind w:first-line-chars="2050" w:first-line="4920"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t></w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:widowControl/>
+                    <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"/>
+                    <w:ind w:first-line-chars="200" w:first-line="480"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>议题：关于是否同意本公司提供担保事宜。</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:widowControl/>
+                    <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"
+                               w:line="480" w:line-rule="auto"/>
+                    <w:ind w:first-line-chars="200" w:first-line="480"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>根据《公司法》和公司章程规定，股东会会议应到股东</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:t>       </w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>名，实到</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:t>      </w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>名，所持股份占公司全部股份</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:t> </w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>%。本次股东会召集与所作决议符合公司章程和《公司法》的规定，所作决议合法有效。与会股东经审议、表决，一致通过以下决议：</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:widowControl/>
+                    <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"
+                               w:line="480" w:line-rule="auto"/>
+                    <w:ind w:first-line-chars="200" w:first-line="480"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>同意本公司在《欠款提车担保承诺书》中为</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:t></w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>向</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                    <w:t></w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>提供连带责任担保。</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00B67617">
+                <w:pPr>
+                    <w:widowControl/>
+                    <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"
+                               w:line="480" w:line-rule="auto"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:widowControl/>
+                    <w:spacing w:before="100" w:before-autospacing="on" w:after="100" w:after-autospacing="on"
+                               w:line="480" w:line-rule="auto"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>与会股东签字：</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00B67617">
+                <w:pPr>
+                    <w:ind w:first-line-chars="950" w:first-line="2280"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                </w:pPr>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00B67617">
+                <w:pPr>
+                    <w:ind w:first-line-chars="950" w:first-line="2280"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                        <w:u w:val="single"/>
+                    </w:rPr>
+                </w:pPr>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:ind w:first-line-chars="1250" w:first-line="3000"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t>          公司（公章）</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:ind w:first-line-chars="1500" w:first-line="3600"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t></w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
+                <w:pPr>
+                    <w:ind w:first-line-chars="2200" w:first-line="5280"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                </w:pPr>
+                <w:r>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:kern w:val="0"/>
+                        <w:sz w:val="24"/>
+                    </w:rPr>
+                    <w:t> 年 月 日</w:t>
+                </w:r>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00B67617">
+                <w:pPr>
+                    <w:spacing w:line="440" w:line-rule="exact"/>
+                    <w:ind w:first-line-chars="2300" w:first-line="4830"/>
+                    <w:rPr>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <wx:font wx:val="宋体"/>
+                        <w:sz-cs w:val="21"/>
+                    </w:rPr>
+                </w:pPr>
+            </w:p>
+            <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00B67617"/>
+            <w:sectPr wsp:rsidR="00B67617">
+                <w:pgSz w:w="11906" w:h="16838"/>
+                <w:pgMar w:top="1440" w:right="1800" w:bottom="1440" w:left="1800" w:header="851" w:footer="992"
+                         w:gutter="0"/>
+                <w:cols w:space="425"/>
+                <w:docGrid w:type="lines" w:line-pitch="312"/>
+            </w:sectPr>
+        </wx:sect>
+    </w:body></w:wordDocument>

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

@@ -80,4 +80,7 @@ public class FinBillApplicationQuery implements Query {
     private String returnedMoneyStartDate; // 承诺回款开始日期
     @ApiModelProperty("承诺回款结束日期")
     private String returnedMoneyEndDate; // 承诺回款结束日期
+
+    @ApiModelProperty("1待办2已办")
+    private String type;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java

@@ -65,6 +65,8 @@ public class FinBillTrailerDetailsVo implements Vo {
     private String openTickSid; // 开票名称sid
 	@ApiModelProperty("开票名称")
     private String openTickName; // 开票名称
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
 	@ApiModelProperty("单台开票金额")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java

@@ -67,6 +67,8 @@ public class FinBillTrailerVo implements Vo {
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
 

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

@@ -158,7 +158,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
         }
@@ -237,7 +237,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
                 finBillTrailer.setBillAppSid(finBillApplication.getSid());
                 for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                         finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                         finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                         finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -293,6 +293,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if (finBillApplication == null) {
             rb.setMsg("该数据不存在");
         }
+        dto.setArrearsMoney("0");
         updateByDto(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
@@ -357,7 +358,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
             finBillTrailer.setBillAppSid(dtoSid);
             for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                     finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                     finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                     finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -382,7 +383,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         FinBillApplication entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        entity.setArrearsMoney("0");
         baseMapper.updateById(entity);
     }
 
@@ -392,7 +392,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
         if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
             FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
-            if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){
+            if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) {
                 entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
             }
         }
@@ -403,10 +403,12 @@ 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());
+                finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
                 List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                 for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
                         finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
                     }
                 }
@@ -415,7 +417,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         } else {
             for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                 BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
-                TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(),entity.getContractNo()).getData();
+                TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(), entity.getContractNo()).getData();
                 List<TrailerVo> trailerVoList = data.getList();
                 for (TrailerVo trailerVo : trailerVoList) {
                     FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
@@ -430,7 +432,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
                     List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                     for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                        if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+                        if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
                             finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
                         }
                     }
@@ -765,7 +767,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
                     finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                 }
-                if (finBillTrailerVos != null){
+                if (finBillTrailerVos != null) {
                     for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
                         FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                         finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
@@ -792,8 +794,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                if (oneBillMoney == null){
-                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
                 }
             } else {
                 //极光推送
@@ -991,10 +993,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         String contractNo = dto.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
-        if (finBillApplicationDetailsVos != null){
+        if (finBillApplicationDetailsVos != null) {
             for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
                 String nodeState = finBillApplicationDetailsVo.getNodeState();
-                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
                     return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
                 }
             }
@@ -1523,7 +1525,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
                 finBillTrailer.setBillAppSid(finBillApplication.getSid());
                 for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                         finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                         finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                         finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -1533,7 +1535,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillTrailerService.save(finBillTrailer);
             }
             //附件信息
-            if (khkpsqsApplicationAppendxs.size() > 0){
+            if (khkpsqsApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1545,7 +1547,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            if (kpxxqrsApplicationAppendxs.size() > 0){
+            if (kpxxqrsApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1557,7 +1559,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            if (cldjhtApplicationAppendxs.size() > 0){
+            if (cldjhtApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1569,7 +1571,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            if (zjApplicationAppendxs.size() > 0){
+            if (zjApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1587,6 +1589,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if (finBillApplication == null) {
             rb.setMsg("该数据不存在");
         }
+        dto.setBillStateKey("003");
+        dto.setBillStateValue("欠款开票");
         updateByDto(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
@@ -1651,7 +1655,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
             finBillTrailer.setBillAppSid(dtoSid);
             for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                     finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                     finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                     finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -1667,10 +1671,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         String contractNo = dto.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
-        if (finBillApplicationDetailsVos != null){
+        if (finBillApplicationDetailsVos != null) {
             for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
                 String nodeState = finBillApplicationDetailsVo.getNodeState();
-                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)){
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
                     return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
                 }
             }
@@ -1702,7 +1706,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //新增修改保存
-        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        ResultBean<String> resultBean = saveOrUpdateDtoQK(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -1714,6 +1718,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("是"));
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -1779,8 +1784,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                if (oneBillMoney == null){
-                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
                 }
             } else {
                 //极光推送
@@ -1957,13 +1962,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public PagerVo<FinBillApplicationVo> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
         FinBillApplicationQuery query = pq.getParams();
         QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
         }
         qw.eq("fba.billStateKey", "003");
         qw.eq("fba.useOrgSid", query.getUseOrgSid());
         qw.eq("fba.createBySid", query.getCreateBySid());
+        if ("1".equals(query.getType())) {
+            qw.eq("fba.nodeState", "待提交");
+        } else if ("2".equals(query.getType())) {
+            qw.ne("fba.nodeState", "待提交");
+        }
         if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
             qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
         }
@@ -2056,15 +2066,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String sid = query.getSid();
-        String userSid = query.getUserSid();
-        String contractNo = query.getContractNo();
-        String orgPath = query.getOrgPath();
-        String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
-        String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo();
-        if (StringUtils.isBlank(sid)){
-            finBillApplicationDetailsVo.setCreateBySid(userSid);
-            SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+        if (StringUtils.isBlank(sid)) {
+            String orgPath = query.getOrgPath();
+            String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
+            String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
+            finBillApplicationDetailsVo.setCreateBySid(query.getUserSid());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
             finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName());
             finBillApplicationDetailsVo.setDeptSid(deptSid);
             finBillApplicationDetailsVo.setDeptName(deptName);
@@ -2073,15 +2081,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplicationDetailsVo.setStaffName(sysUserVo.getName());
             finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
             finBillApplicationDetailsVo.setSaleDeptName(deptName);
-            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(query.getContractNo()).getData();
             finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());
-            finBillApplicationDetailsVo.setContractNo(contractNo);
-            CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
+            finBillApplicationDetailsVo.setContractNo(query.getContractNo());
+            CommonContract commonContract = commonContractFeign.selectByNo(query.getContractNo()).getData();
             finBillApplicationDetailsVo.setOpenTickUnitName(commonContract.getPartyA());
             finBillApplicationDetailsVo.setCustomerSid(commonContract.getCustomerSid());
             finBillApplicationDetailsVo.setCustomerName(commonContract.getPartyB());
-        }else {
+            finBillApplicationDetailsVo.setModelSid(commonContract.getModelSid());
+            finBillApplicationDetailsVo.setModelName(commonContract.getModelName());
+        } else {
             finBillApplicationDetailsVo = fetchDetailsVoBySid(sid);
         }
         return rb.success().setData(finBillApplicationDetailsVo);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -76,4 +76,7 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 
 	@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")
 	void updateByMainSid(String sid);
+
+	@Select("select * from fin_bill_vehicle where vinNo = #{vinNo}")
+	FinBillVehicleVo selByVinNo(String vinNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java

@@ -141,4 +141,8 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
     public void updateByMainSid(String sid) {
         baseMapper.updateByMainSid(sid);
     }
+
+    public FinBillVehicleVo selByVinNo(String vinNo) {
+       return baseMapper.selByVinNo(vinNo);
+    }
 }

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

@@ -15,7 +15,8 @@ public enum ProcDefEnum {
     FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
-    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
@@ -77,8 +78,7 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
-    ;
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/;
 
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/28 10:29
+ * @Description
+ */
+@Data
+public class SysFinanceVo {
+
+    private String userSid;
+
+    private String name;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -184,4 +184,10 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("根据code查询组织信息")
     ResultBean<SysOrganization> selectByOrgCode(@RequestParam("orgCode") String orgCode);
+
+    @GetMapping("/selectFinance")
+    @ResponseBody
+    @ApiOperation("查询金融部主管人员")
+    ResultBean<List<SysFinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -187,4 +186,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<SysOrganization> selectByOrgCode(String orgCode) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -1,11 +1,12 @@
 package com.yxt.anrui.portal.biz.sysorganization;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -92,7 +93,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
      * @param sid
      * @return
      */
-    SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
+    SysOrganizationVo getUseOrgBySid(@Param("sid") String sid);
 
     int updateQrCodePath(@Param("sid") String sid, @Param("path") String path);
 
@@ -106,6 +107,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrgVo getListOrgByBrand(String sid);
 
     List<SysOrganizationListVo> selectOrgList(String orgSid);
+
     List<SysOrganizationListsVo> selectOrgLists(String orgSid);
 
     List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
@@ -122,4 +124,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrganizationVo> selectOrgByPSid(String psid);
 
     int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath);
+
+    List<SysFinanceVo> selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -231,4 +231,8 @@
         where orgSid = #{orgSid}
           and manageType = '3'
     </update>
+
+    <select id="selectBy" resultType="com.yxt.anrui.portal.api.sysorganization.SysFinanceVo">
+        select managerSid as userSid,managerName as name from sys_organization where psid = #{useOrgSid} and name = #{name}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -443,4 +444,12 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         SysOrganization sysOrganization = sysOrganizationService.selectByOrgCode(orgCode);
         return rb.success().setData(sysOrganization);
     }
+
+    @Override
+    public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
+        ResultBean<List<SysFinanceVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
+        List<SysFinanceVo> list = sysOrganizationService.selectBy("金融服务部",useOrgSid);
+        return rb.success().setData(list);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -17,6 +17,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -212,16 +213,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) {
                 StringBuilder orgName = new StringBuilder();
                 List<String> split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/"));
-                if(split.size()>1){
-                    for(int i = 0;i<split.size();i++){
+                if (split.size() > 1) {
+                    for (int i = 0; i < split.size(); i++) {
                         SysOrganization sysOrganization = fetchBySid(split.get(i));
-                        if(i == 0){
+                        if (i == 0) {
                             orgName = orgName.append(sysOrganization.getName());
-                        }else{
+                        } else {
                             orgName = orgName.append("/").append(sysOrganization.getName());
                         }
                     }
-                }else{
+                } else {
                     SysOrganization sysOrganization = fetchBySid(split.get(0));
                     orgName = orgName.append(sysOrganization.getName());
                 }
@@ -276,7 +277,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
         //根据主管人员sid获取主管姓名
-        if(StringUtils.isNotBlank(zgStaffSid)){
+        if (StringUtils.isNotBlank(zgStaffSid)) {
             SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid);
             entity.setManagerName(sysStaffinfo.getName());
             SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
@@ -305,7 +306,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         SysOrganizationVo vo = new SysOrganizationVo();
         BeanUtil.copyProperties(entity, vo);
         SysUser sysUser = sysUserService.fetchBySid(entity.getManagerSid());
-        if(sysUser != null){
+        if (sysUser != null) {
             vo.setZgStaffSid(sysUser.getStaffSid());
             vo.setZgNames(entity.getManagerName());
         }
@@ -323,9 +324,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         for (int i = 0; i < orgSidPathArr.length; i++) {
             Map<String, Object> m = new HashMap<>();
             // app选择组织时 map 存值key要求这个是空字符串
-            if("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])){//河北安瑞集团的sid
+            if ("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])) {//河北安瑞集团的sid
                 m.put("sid", "");
-            }else{
+            } else {
                 m.put("sid", orgSidPathArr[i]);
             }
 //            m.put("sid", orgSidPathArr[i]);
@@ -572,9 +573,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String orgSid = getOrgSid(orgDeptSid);*/
         String orgSid = "";
         String orgDeptSid = "";
-        if(StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData();
-        }else{
+        } else {
             orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
             orgSid = getOrgSid(orgDeptSid);
         }
@@ -639,26 +640,30 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String orgSidPath = entity.getOrgSidPath();
         //部门名称全路径
         String orgNamePath = "";
-        if(StringUtils.isNotBlank(orgSidPath)){
+        if (StringUtils.isNotBlank(orgSidPath)) {
             StringBuilder orgNamePath1 = new StringBuilder();
             List<String> split = Arrays.asList(orgSidPath.split("/"));
-            if(split.size()>1){
-                for(int i = 0;i<split.size();i++){
+            if (split.size() > 1) {
+                for (int i = 0; i < split.size(); i++) {
                     SysOrganization sysOrganization = fetchBySid(split.get(i));
-                    if(i == 0){
+                    if (i == 0) {
                         orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
-                    }else{
+                    } else {
                         orgNamePath1 = orgNamePath1.append("/").append(sysOrganization.getName());
                     }
                 }
-            }else{
+            } else {
                 SysOrganization sysOrganization = fetchBySid(split.get(0));
                 orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
             }
             orgNamePath = orgNamePath1.toString();
         }
         //更新关联该部门的所有员工的关联表中的部门名称、部门全路径以及名称全路径
-        baseMapper.updateOrgBySid(entity.getSid(),orgName,orgSidPath,orgNamePath);
+        baseMapper.updateOrgBySid(entity.getSid(), orgName, orgSidPath, orgNamePath);
         return rb.success();
     }
+
+    public List<SysFinanceVo> selectBy(String name, String useOrgSid) {
+        return baseMapper.selectBy(name,useOrgSid);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -166,4 +166,6 @@ public class ScmApplyInboundVo implements Vo {
     private String guidedPrice; // 全款/贷款销售指导价
     @ApiModelProperty("最新更新时间")
     private String newUpdateDate; // 最新更新时间
+    @ApiModelProperty("判断最新更新时间是否为当月")
+    private Boolean isNow; // 判断最新更新时间是否为当月
 }

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

@@ -336,7 +336,20 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String guidedPrice = baseVehmodelVo.getGuidedPrice();
         String manufactorSettlementPrice = baseVehmodelVo.getManufactorSettlementPrice();
         vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice);
-        vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
+        String updateDate = DateUtil.formatDate(baseVehmodelVo.getModifyTime());
+        String nowDate = DateUtil.formatDate(new Date());
+        if (StringUtils.isBlank(guidedPrice) && StringUtils.isBlank(manufactorSettlementPrice)){
+            vo.setNewUpdateDate("");
+        }else {
+            vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
+        }
+        String[] updateDates = updateDate.split("-");
+        String[] nowDates = nowDate.split("-");
+        if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])){
+            vo.setIsNow(true);
+        }else {
+            vo.setIsNow(false);
+        }
         List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid);
         List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
         for (ScmFileVo scmFileVo : scmFileVos) {
@@ -347,6 +360,8 @@ 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;
     }
 
@@ -418,7 +433,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String num = dto.getNum();
         String guidedPrice = dto.getGuidedPrice();
         String[] split = guidedPrice.split("/");
-        if (split.length < 2){
+        List<String> stringList = Arrays.asList(split);
+        if (stringList.size() < 3){
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可提交");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
@@ -503,7 +519,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         bv.setUserSid(dto.getUserSid());
         //variables.put("businessSid", businessSid);
         bv.setFormVariables(variables);
-        bv.setModelId(entity.getProcDefId());
+        bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId());
         bv.setInstanceId(entity.getProcInsId());
         if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
             dto.setVehicleList(scmApplyInboundVehicleDtos2);
@@ -581,6 +597,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                         confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
                         confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
                         confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
+                        break;
+                    }else if (flowTask.getTaskName().equals("销售支持部经理审批")) {
+                        confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
+                        confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
+                        confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
                     }
                 }
                 name = confirmSid + "," + confirmName + "," + confirmDate;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -396,10 +396,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
                     //推送调拨单
                     //根据分公司sid查询分公司编码
-                    String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
-                    ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
-                    SysOrganizationVo sysOrganizationVo = sysOrg.getData();
-                    List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
+                    //String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
+                    //ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
+                    //SysOrganizationVo sysOrganizationVo = sysOrg.getData();
+/*                    List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
                     StkTransferDirect stkTransferDirect = new StkTransferDirect();
 //                    stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
 //                    stkTransferDirect.setFStockOrgId("101"); //调入库存组织
@@ -420,7 +420,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
                     FPAYBILLENTRYs.add(fBillEntry);
                     stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
-                    ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
+                    ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);*/
                 }
                 //外采
                 if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {

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

@@ -10,10 +10,10 @@ public class AdvanceInvoicePageQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-
     @ApiModelProperty("客户名称字段 合同编号字段")
     private String name;
-
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("1待办2已办")
+    private String type;
 }

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

@@ -33,6 +33,9 @@ public class AdvanceInvoicePageVo implements Vo {
     private Boolean showUpdateBtn;
     @ApiModelProperty("是否显示删除按钮")
     private Boolean showDeleteBtn;
-
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("销售类型")
+    private String type;
 
 }

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

@@ -61,7 +61,6 @@ import javax.validation.Valid;
         fallback = AppBusAdvanceGinvoiceapplyFeignFallback.class)
 public interface AppBusAdvanceGinvoiceapplyFeign {
 
-
     @ApiOperation("手机端-获取欠款开票列表")
     @PostMapping("/getAdvanceInvoiceList")
     @ResponseBody
@@ -77,6 +76,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
 
+    @ApiOperation("手机端-欠款开票详情")
+    @GetMapping("/detailAdvancelnvoice")
+    @ResponseBody
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(@RequestParam("sid") String sid);
+
     @ApiOperation("移动端-保存欠款开票申请")
     @PostMapping("/saveAdvanceInvoice")
     @ResponseBody
@@ -87,7 +91,6 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
 
-
     @ApiOperation("提交流程")
     @PostMapping("/submitAdvanceInvoiceInfo")
     @ResponseBody

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

@@ -66,6 +66,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
         return null;
     }
 
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
         return null;

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

@@ -62,6 +62,8 @@ public class FinBillTrailerVo implements Vo {
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
     @ApiModelProperty("合格证图片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class AdvanceArrearsDto implements Dto {
     private static final long serialVersionUID = 6445736018244517900L;
 
-    @ApiModelProperty("用户sid")
+   /* @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("合同sid")
     @JsonProperty("contractSid")
@@ -49,5 +49,94 @@ public class AdvanceArrearsDto implements Dto {
     @ApiModelProperty("流程实列id")
     private String procInsId;
     @ApiModelProperty("用户sid")
+    private String taskId;*/
+
+    @ApiModelProperty("欠款提车申请sid")
+    private String sid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("发起部门-发起人")
+    private String publishInfo;
+    @ApiModelProperty("发起日期")
+    @JsonProperty("date")
+    private String createDate;
+    private String applyDept;
+    private String applyDeptSid;
+    private String applyUserSid;
+    private String applyName;
+    private String staffUserSid;
+    @JsonProperty("sellerName")
+    private String staffName;
+    private String staffDeptSid;
+    @ApiModelProperty("销售部门")
+    @JsonProperty("sellerDept")
+    private String staffDept;
+    @JsonProperty("saleType")
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
+    private String paymentMethodKey;
+    @ApiModelProperty("开票单位")
+    private String openTickName;
+    @ApiModelProperty("客户名称")
+    @JsonProperty("name")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("车型")
+    @JsonProperty("model")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    //是否金融部复核
+    @ApiModelProperty("是否金融部复核，1是，0否")
+    private String isFinance;
+    @ApiModelProperty("金融人员用户sid")
+    private String financeUserSid;
+    @ApiModelProperty("金融人员名称")
+    private String financeName;
+
+    @ApiModelProperty("实例id")
+    @JsonProperty("procInsId")
+    private String procInstId;
+    @ApiModelProperty("任务id")
     private String taskId;
+
+    @ApiModelProperty("选择车辆列表")
+    private List<AppCarListVo> vinList = new ArrayList<>();
+
+    @ApiModelProperty("欠款提车挂车列表")
+    private List<GcCarListVo> trailersList = new ArrayList<>();
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> zjlLetter = new ArrayList<>();
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("欠款原因key")
+    private String reasonKey;
+    @ApiModelProperty("欠款原因value")
+    private String reasonValue;
+    @ApiModelProperty("原因备注")
+    @JsonProperty("remarks")
+    private String reason;
+    @ApiModelProperty("回款日期")
+    private String commitmentMoneyDate;
+    @ApiModelProperty("合同总金额")
+    private String contractMoney;
+    @ApiModelProperty("平台收款总金额")
+    private String contractCollectionMoney;
+    @ApiModelProperty("其他附件")
+    private List<String> fileList = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@@ -116,7 +116,6 @@ public class AdvanceArrearsInfoVo implements Vo {
 
     @ApiModelProperty("欠款提车挂车列表")
     private List<GcCarListVo> trailersList = new ArrayList<>();
-
     @ApiModelProperty("车辆买卖合同")
     private List<String> carContract = new ArrayList<>();
     @ApiModelProperty("欠款提车担保承诺书")
@@ -125,6 +124,14 @@ public class AdvanceArrearsInfoVo implements Vo {
     private List<String> gdLetter = new ArrayList<>();
     @ApiModelProperty("总经理担保书")
     private List<String> zjlLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书下载地址")
+    private String zjlLetterDownloadUrl;
+    @ApiModelProperty("车辆买卖合同下载地址")
+    private String carContractDownloadUrl;
+    @ApiModelProperty("欠款提车担保承诺书下载地址")
+    private String guaranteeLetterDownloadUrl;
+    @ApiModelProperty("股东会对外担保决议下载地址")
+    private String gdLetterDownloadUrl;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -42,10 +42,10 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pagerQuery);
 
-    @ApiOperation("移动端-新增欠款提车申请")
+/*    @ApiOperation("移动端-新增欠款提车申请")
     @PostMapping("/addArrearsApply")
     @ResponseBody
-    public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);
+    public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);*/
 
     @ApiOperation("手机端-初始化欠款提车申请")
     @GetMapping("/initArrearsApply")
@@ -54,20 +54,24 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
 
     /**
      * 选择车辆列表
-     * @param contractNo 合同编号
-     * @param vinSids 已选择的车辆sid集合
+     *
      * @return
      */
     @ApiOperation("选择车辆列表")
     @GetMapping("/getCanUseCars")
     @ResponseBody
-    ResultBean<List<ArrearsCarVo>> getCanUseCars(@RequestParam("contractNo") String contractNo, @RequestParam("vinSids") List<String> vinSids);
+    ResultBean<List<ArrearsCarVo>> getCanUseCars(CarsQuery query);
 
     @ApiOperation("移动端-保存欠款提车申请")
     @PostMapping("/saveArrearsApply")
     @ResponseBody
     public ResultBean saveArrearsApply(@Valid @RequestBody AdvanceArrearsDto dto);
 
+    @ApiOperation("点击生成附件")
+    @PostMapping("/saveArrearsApplyPdf")
+    @ResponseBody
+    public ResultBean saveArrearsApplyPdf(@Valid @RequestBody AdvanceArrearsDto dto);
+
     @ApiOperation("手机端-删除欠款提车")
     @DeleteMapping("/deleteArrearsTakeCar")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -32,10 +32,10 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
         return null;
     }
 
-    @Override
+ /*   @Override
     public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
@@ -43,7 +43,7 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
     }
 
     @Override
-    public ResultBean<List<ArrearsCarVo>> getCanUseCars(String contractNo, List<String> vinSids) {
+    public ResultBean<List<ArrearsCarVo>> getCanUseCars(CarsQuery query) {
         return null;
     }
 
@@ -52,6 +52,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
         return null;
     }
 
+    @Override
+    public ResultBean saveArrearsApplyPdf(AdvanceArrearsDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java

@@ -1,19 +1,15 @@
 package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
 public class ArrearsCarryVehiclePageVo implements Vo {
     private static final long serialVersionUID = 1607000479637135351L;
 
-    @ApiModelProperty("合同sid")
-    @JsonProperty("contractSid")
+    @ApiModelProperty("申请单sid")
     private String sid;
     @ApiModelProperty("合同状态")
     @JsonProperty("contractType")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/CarsQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/27 16:10
+ * @Description
+ */
+@Data
+public class CarsQuery {
+    
+    private String contractNo;
+    
+    private List<String> vinSids = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java

@@ -64,6 +64,8 @@ public class FinBillTrailerVo implements Vo {
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
     @ApiModelProperty("合格证图片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -37,4 +37,9 @@ public interface CommonFeign {
     @ResponseBody
     @GetMapping("/getSystem")
     ResultBean<List<SystemVo>> getSystem(@RequestParam("orgPath")String orgPath);
+
+    @ApiOperation(value = "获取金融部门主管")
+    @ResponseBody
+    @GetMapping("/selectFinance")
+    ResultBean<List<FinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.base.common;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/28 10:25
+ * @Description
+ */
+@Data
+public class FinanceVo {
+
+    @JsonProperty("dictKey")
+    private String userSid;
+    @JsonProperty("dictValue")
+    private String name;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@@ -47,10 +47,10 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
         return appBusArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery);
     }
 
-    @Override
+/*    @Override
     public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         return appBusArrearsCarryVehicleApplyService.addArrearsApply(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
@@ -58,8 +58,8 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
     }
 
     @Override
-    public ResultBean<List<ArrearsCarVo>> getCanUseCars(String contractNo, List<String> vinSids) {
-        return appBusArrearsCarryVehicleApplyService.getCanUseCars(contractNo, vinSids);
+    public ResultBean<List<ArrearsCarVo>> getCanUseCars(CarsQuery query) {
+        return appBusArrearsCarryVehicleApplyService.getCanUseCars(query);
     }
 
     @Override
@@ -67,6 +67,11 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
         return appBusArrearsCarryVehicleApplyService.saveArrearsApply(dto);
     }
 
+    @Override
+    public ResultBean saveArrearsApplyPdf(AdvanceArrearsDto dto) {
+        return appBusArrearsCarryVehicleApplyService.saveArrearsApplyPdf(dto);
+    }
+
     @Override
     public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) {
         return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -69,12 +69,12 @@ public class AppBusArrearsCarryVehicleApplyService {
         return rb.success().setData(v);
     }
 
-    public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
+/*    public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         AppArrearsCarryVinDto advanceArrearsVinDto = new AppArrearsCarryVinDto();
         BeanUtil.copyProperties(dto, advanceArrearsVinDto);
         ResultBean resultBean = busArrearsCarryVehicleApplyFeign.addArrearsApply(advanceArrearsVinDto);
         return resultBean;
-    }
+    }*/
 
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
         ResultBean<AdvanceArrearsInfoVo> rb = ResultBean.fireFail();
@@ -91,10 +91,14 @@ public class AppBusArrearsCarryVehicleApplyService {
     }
 
     public ResultBean saveArrearsApply(AdvanceArrearsDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto();
         BeanUtil.copyProperties(dto, appArrearsCarryDto);
         ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApply(appArrearsCarryDto);
-        return resultBean;
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
     }
 
     public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) {
@@ -226,11 +230,10 @@ public class AppBusArrearsCarryVehicleApplyService {
     }
 
 
-    public ResultBean<List<ArrearsCarVo>> getCanUseCars(String contractNo, List<String> vinSids) {
+    public ResultBean<List<ArrearsCarVo>> getCanUseCars(CarsQuery query) {
         ResultBean<List<ArrearsCarVo>> rb = ResultBean.fireFail();
         QCarQuery qCarQuery = new QCarQuery();
-        qCarQuery.setContractNo(contractNo);
-        qCarQuery.setVinSids(vinSids);
+        BeanUtil.copyProperties(query,qCarQuery);
         ResultBean<List<QCarVo>> resultBean = busSalesOrderVehicleFeign.getCanUseCars(qCarQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -238,4 +241,11 @@ public class AppBusArrearsCarryVehicleApplyService {
         List<ArrearsCarVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ArrearsCarVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
+
+    public ResultBean saveArrearsApplyPdf(AdvanceArrearsDto dto) {
+        AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto();
+        BeanUtil.copyProperties(dto, appArrearsCarryDto);
+        ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApplyPdf(appArrearsCarryDto);
+        return resultBean;
+    }
 }

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

@@ -73,6 +73,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
         return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query);
     }
 
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
+        return appBusAdvanceGinvoiceapplyService.detailAdvancelnvoice(sid);
+    }
+
     @Override
     public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
         return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);

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

@@ -37,6 +37,8 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
 import com.yxt.anrui.fin.api.finbillapplication.*;
+import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
+import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery;
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
@@ -103,6 +105,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         params1.setOrgPath(params.getOrgPath());
         params1.setCreateBySid(params.getUserSid());
         params1.setCustomerName(params.getName());
+        params1.setType(params.getType());
         pq.setParams(params1);
         ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPageQK(pq);
         List<AdvanceInvoicePageVo> advanceInvoicePageVos = new ArrayList<>();
@@ -119,6 +122,9 @@ public class AppBusAdvanceGinvoiceapplyService {
             advanceInvoicePageVo.setReason(record.getArrearsOpenYYValue());
             advanceInvoicePageVo.setDate(record.getApplyDate());
             advanceInvoicePageVo.setCustomerName(record.getCustomerName());
+            advanceInvoicePageVo.setModel(record.getModelName());
+            advanceInvoicePageVo.setType(record.getSaleTypeValue());
+            advanceInvoicePageVo.setContractType(record.getNodeState());
             if (record.getNodeState().equals("待提交")){
                 advanceInvoicePageVo.setShowUpdateBtn(true);
                 advanceInvoicePageVo.setShowDeleteBtn(true);
@@ -150,6 +156,10 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
         BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
+        vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
+        vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
+        vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
         vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
@@ -164,6 +174,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setContractId(finBillApplicationDetailsVo.getContractNo());
         vo.setDate(finBillApplicationDetailsVo.getApplyDate());
         vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
+        vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
         //车辆信息
         List<AppCarListVo> vinListVos = new ArrayList<>();
@@ -247,6 +259,10 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setArrearsMoney(dto.getInvoiceTotal());
+        finBillApplicationDto.setReturnedMoneyDate(dto.getCollectionDate());
+        finBillApplicationDto.setArrearsOpenYYKey(dto.getReasonKey());
+        finBillApplicationDto.setArrearsOpenYYValue(dto.getReasonValue());
+        finBillApplicationDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
         finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
         finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
         finBillApplicationDto.setSaleDeptName(dto.getSellerName());
@@ -260,6 +276,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setNodeState(dto.getNodeState());
         finBillApplicationDto.setBillNo(dto.getBillNo());
+        finBillApplicationDto.setModelSid(dto.getModelSid());
+        finBillApplicationDto.setModelName(dto.getModelName());
         String publishInfo = dto.getPublishInfo();
         String[] split = publishInfo.split("-");
         finBillApplicationDto.setDeptName(split[0]);
@@ -333,7 +351,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
-        ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
+        ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto);
         return resultBean;
     }
 
@@ -347,9 +365,105 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        AppSubmitAdvanceInvoiceDto submitAdvanceInvoiceDto = new AppSubmitAdvanceInvoiceDto();
+        SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
         BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.submitAdvanceInvoiceInfo(submitAdvanceInvoiceDto);
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        submitAdvanceInvoiceDto.setUseOrgSid(useOrgSid);
+        submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
+        submitAdvanceInvoiceDto.setArrearsMoney(dto.getInvoiceTotal());
+        submitAdvanceInvoiceDto.setReturnedMoneyDate(dto.getCollectionDate());
+        submitAdvanceInvoiceDto.setArrearsOpenYYKey(dto.getReasonKey());
+        submitAdvanceInvoiceDto.setArrearsOpenYYValue(dto.getReasonValue());
+        submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
+        submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath());
+        submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType());
+        submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName());
+        submitAdvanceInvoiceDto.setStaffName(dto.getSellerName());
+        submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
+        submitAdvanceInvoiceDto.setCustomerName(dto.getName());
+        submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
+        submitAdvanceInvoiceDto.setOpenTickName(dto.getOpenTickName());
+        submitAdvanceInvoiceDto.setContractNo(dto.getContractId());
+        submitAdvanceInvoiceDto.setApplyDate(dto.getDate());
+        submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
+        submitAdvanceInvoiceDto.setNodeState(dto.getNodeState());
+        submitAdvanceInvoiceDto.setBillNo(dto.getBillNo());
+        submitAdvanceInvoiceDto.setModelSid(dto.getModelSid());
+        submitAdvanceInvoiceDto.setModelName(dto.getModelName());
+        String publishInfo = dto.getPublishInfo();
+        String[] split = publishInfo.split("-");
+        submitAdvanceInvoiceDto.setDeptName(split[0]);
+        submitAdvanceInvoiceDto.setCreateByName(split[1]);
+        //开票车辆信息
+        List<AppCarListDto> vinList = dto.getVinList();
+        List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
+        for (AppCarListDto vinListDto : vinList) {
+            FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
+            finBillVehicleDto.setVinNo(vinListDto.getVin());
+            finBillVehicleDto.setVehSid(vinListDto.getVinSid());
+            finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
+            finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
+            finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
+            finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
+            finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
+            finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
+            finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
+            finBillVehicleDtos.add(finBillVehicleDto);
+        }
+        submitAdvanceInvoiceDto.setFinBillVehicles(finBillVehicleDtos);
+        //开票挂车信息
+        List<com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
+        List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
+        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);
+                finBillTrailerDtos.add(finBillTrailerDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setFinBillTrailers(finBillTrailerDtos);
+        //附件信息
+        List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
+        List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
+        List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
+        List<String> idCardImages = dto.getIdCardImages();//证件
+        List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
+        List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
+        List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
+        List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
+        if (customerInvoiceApplyImages != null){
+            for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(customerInvoiceApplyImage);
+                khkpsqsApplicationAppendxs.add(finBillFileDto);
+            }
+        }
+        if (invoiceApplyConfirmImages != null){
+            for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
+                kpxxqrsApplicationAppendxs.add(finBillFileDto);
+            }
+        }
+        if (registerContractImages != null){
+            for (String registerContractImage : registerContractImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(registerContractImage);
+                cldjhtApplicationAppendxs.add(finBillFileDto);
+            }
+        }
+        if (idCardImages != null){
+            for (String idCardImage : idCardImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(idCardImage);
+                idCardImagesPC.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
+        submitAdvanceInvoiceDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
+        submitAdvanceInvoiceDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
+        submitAdvanceInvoiceDto.setZjApplicationAppendxs(idCardImagesPC);
+        ResultBean resultBean = finBillApplicationFeign.submitFinBillApplicationQK(submitAdvanceInvoiceDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -370,10 +484,9 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        AppCompleteAdvanceInvoiceDto completeAdvanceInvoiceDto = new AppCompleteAdvanceInvoiceDto();
-        BeanUtil.copyProperties(dto, completeAdvanceInvoiceDto);
-        completeAdvanceInvoiceDto.setOrgSidPath(orgSidPath);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.complete(completeAdvanceInvoiceDto);
+        FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
+        BeanUtil.copyProperties(dto, finBillCompleteDto);
+        ResultBean resultBean = finBillApplicationFeign.completeQK(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -394,10 +507,9 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        AppCompleteAdvanceInvoiceDto completeAdvanceInvoiceDto = new AppCompleteAdvanceInvoiceDto();
-        BeanUtil.copyProperties(dto, completeAdvanceInvoiceDto);
-        completeAdvanceInvoiceDto.setOrgSidPath(orgSidPath);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.InitiatorToAnswer(completeAdvanceInvoiceDto);
+        FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
+        BeanUtil.copyProperties(dto, finBillCompleteDto);
+        ResultBean resultBean = finBillApplicationFeign.companyToDivisionOperateQK(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -406,9 +518,9 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();
+        FinBillTaskQuery taskQuery = new FinBillTaskQuery();
         BeanUtil.copyProperties(query, taskQuery);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.taskReject(taskQuery);
+        ResultBean resultBean = finBillApplicationFeign.rejectQK(taskQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -417,9 +529,9 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean recallAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();
+        FinBillTaskQuery taskQuery = new FinBillTaskQuery();
         BeanUtil.copyProperties(query, taskQuery);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.revokeProcess(taskQuery);
+        ResultBean resultBean = finBillApplicationFeign.revokeProcessQK(taskQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -428,9 +540,9 @@ public class AppBusAdvanceGinvoiceapplyService {
 
     public ResultBean stopAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();
+        FinBillTaskQuery taskQuery = new FinBillTaskQuery();
         BeanUtil.copyProperties(query, taskQuery);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.breakProcess(taskQuery);
+        ResultBean resultBean = finBillApplicationFeign.breakProcessQK(taskQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -465,4 +577,109 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
+        ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
+        AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
+        AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
+        appBillApplicationDetailsQKQuery.setSid(sid);
+        ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
+        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
+        vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
+        vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
+        vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
+        vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
+        vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
+        vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
+        vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
+        vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
+        vo.setSellerName(finBillApplicationDetailsVo.getStaffName());
+        vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
+        vo.setName(finBillApplicationDetailsVo.getCustomerName());
+        vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
+        vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid());
+        vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
+        vo.setContractId(finBillApplicationDetailsVo.getContractNo());
+        vo.setDate(finBillApplicationDetailsVo.getApplyDate());
+        vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        //车辆信息
+        List<AppCarListVo> vinListVos = new ArrayList<>();
+        List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
+        if (finBillVehicles != null){
+            for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
+                AppCarListVo vinListVo = new AppCarListVo();
+                vinListVo.setVin(finBillVehicle.getVinNo());
+                vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
+                vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
+                vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
+                vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
+                vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
+                vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVos.add(vinListVo);
+            }
+        }
+        vo.setVinList(vinListVos);
+        //挂车信息
+        List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
+        List<com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
+        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<String> files = new ArrayList<>();
+                files.add(hgzImageUrl);
+                finBillTrailerVo.setFiles(files);
+                finBillTrailerVos.add(finBillTrailerVo);
+            }
+        }
+        vo.setFinBillTrailers(finBillTrailerVos);
+        //附件信息
+        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
+        List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
+        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
+        List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+        List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
+        List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
+        List<String> registerContractImages = new ArrayList<>();//车辆登记合同
+        List<String> idCardImages = new ArrayList<>();
+        if (zjApplicationAppendxs != null){
+            for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
+                idCardImages.add(zjApplicationAppendx.getFileUrl());
+            }
+        }
+        if (khkpsqsApplicationAppendxs != null){
+            for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
+                customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
+            }
+        }
+        if (kpxxqrsApplicationAppendxs != null){
+            for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
+                invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
+            }
+        }
+        if (cldjhtApplicationAppendxs != null){
+            for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
+                registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
+            }
+        }
+        vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
+        vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
+        vo.setRegisterContractImages(registerContractImages);
+        vo.setIdCardImages(idCardImages);
+        BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
+        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
+            vo.setIsCanEdit(false);
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }else {
+            vo.setIsCanEdit(true);
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -25,8 +25,8 @@ public class CommonRest implements CommonFeign {
     private CommonService commonService;
 
     @Override
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
-        return commonService.getPublicModelList(modelSid,orgPath);
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
+        return commonService.getPublicModelList(modelSid, orgPath);
     }
 
     @Override
@@ -38,4 +38,9 @@ public class CommonRest implements CommonFeign {
     public ResultBean<List<SystemVo>> getSystem(String orgPath) {
         return commonService.getSystem(orgPath);
     }
+
+    @Override
+    public ResultBean<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
+        return commonService.selectFinance(orgPath, userSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -9,10 +9,9 @@ import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelQuery;
 import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign;
-import com.yxt.anrui.terminal.api.base.common.PublicModelVo;
-import com.yxt.anrui.terminal.api.base.common.SystemVo;
-import com.yxt.anrui.terminal.api.base.common.TopConfigQuery;
-import com.yxt.anrui.terminal.api.base.common.TopConfigVo;
+import com.yxt.anrui.portal.api.sysorganization.SysFinanceVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.terminal.api.base.common.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,10 +38,12 @@ public class CommonService {
     private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
         ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
-        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid,orgPath);
+        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid, orgPath);
         List<PublicModelVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
@@ -64,4 +65,11 @@ public class CommonService {
         List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
+        ResultBean<List<FinanceVo>> rb = ResultBean.fireFail();
+        ResultBean<List<SysFinanceVo>> resultBean = sysOrganizationFeign.selectFinance(orgPath, userSid);
+        List<FinanceVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinanceVo.class)).collect(Collectors.toList());
+        return rb.success().setData(list);
+    }
 }

doc/databases/bus-center_tables.sql

@@ -773,3 +773,90 @@ CREATE TABLE `buscenter_file`
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售附件表';
 
+-- 欠款提车申请
+DROP TABLE IF EXISTS `bus_arrears_carry_vehicle_apply`;
+CREATE TABLE `bus_arrears_carry_vehicle_apply`
+(
+    `id`                      int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                     varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`             int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`              timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`              timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`                int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                   int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`                int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                 varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`             varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`             varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `billNo`                  VARCHAR(64)          DEFAULT NULL COMMENT '申请单编号',
+    `contractNo`              VARCHAR(200)         DEFAULT NULL COMMENT '合同编号',
+    `customerName`            VARCHAR(200)         DEFAULT NULL COMMENT '客户名称',
+    `customerSid`             VARCHAR(64)          DEFAULT NULL COMMENT '客户sid',
+    `modelSid`                VARCHAR(64)          DEFAULT NULL COMMENT '车型sid',
+    `configSid`               VARCHAR(64)          DEFAULT NULL COMMENT '配置sid',
+    `modelName`               VARCHAR(255)         DEFAULT NULL COMMENT '车型名称',
+    `contractMoney`           decimal(10, 2)       DEFAULT NULL COMMENT '合同总金额',
+    `contractCollectionMoney` decimal(10, 2)       DEFAULT NULL COMMENT '合同收款金额',
+    `arrearsMoney`            decimal(10, 2)       DEFAULT NULL COMMENT '欠款金额',
+    `commitmentMoneyDate`     VARCHAR(200)         DEFAULT NULL COMMENT '承诺回款日期',
+    `applyName`               VARCHAR(200)         DEFAULT NULL COMMENT '申请人名称',
+    `applyUserSid`            VARCHAR(64)          DEFAULT NULL COMMENT '申请人sid',
+    `applyDeptSid`            VARCHAR(64)          DEFAULT NULL COMMENT '发起部门sid',
+    `applyDept`               VARCHAR(64)          DEFAULT NULL COMMENT '发起部门名称',
+    `staffUserSid`            VARCHAR(64)          DEFAULT NULL COMMENT '销售专员用户sid',
+    `staffName`               VARCHAR(200)         DEFAULT NULL COMMENT '销售专员名称',
+    `staffDeptSid`            VARCHAR(64)          DEFAULT NULL COMMENT '销售专员部门sid',
+    `staffDept`               VARCHAR(200)         DEFAULT NULL COMMENT '销售部门',
+    `paymentMethod`           VARCHAR(200)         DEFAULT NULL COMMENT '销售类型',
+    `paymentMethodKey`        VARCHAR(64)          DEFAULT NULL COMMENT '销售类型',
+    `openTickName`            VARCHAR(200)         DEFAULT NULL COMMENT '开票单位',
+    `isFinance`               VARCHAR(64)          DEFAULT NULL COMMENT '是否金融部复核，1是，0否',
+    `financeUserSid`          VARCHAR(64)          DEFAULT NULL COMMENT '金融部人员用户sid',
+    `financeName`             VARCHAR(200)         DEFAULT NULL COMMENT '金融部人员名称',
+    `reason`                  VARCHAR(500)         DEFAULT NULL COMMENT '欠款提车原因',
+    `reasonKey`               VARCHAR(64)          DEFAULT NULL COMMENT '欠款原因key',
+    `reasonValue`             VARCHAR(64)          DEFAULT NULL COMMENT '欠款原因value',
+    `useOrgSid`               VARCHAR(64)          DEFAULT NULL COMMENT '分公司sid',
+    `useOrgName`              VARCHAR(200)         DEFAULT NULL COMMENT '分公司名称',
+    `type`                    VARCHAR(64)          DEFAULT NULL COMMENT 'type:1待办理，2已办理',
+    `nodeState`               VARCHAR(64)          DEFAULT NULL COMMENT '节点状态',
+    `taskDefKey`              VARCHAR(64)          DEFAULT NULL COMMENT '节点id',
+    `procDefId`               VARCHAR(64)          DEFAULT NULL COMMENT '流程id',
+    `procInstId`              VARCHAR(64)          DEFAULT NULL COMMENT '实例id',
+    `taskId`                  VARCHAR(64)          DEFAULT NULL COMMENT '任务id',
+    `orgSidPath`              VARCHAR(200)         DEFAULT NULL COMMENT '当前用户部门全路径',
+    `carContractFile`         text                 DEFAULT NULL COMMENT '新车买卖合同欠款',
+    `guaranteeLetterFile`     text                 DEFAULT NULL COMMENT '担保承诺书',
+    `gdLetterFile`            text                 DEFAULT NULL COMMENT '股东',
+    `zjlLetterFile`           text                 DEFAULT NULL COMMENT '总经理',
+    `otherFile`               text                 DEFAULT NULL COMMENT '其他附件',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='欠款提车申请';
+
+-- 欠款提车车辆信息
+DROP TABLE IF EXISTS `bus_arrears_carry_vehicle_details`;
+CREATE TABLE `bus_arrears_carry_vehicle_details`
+(
+    `id`            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `applySid`      VARCHAR(200)         DEFAULT NULL COMMENT '合同编号',
+    `vinNo`         varchar(200)         DEFAULT NULL COMMENT '车架号',
+    `vinSid`        varchar(64)          DEFAULT NULL COMMENT '车辆sid',
+    `price`         decimal(10, 2)       DEFAULT NULL COMMENT '成交价',
+    `subscribedAll` decimal(10, 2)       DEFAULT NULL COMMENT '平台总认款',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='欠款提车车辆信息';
+