盘库 ，巡检 ，映射 ，提前开票 问题接口修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java

@@ -92,6 +92,11 @@ public interface CommonAppendixFeign {
     public ResultBean<AppCommonAppendixVo> getAppAppendix(@RequestParam("linkSid") String linkSid,
                                                           @RequestParam(value = "attachType", required = false) String attachType);
 
+    @ApiOperation("手机端查询多个附件")
+    @GetMapping("/getAppAppendixList")
+    public ResultBean<List<CommonAppendixVo>> getAppAppendixList(@RequestParam("linkSid") String linkSid,
+                                                                    @RequestParam(value = "attachType", required = false) String attachType);
+
     @ApiOperation("手机端查询担保人文件附件")
     @GetMapping("/getAppGuarantorList")
     public ResultBean<List<AppCommonAppendixVo>> getAppGuarantorList(@RequestParam("linkSid") String linkSid);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java

@@ -101,6 +101,11 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
 		return rb.setMsg("接口anrui-base/commonappendix/getAppAppendix无法访问");
 	}
 
+	@Override
+	public ResultBean<List<CommonAppendixVo>> getAppAppendixList(String linkSid, String attachType) {
+		return null;
+	}
+
 	@Override
 	public ResultBean getAppGuarantorList(String linkSid) {
 		ResultBean rb = ResultBean.fireFail();

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@@ -44,6 +44,9 @@ public enum CommonAttachTypeEnum {
     INVOICE_KPXXQRS("0003_3", "开票信息确认书"),
     WITNESS("0004", "跟进记录的材料"),
     ADVANCE_GIN("0005", "提前开票附件"),
+    ADVANCE_KHKPSQS("0005_1", "客户开票申请书"),
+    ADVANCE_CLDJHT("0005_2", "车辆登记合同"),
+    ADVANCE_KPXXQRS("0005_3", "开票信息确认书"),
     CUSTOMER_FILE("0006", "客户资料附件"),
     ARREARS("0007", "欠款提车附件"),
     SCENESIGN("0008", "现场签署附件"),

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java

@@ -161,6 +161,12 @@ public class CommonAppendixRest implements CommonAppendixFeign {
 		return new ResultBean<AppCommonAppendixVo>().success().setData(vo);
 	}
 
+	@Override
+	public ResultBean<List<CommonAppendixVo>> getAppAppendixList(String linkSid, String attachType) {
+		List<CommonAppendixVo> vos = commonAppendixService.getAppAppendixList(linkSid, attachType);
+		return new ResultBean<List<CommonAppendixVo>>().success().setData(vos);
+	}
+
 	@Override
 	public ResultBean<List<AppCommonAppendixVo>> getAppGuarantorList(String linkSid) {
 		return new ResultBean<List<AppCommonAppendixVo>>().success().setData(commonAppendixService.getAppGuarantorList(linkSid));

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java

@@ -210,6 +210,12 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
         return appendixVo;
     }
 
+
+    public List<CommonAppendixVo> getAppAppendixList(String linkSid, String attachType) {
+        List<CommonAppendixVo> list = baseMapper.selectByLinkSid(linkSid, attachType);
+        return list;
+    }
+
     /**
      * 手机端查询担保人文件附件
      *

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

@@ -0,0 +1,14 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdCarListVo implements Vo {
+    private static final long serialVersionUID = -1495695891564098295L;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("成交价")
+    private String price;
+}

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

@@ -0,0 +1,51 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppAdvanceInvoiceDto implements Dto {
+    private static final long serialVersionUID = 4381514282343908312L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractNo;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private List<AdCarListVo> carList;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("车型")
+    private String carModel;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String otherReasons;
+    @ApiModelProperty("承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonValue;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+}

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

@@ -0,0 +1,52 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppAdvanceInvoiceInfoVo implements Vo {
+    private static final long serialVersionUID = 1498350342194981549L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractNo;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private List<AdCarListVo> carList;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("车型")
+    private String carModel;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String otherReasons;
+    @ApiModelProperty("承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonValue;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String advGinReasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+
+}

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

@@ -0,0 +1,46 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppAdvanceInvoicePageVo implements Vo {
+    private static final long serialVersionUID = 1414719057186977899L;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("合同状态")
+    private String contractType;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+
+    @ApiModelProperty("承诺汇款日期")
+    private String returnedMoneyDate;
+
+    @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("数量")
+    private String num;
+
+    @ApiModelProperty("原因")
+    private String otherReasons;
+
+    @ApiModelProperty("创建日期")
+    private String applyDate;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showUpdateBtn;
+
+    @ApiModelProperty("是否显示删除按钮")
+    private Boolean showDeleteBtn;
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppAdvanceInvoiceQuery implements Query {
+    private static final long serialVersionUID = 7668511398241906995L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称字段 合同编号字段")
+    private String name;
+}

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

@@ -73,4 +73,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
     private String advGinReasonValue; // 提前开票原因value
 	@ApiModelProperty("其他原因")
     private String otherReasons; // 其他原因
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 其他原因
 }

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

@@ -90,4 +90,27 @@ public interface BusAdvanceGinvoiceapplyFeign {
     @PostMapping("/submitAdvanceGinvoiceaapply")
     public ResultBean submitAdvanceGinvoiceaapply(@RequestBody @Valid BusAdvanceGinvoiceapplyDto dto);
 
+    /*************************************************APP提前开票接口***************************************************/
+
+
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getAdvanceInvoiceList")
+    @ResponseBody
+    ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AppAdvanceInvoiceQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化提前开票申请")
+    @GetMapping("/initAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+
+    @ApiOperation("移动端-保存提前开票申请")
+    @PostMapping("/saveAdvanceInvoice")
+    @ResponseBody
+    public ResultBean saveAdvanceInvoice(@Valid @RequestBody AppAdvanceInvoiceDto dto);
+
+    @ApiOperation("手机端-删除提前开票")
+    @GetMapping("/deleteAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+
 }

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

@@ -80,4 +80,24 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AppAdvanceInvoiceQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return null;
+    }
+
 }

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

@@ -0,0 +1,43 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+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 AppArrearsCarryVehiclePageVo implements Vo {
+
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+
+    @ApiModelProperty("车架号")
+    @JsonProperty("VINNo")
+    private String VINNo;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+
+    @ApiModelProperty("成交价")
+    private BigDecimal dealMoney;
+
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String applyDate;
+
+}

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

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppArrearsCarryVehicleQuery implements Query {
+    private static final long serialVersionUID = 6131516750203771743L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称 合同编号")
+    private String name;
+
+}

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

@@ -63,4 +63,7 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     
 	@ApiModelProperty("累计欠款金额")
     private BigDecimal cumulativeArrearsMoney;
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
 }

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleDto;
 import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleQuery;
 import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleVo;
@@ -71,4 +73,13 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @PostMapping("/saveArrearsAppendix")
     public ResultBean saveArrearsAppendix(@RequestBody List<ArrearsAppendixDto> dto);
     
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getArrearsTakeCarList")
+    @ResponseBody
+    ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery);
+
+    @ApiOperation("手机端-删除欠款提车")
+    @GetMapping("/deleteArrearsTakeCar/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid);
 }

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -69,4 +71,15 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 	public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
+		return null;
+	}
+
+
+	@Override
+	public ResultBean deleteArrearsTakeCar(String contractSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java

@@ -26,15 +26,14 @@
 package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyDetailsVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo;
 
 import java.util.List;
 
@@ -54,15 +53,17 @@ import java.util.List;
 @Mapper
 public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper<BusAdvanceGinvoiceapply> {
 
-	//@Update("update bus_advance_ginvoiceapply set name=#{msg} where id=#{id}")
+    //@Update("update bus_advance_ginvoiceapply set name=#{msg} where id=#{id}")
-	//IPage<BusAdvanceGinvoiceapplyVo> voPage(IPage<BusAdvanceGinvoiceapply> page, @Param(Constants.WRAPPER) QueryWrapper<BusAdvanceGinvoiceapply> qw);
+    //IPage<BusAdvanceGinvoiceapplyVo> voPage(IPage<BusAdvanceGinvoiceapply> page, @Param(Constants.WRAPPER) QueryWrapper<BusAdvanceGinvoiceapply> qw);
 
-	IPage<BusAdvanceGinvoiceapplyVo> selectPageVo(IPage<BusAdvanceGinvoiceapply> page, @Param(Constants.WRAPPER) Wrapper<BusAdvanceGinvoiceapply> qw);
+    IPage<BusAdvanceGinvoiceapplyVo> selectPageVo(IPage<BusAdvanceGinvoiceapply> page, @Param(Constants.WRAPPER) Wrapper<BusAdvanceGinvoiceapply> qw);
 
-	List<BusAdvanceGinvoiceapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusAdvanceGinvoiceapply> qw);
+    List<BusAdvanceGinvoiceapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusAdvanceGinvoiceapply> qw);
 
-	@Select("select * from bus_advance_ginvoiceapply")
+    @Select("select * from bus_advance_ginvoiceapply")
-	List<BusAdvanceGinvoiceapplyVo> selectListVo();
+    List<BusAdvanceGinvoiceapplyVo> selectListVo();
 
     BusAdvanceGinvoiceapplyDetailsVo fetchAllBySid(String sid);
+
+    IPage<AppAdvanceInvoicePageVo> getAdvanceInvoiceList(IPage<AppAdvanceInvoiceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppAdvanceInvoiceQuery> qw, @Param("name") String name);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml

@@ -1,41 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
+    <select id="selectPageVo"
-		SELECT
+            resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
-		contractNo,
+        SELECT
-		customerName,
+        contractNo,
-		num,
+        customerName,
-		arrearsMoney,
+        num,
-		returnedMoneyDate,
+        arrearsMoney,
-		advGinReasonValue,
+        returnedMoneyDate,
-		otherReasons,
+        advGinReasonValue,
-		applyDate,
+        otherReasons,
-		applyName
+        applyDate,
-		FROM
+        applyName
-		bus_advance_ginvoiceapply <where> ${ew.sqlSegment} </where>
+        FROM
-	</select>
+        bus_advance_ginvoiceapply
+        <where>${ew.sqlSegment}</where>
+    </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
+    <select id="selectListAllVo"
-		SELECT * FROM bus_advance_ginvoiceapply <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo">
-	</select>
+        SELECT * FROM bus_advance_ginvoiceapply
+        <where>${ew.sqlSegment}</where>
+    </select>
 
-	<select id="fetchAllBySid"
+    <select id="fetchAllBySid"
             resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyDetailsVo">
-		SELECT
+        SELECT contractNo,
-				contractNo,
+               customerName,
-				customerName,
+               applyDate,
-				applyDate,
+               carModel,
-				carModel,
+               arrearsMoney,
-				arrearsMoney,
+               returnedMoneyDate,
-				returnedMoneyDate,
+               advGinReasonKey,
-				advGinReasonKey,
+               advGinReasonValue,
-				advGinReasonValue,
+               otherReasons,
-				otherReasons,
+               remarks
-				remarks
+        FROM bus_advance_ginvoiceapply
-		FROM
+    </select>
-				bus_advance_ginvoiceapply
+
-	</select>
+    <select id="getAdvanceInvoiceList"
+            resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo">
+        SELECT contractNo,
+               customerName,
+               applyDate,
+               carModel,
+               arrearsMoney,
+               returnedMoneyDate,
+               advGinReasonKey,
+               advGinReasonValue,
+               otherReasons,
+               remarks
+        FROM bus_advance_ginvoiceapply
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java

@@ -25,7 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -54,48 +56,70 @@ import java.util.List;
 @RequestMapping("/busadvanceginvoiceapply")
 public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign {
 
-	@Autowired
+    @Autowired
-	private BusAdvanceGinvoiceapplyService busAdvanceGinvoiceapplyService;
+    private BusAdvanceGinvoiceapplyService busAdvanceGinvoiceapplyService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<BusAdvanceGinvoiceapplyVo>> listPage(@RequestBody PagerQuery<BusAdvanceGinvoiceapplyQuery> pq){
+    public ResultBean<PagerVo<BusAdvanceGinvoiceapplyVo>> listPage(@RequestBody PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusAdvanceGinvoiceapplyVo> pv = busAdvanceGinvoiceapplyService.listPageVo(pq);
+        PagerVo<BusAdvanceGinvoiceapplyVo> pv = busAdvanceGinvoiceapplyService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增保存")
+    @ApiOperation("新增保存")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody BusAdvanceGinvoiceapplyDto dto){
+    public ResultBean save(@RequestBody BusAdvanceGinvoiceapplyDto dto) {
-		return busAdvanceGinvoiceapplyService.saveAll(dto);
+        return busAdvanceGinvoiceapplyService.saveAll(dto);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("修改保存")
+    @ApiOperation("修改保存")
-	@PostMapping("/update/{sid}")
+    @PostMapping("/update/{sid}")
-	public ResultBean update(@RequestBody BusAdvanceGinvoiceapplyDto dto, @PathVariable("sid") String sid){
+    public ResultBean update(@RequestBody BusAdvanceGinvoiceapplyDto dto, @PathVariable("sid") String sid) {
-		return busAdvanceGinvoiceapplyService.updateAllBySid(dto,sid);
+        return busAdvanceGinvoiceapplyService.updateAllBySid(dto, sid);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		return busAdvanceGinvoiceapplyService.delAll(sids);
+        return busAdvanceGinvoiceapplyService.delAll(sids);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<BusAdvanceGinvoiceapplyDetailsVo> fetchBySid(@PathVariable("sid") String sid){
+    public ResultBean<BusAdvanceGinvoiceapplyDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
-		return busAdvanceGinvoiceapplyService.fetchAllBySid(sid);
+        return busAdvanceGinvoiceapplyService.fetchAllBySid(sid);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
+    public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
-		return busAdvanceGinvoiceapplyService.submitAdvanceGinvoiceaapply(dto);
+        return busAdvanceGinvoiceapplyService.submitAdvanceGinvoiceaapply(dto);
-	}
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AppAdvanceInvoiceQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        IPage<AppAdvanceInvoicePageVo> iPage = busAdvanceGinvoiceapplyService.getAdvanceInvoiceList(pagerQuery);
+        return rb.success().setData(iPage);
+    }
+
+    @Override
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return busAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) {
+        return busAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -28,10 +28,13 @@ package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto;
@@ -43,6 +46,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -50,6 +54,7 @@ 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.apache.http.nio.pool.NIOConnFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -74,261 +79,386 @@ import java.util.Map;
 @Service
 public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanceGinvoiceapplyMapper, BusAdvanceGinvoiceapply> {
 
-	@Autowired
+    @Autowired
-	private SysFormLinkFeign sysFormLinkFeign;
+    private SysFormLinkFeign sysFormLinkFeign;
-	@Autowired
+    @Autowired
-	private FlowableService flowableService;
+    private FlowableService flowableService;
-	@Autowired
+    @Autowired
-	private BusGinvoiceapplyVehicleService busGinvoiceapplyVehicleService;
+    private BusGinvoiceapplyVehicleService busGinvoiceapplyVehicleService;
-	@Autowired
+    @Autowired
-	private FileUploadComponent fileUploadComponent;
+    private FileUploadComponent fileUploadComponent;
-	@Autowired
+    @Autowired
-	private CommonAppendixFeign commonAppendixFeign;
+    private CommonAppendixFeign commonAppendixFeign;
-	@Autowired
+    @Autowired
-	private SysUserFeign sysUserFeign;
+    private SysUserFeign sysUserFeign;
-	@Autowired
+    @Autowired
-	private SysStaffOrgFeign sysStaffOrgFeign;
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
-	public PagerVo<BusAdvanceGinvoiceapply> listPage(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
+    public PagerVo<BusAdvanceGinvoiceapply> listPage(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
-		BusAdvanceGinvoiceapplyQuery query = pq.getParams();
+        BusAdvanceGinvoiceapplyQuery query = pq.getParams();
-		QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
+        QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
-		IPage<BusAdvanceGinvoiceapply> page = PagerUtil.queryToPage(pq);
+        IPage<BusAdvanceGinvoiceapply> page = PagerUtil.queryToPage(pq);
-		IPage<BusAdvanceGinvoiceapply> pagging = baseMapper.selectPage(page, qw);
+        IPage<BusAdvanceGinvoiceapply> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<BusAdvanceGinvoiceapply> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<BusAdvanceGinvoiceapply> p = PagerUtil.pageToVo(pagging, null);
-		return p;
+        return p;
-	}
+    }
-	public List<BusAdvanceGinvoiceapply> listAll(BusAdvanceGinvoiceapplyQuery query) {
-		QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
-	private QueryWrapper<BusAdvanceGinvoiceapply> createQueryWrapper(BusAdvanceGinvoiceapplyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BusAdvanceGinvoiceapply> qw = new QueryWrapper<>();
 
-		if (StringUtils.isNotBlank(query.getContractNo())) {
+    public List<BusAdvanceGinvoiceapply> listAll(BusAdvanceGinvoiceapplyQuery query) {
-			qw.like("contractNo", query.getContractNo());
+        QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
-		}
+        return baseMapper.selectList(qw);
-		if (StringUtils.isNotBlank(query.getCustomerName())) {
+    }
-			qw.like("customerName", query.getCustomerName());
-		}
-		if (StringUtils.isNotBlank(query.getApplyName())) {
-			qw.like("applyName", query.getApplyName());
-		}
-		String applyStartDate = query.getApplyStartDate();
-		String applyEndDate = query.getApplyEndDate();
-		qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
-				apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
-				);
-		return qw;
-	}
 
-	public PagerVo<BusAdvanceGinvoiceapplyVo> listPageVo(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
+    private QueryWrapper<BusAdvanceGinvoiceapply> createQueryWrapper(BusAdvanceGinvoiceapplyQuery query) {
-		BusAdvanceGinvoiceapplyQuery query = pq.getParams();
+        // todo: 这里根据具体业务调整查询条件
-		QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		IPage<BusAdvanceGinvoiceapply> page = PagerUtil.queryToPage(pq);
+        QueryWrapper<BusAdvanceGinvoiceapply> qw = new QueryWrapper<>();
-		IPage<BusAdvanceGinvoiceapplyVo> pagging = baseMapper.selectPageVo(page, qw);
-		List<BusAdvanceGinvoiceapplyVo> records = pagging.getRecords();
-		if (records.size() != 0){
-			for (BusAdvanceGinvoiceapplyVo record : records) {
-				String advGinReasonValue = record.getAdvGinReasonValue();
-				if (advGinReasonValue.equals("其它")){
-					record.setReasons(record.getOtherReasons());
-				}else {
-					record.setReasons(advGinReasonValue);
-				}
-			}
-		}
-		PagerVo<BusAdvanceGinvoiceapplyVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
 
-	public List<BusAdvanceGinvoiceapplyVo> listAllVo(BusAdvanceGinvoiceapplyQuery query) {
+        if (StringUtils.isNotBlank(query.getContractNo())) {
-		QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
+            qw.like("contractNo", query.getContractNo());
-		return baseMapper.selectListAllVo(qw);
+        }
-	}
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getApplyName())) {
+            qw.like("applyName", query.getApplyName());
+        }
+        String applyStartDate = query.getApplyStartDate();
+        String applyEndDate = query.getApplyEndDate();
+        qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
+                );
+        return qw;
+    }
 
-	public List<BusAdvanceGinvoiceapplyVo> listVo() {
+    public PagerVo<BusAdvanceGinvoiceapplyVo> listPageVo(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
-		return baseMapper.selectListVo();
+        BusAdvanceGinvoiceapplyQuery query = pq.getParams();
-	}
+        QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
+        IPage<BusAdvanceGinvoiceapply> page = PagerUtil.queryToPage(pq);
+        IPage<BusAdvanceGinvoiceapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<BusAdvanceGinvoiceapplyVo> records = pagging.getRecords();
+        if (records.size() != 0) {
+            for (BusAdvanceGinvoiceapplyVo record : records) {
+                String advGinReasonValue = record.getAdvGinReasonValue();
+                if (advGinReasonValue.equals("其它")) {
+                    record.setReasons(record.getOtherReasons());
+                } else {
+                    record.setReasons(advGinReasonValue);
+                }
+            }
+        }
+        PagerVo<BusAdvanceGinvoiceapplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 
-	public void saveOrUpdateDto(BusAdvanceGinvoiceapplyDto dto){
+    public List<BusAdvanceGinvoiceapplyVo> listAllVo(BusAdvanceGinvoiceapplyQuery query) {
-		BusAdvanceGinvoiceapply entity = new BusAdvanceGinvoiceapply();
+        QueryWrapper<BusAdvanceGinvoiceapply> qw = createQueryWrapper(query);
-		dto.fillEntity(entity);
+        return baseMapper.selectListAllVo(qw);
-		this.saveOrUpdate(entity);
+    }
-	}
 
-	public BusAdvanceGinvoiceapplyVo fetchByIdVo(String id){
+    public List<BusAdvanceGinvoiceapplyVo> listVo() {
-		BusAdvanceGinvoiceapply entity = this.fetchById(id);
+        return baseMapper.selectListVo();
-		BusAdvanceGinvoiceapplyVo vo = new BusAdvanceGinvoiceapplyVo();
+    }
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
 
-	public ResultBean saveAll(BusAdvanceGinvoiceapplyDto dto) {
+    public void saveOrUpdateDto(BusAdvanceGinvoiceapplyDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        BusAdvanceGinvoiceapply entity = new BusAdvanceGinvoiceapply();
-		List<BusGinvoiceapplyVehicleDto> busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos();
+        dto.fillEntity(entity);
-		BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply();
+        this.saveOrUpdate(entity);
-		dto.fillEntity(busAdvanceGinvoiceapply);
+    }
-		busAdvanceGinvoiceapply.setNum(busGinvoiceapplyVehicleDtos.size());
-		boolean save = this.save(busAdvanceGinvoiceapply);
-		if (!save){
-			return rb.setMsg("保存失败");
-		}
-		if (busGinvoiceapplyVehicleDtos.size() > 0){
-			for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) {
-				BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
-				busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle);
-				busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid());
-				busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
-			}
-		}
-		List<CommonAppendixDto> commonAppendixVos = dto.getCommonAppendixDtos();
-		if (commonAppendixVos.size() > 0){
-			for (CommonAppendixDto commonAppendixDto : commonAppendixVos) {
-				String filePath = commonAppendixDto.getFilePath();
-				if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				commonAppendixDto.setLinkSid(busAdvanceGinvoiceapply.getSid());
-				commonAppendixDto.setFilePath(filePath);
-				commonAppendixDto.setCreateBySid(dto.getStaffSid());
-				commonAppendixDto.setName(dto.getName());
-				commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType());
-				com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
-				BeanUtil.copyProperties(commonAppendixDto,commonAppendixDto1);
-				commonAppendixFeign.save(commonAppendixDto1);
-			}
-		}
-		return rb.success().setMsg("保存成功");
-	}
 
-	public ResultBean delAll(String[] sids) {
+    public BusAdvanceGinvoiceapplyVo fetchByIdVo(String id) {
-		ResultBean rb = ResultBean.fireFail();
+        BusAdvanceGinvoiceapply entity = this.fetchById(id);
-		this.delBySids(sids);
+        BusAdvanceGinvoiceapplyVo vo = new BusAdvanceGinvoiceapplyVo();
-		for (String sid : sids) {
+        BeanUtil.copyProperties(entity, vo);
-			busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
+        return vo;
-		}
+    }
-		return rb.success().setMsg("删除成功");
-	}
 
-	public ResultBean<BusAdvanceGinvoiceapplyDetailsVo> fetchAllBySid(String sid) {
+    public ResultBean saveAll(BusAdvanceGinvoiceapplyDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		BusAdvanceGinvoiceapplyDetailsVo busAdvanceGinvoiceapplyDetailsVo = baseMapper.fetchAllBySid(sid);
+        List<BusGinvoiceapplyVehicleDto> busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos();
-		List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(sid);
+        BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply();
-		busAdvanceGinvoiceapplyDetailsVo.setBusGinvoiceapplyVehicleDetailsVos(busGinvoiceapplyVehicleDetailsVos);
+        dto.fillEntity(busAdvanceGinvoiceapply);
-		ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.selByLinkSid(sid);
+        busAdvanceGinvoiceapply.setNum(busGinvoiceapplyVehicleDtos.size());
-		List<CommonAppendixVo> commonAppendixVos = listResultBean.getData();
+        boolean save = this.save(busAdvanceGinvoiceapply);
-		ArrayList<com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo> commonAppendixVos1 = new ArrayList<>();
+        if (!save) {
-		com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo commonAppendixVo1 = new com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo();
+            return rb.setMsg("保存失败");
-		if (commonAppendixVos.size() > 0){
+        }
-			for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+        if (busGinvoiceapplyVehicleDtos.size() > 0) {
-				BeanUtil.copyProperties(commonAppendixVo,commonAppendixVo1);
+            for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) {
-				commonAppendixVos1.add(commonAppendixVo1);
+                BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
-			}
+                busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle);
-		}
+                busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid());
-		busAdvanceGinvoiceapplyDetailsVo.setCommonAppendixVos(commonAppendixVos1);
+                busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
-		return rb.success().setData(busAdvanceGinvoiceapplyDetailsVo);
+            }
-	}
+        }
+        List<CommonAppendixDto> commonAppendixVos = dto.getCommonAppendixDtos();
+        if (commonAppendixVos.size() > 0) {
+            for (CommonAppendixDto commonAppendixDto : commonAppendixVos) {
+                String filePath = commonAppendixDto.getFilePath();
+                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                commonAppendixDto.setLinkSid(busAdvanceGinvoiceapply.getSid());
+                commonAppendixDto.setFilePath(filePath);
+                commonAppendixDto.setCreateBySid(dto.getStaffSid());
+                commonAppendixDto.setName(dto.getName());
+                commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType());
+                com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+                BeanUtil.copyProperties(commonAppendixDto, commonAppendixDto1);
+                commonAppendixFeign.save(commonAppendixDto1);
+            }
+        }
+        return rb.success().setMsg("保存成功");
+    }
 
-	public ResultBean updateAllBySid(BusAdvanceGinvoiceapplyDto dto, String sid) {
+    public ResultBean delAll(String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		this.updateBySid(dto.toMap(),sid);
+        this.delBySids(sids);
-		busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
+        for (String sid : sids) {
-		List<BusGinvoiceapplyVehicleDto> busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos();
+            busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
-		if (busGinvoiceapplyVehicleDtos.size() > 0){
+        }
-			for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) {
+        return rb.success().setMsg("删除成功");
-				BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
+    }
-				busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle);
-				busGinvoiceapplyVehicle.setAdvGinSid(sid);
-				busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
-			}
-		}
-		commonAppendixFeign.deleteFiles(sid);
-		List<CommonAppendixDto> commonAppendixVos = dto.getCommonAppendixDtos();
-		if (commonAppendixVos.size() > 0){
-			for (CommonAppendixDto commonAppendixDto : commonAppendixVos) {
-				String filePath = commonAppendixDto.getFilePath();
-				if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				commonAppendixDto.setLinkSid(sid);
-				commonAppendixDto.setFilePath(filePath);
-				commonAppendixDto.setCreateBySid(dto.getStaffSid());
-				commonAppendixDto.setName(dto.getName());
-				commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType());
-				com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
-				BeanUtil.copyProperties(commonAppendixDto,commonAppendixDto1);
-				commonAppendixFeign.save(commonAppendixDto1);
-			}
-		}
-		return rb.success().setMsg("修改成功");
-	}
 
-	public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
+    public ResultBean<BusAdvanceGinvoiceapplyDetailsVo> fetchAllBySid(String sid) {
-		String orgSid = checkUserOrg(dto.getUserSid());
+        ResultBean rb = ResultBean.fireFail();
-		String businessSid = "";
+        BusAdvanceGinvoiceapplyDetailsVo busAdvanceGinvoiceapplyDetailsVo = baseMapper.fetchAllBySid(sid);
-		if (StringUtils.isBlank(orgSid)) {
+        List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(sid);
-			return new ResultBean().fail().setMsg("用户组织机构不能为空");
+        busAdvanceGinvoiceapplyDetailsVo.setBusGinvoiceapplyVehicleDetailsVos(busGinvoiceapplyVehicleDetailsVos);
-		}
+        ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.selByLinkSid(sid);
-		// 验证
+        List<CommonAppendixVo> commonAppendixVos = listResultBean.getData();
-		if (StringUtils.isBlank(dto.getSid())) {
+        ArrayList<com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo> commonAppendixVos1 = new ArrayList<>();
-			// 调用保存接口
+        com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo commonAppendixVo1 = new com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo();
-			ResultBean resultBean = saveAll(dto);
+        if (commonAppendixVos.size() > 0) {
-			if (!resultBean.getSuccess()) {
+            for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-				return resultBean.setMsg("提交失败");
+                BeanUtil.copyProperties(commonAppendixVo, commonAppendixVo1);
-			}
+                commonAppendixVos1.add(commonAppendixVo1);
-			businessSid = resultBean.getData().toString();
+            }
-		} else {
+        }
-			// 调用更新接口
+        busAdvanceGinvoiceapplyDetailsVo.setCommonAppendixVos(commonAppendixVos1);
-			ResultBean resultBean = updateAllBySid(dto, dto.getSid());
+        return rb.success().setData(busAdvanceGinvoiceapplyDetailsVo);
-			if (!resultBean.getSuccess()) {
+    }
-				return resultBean.setMsg("提交失败");
-			}
-			businessSid = dto.getSid();
-		}
-		// ???待完善(根据虚拟订单审批流程)
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("businessSid", businessSid);
-		variables.put("isLoan", true);
-		variables.put("orgSid", orgSid);//部门sid
-		ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables);
-		if (resultBean.getSuccess() && resultBean.getData() != null) {
-			Map<String, String> map = (Map<String, String>) resultBean.getData();
-			saveSysFormLink(map);
-		}
-		return resultBean;
-	}
 
-	/**
+    public ResultBean updateAllBySid(BusAdvanceGinvoiceapplyDto dto, String sid) {
-	 * 检查用户是否设置部门
+        ResultBean rb = ResultBean.fireFail();
-	 *
+        this.updateBySid(dto.toMap(), sid);
-	 * @param userSid
+        busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
-	 * @return 返回部门sid
+        List<BusGinvoiceapplyVehicleDto> busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos();
-	 */
+        if (busGinvoiceapplyVehicleDtos.size() > 0) {
-	private String checkUserOrg(String userSid) {
+            for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) {
-		String orgSid = "";
+                BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
-		String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid();
+                busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle);
-		ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
+                busGinvoiceapplyVehicle.setAdvGinSid(sid);
-		if (resultBean.getSuccess()) {
+                busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
-			orgSid = resultBean.getData();
+            }
-		}
+        }
-		return orgSid;
+        commonAppendixFeign.deleteFiles(sid);
-	}
+        List<CommonAppendixDto> commonAppendixVos = dto.getCommonAppendixDtos();
+        if (commonAppendixVos.size() > 0) {
+            for (CommonAppendixDto commonAppendixDto : commonAppendixVos) {
+                String filePath = commonAppendixDto.getFilePath();
+                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                commonAppendixDto.setLinkSid(sid);
+                commonAppendixDto.setFilePath(filePath);
+                commonAppendixDto.setCreateBySid(dto.getStaffSid());
+                commonAppendixDto.setName(dto.getName());
+                commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType());
+                com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+                BeanUtil.copyProperties(commonAppendixDto, commonAppendixDto1);
+                commonAppendixFeign.save(commonAppendixDto1);
+            }
+        }
+        return rb.success().setMsg("修改成功");
+    }
 
-	/**
+    public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
-	 * 保存流程业务关联表 数据
+        String orgSid = checkUserOrg(dto.getUserSid());
-	 * @param map
+        String businessSid = "";
-	 */
+        if (StringUtils.isBlank(orgSid)) {
-	private void saveSysFormLink(Map<String, String> map) {
+            return new ResultBean().fail().setMsg("用户组织机构不能为空");
-		SysFormLinkDto sysFormLinkDto = new SysFormLinkDto();
+        }
-		sysFormLinkDto.setBusinessSid(map.get("sid"));
+        // 验证
-		sysFormLinkDto.setProcInsId(map.get("procInsId"));
+        if (StringUtils.isBlank(dto.getSid())) {
-		sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
+            // 调用保存接口
-		sysFormLinkDto.setNodeState(map.get("nodeState"));
+            ResultBean resultBean = saveAll(dto);
-		sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ADVANCE_GINVOICEAPPLY.getCode());
+            if (!resultBean.getSuccess()) {
+                return resultBean.setMsg("提交失败");
+            }
+            businessSid = resultBean.getData().toString();
+        } else {
+            // 调用更新接口
+            ResultBean resultBean = updateAllBySid(dto, dto.getSid());
+            if (!resultBean.getSuccess()) {
+                return resultBean.setMsg("提交失败");
+            }
+            businessSid = dto.getSid();
+        }
+        // ???待完善(根据虚拟订单审批流程)
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("businessSid", businessSid);
+        variables.put("isLoan", true);
+        variables.put("orgSid", orgSid);//部门sid
+        ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables);
+        if (resultBean.getSuccess() && resultBean.getData() != null) {
+            Map<String, String> map = (Map<String, String>) resultBean.getData();
+            saveSysFormLink(map);
+        }
+        return resultBean;
+    }
+
+    /**
+     * 检查用户是否设置部门
+     *
+     * @param userSid
+     * @return 返回部门sid
+     */
+    private String checkUserOrg(String userSid) {
+        String orgSid = "";
+        String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid();
+        ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
+        if (resultBean.getSuccess()) {
+            orgSid = resultBean.getData();
+        }
+        return orgSid;
+    }
+
+    /**
+     * 保存流程业务关联表 数据
+     *
+     * @param map
+     */
+    private void saveSysFormLink(Map<String, String> map) {
+        SysFormLinkDto sysFormLinkDto = new SysFormLinkDto();
+        sysFormLinkDto.setBusinessSid(map.get("sid"));
+        sysFormLinkDto.setProcInsId(map.get("procInsId"));
+        sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
+        sysFormLinkDto.setNodeState(map.get("nodeState"));
+        sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ADVANCE_GINVOICEAPPLY.getCode());
 //		sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
-		sysFormLinkFeign.save(sysFormLinkDto);
+        sysFormLinkFeign.save(sysFormLinkDto);
-	}
+    }
+
+    public IPage<AppAdvanceInvoicePageVo> getAdvanceInvoiceList(PagerQuery<AppAdvanceInvoiceQuery> pagerQuery) {
+        AppAdvanceInvoiceQuery params = pagerQuery.getParams();
+        QueryWrapper<AppAdvanceInvoiceQuery> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(params.getUserSid())) {
+            qw.eq("createBySid", params.getUserSid());
+        }
+        IPage<AppAdvanceInvoiceQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AppAdvanceInvoicePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
+        return iPage;
+    }
+
+    public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppAdvanceInvoiceInfoVo vo = new AppAdvanceInvoiceInfoVo();
+        BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid);
+        BeanUtil.copyProperties(busAdvanceGinvoiceapply, vo, "sid");
+        List<AdCarListVo> carList = new ArrayList<>();
+        List<BusGinvoiceapplyVehicleDetailsVo> vinList = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid);
+        for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : vinList) {
+            AdCarListVo adCarListVo = new AdCarListVo();
+            adCarListVo.setPrice(vehicleDetailsVo.getDealMoney());
+            adCarListVo.setVin(vehicleDetailsVo.getVinNo());
+            carList.add(adCarListVo);
+        }
+        vo.setCarList(carList);
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        List<String> confirmFile = new ArrayList<>();
+        List<CommonAppendixVo> confirmFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_KPXXQRS.getAttachType()).getData();
+        for (CommonAppendixVo file : confirmFiles) {
+            confirmFile.add(urlPrefix + file.getFilePath());
+        }
+        vo.setConfirmFile(confirmFile);
+        List<String> applyFile = new ArrayList<>();
+        List<CommonAppendixVo> applyFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_KHKPSQS.getAttachType()).getData();
+        for (CommonAppendixVo file : applyFiles) {
+            applyFile.add(urlPrefix + file.getFilePath());
+        }
+        vo.setApplyFile(applyFile);
+        List<String> registerFile = new ArrayList<>();
+        List<CommonAppendixVo> registerFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_CLDJHT.getAttachType()).getData();
+        for (CommonAppendixVo file : registerFiles) {
+            registerFile.add(urlPrefix + file.getFilePath());
+        }
+        vo.setRegisterFile(registerFile);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        if (StringUtils.isBlank(dto.getContractSid())) {
+            BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply();
+            BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
+            save(busAdvanceGinvoiceapply);
+            List<AdCarListVo> carList = dto.getCarList();
+            for (AdCarListVo adCarListVo : carList) {
+                BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
+                busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid());
+                busGinvoiceapplyVehicle.setVinNo(adCarListVo.getVin());
+                busGinvoiceapplyVehicle.setDealMoney(adCarListVo.getPrice());
+                busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
+            }
+            saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid());
+        } else {
+            BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
+            BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
+            updateById(busAdvanceGinvoiceapply);
+            busGinvoiceapplyVehicleService.delByAdvGinSid(dto.getContractSid());
+            List<AdCarListVo> carList = dto.getCarList();
+            for (AdCarListVo adCarListVo : carList) {
+                BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
+                busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid());
+                busGinvoiceapplyVehicle.setVinNo(adCarListVo.getVin());
+                busGinvoiceapplyVehicle.setDealMoney(adCarListVo.getPrice());
+                busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
+            }
+            commonAppendixFeign.deleteFiles(dto.getContractSid());
+            saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid());
+        }
+        return rb.success();
+    }
+
+    public void saveFile(List<String> confirmFile, List<String> applyFile, List<String> registerFile, String sid, String staffSid) {
+        for (String s : confirmFile) {
+            com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+            String filePath = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            commonAppendixDto.setLinkSid(sid);
+            commonAppendixDto.setFilePath(filePath);
+            commonAppendixDto.setCreateBySid(staffSid);
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_KPXXQRS.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        }
+        for (String s : applyFile) {
+            com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+            String filePath = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            commonAppendixDto.setLinkSid(sid);
+            commonAppendixDto.setFilePath(filePath);
+            commonAppendixDto.setCreateBySid(staffSid);
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_KHKPSQS.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        }
+        for (String s : registerFile) {
+            com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto();
+            String filePath = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            commonAppendixDto.setLinkSid(sid);
+            commonAppendixDto.setFilePath(filePath);
+            commonAppendixDto.setCreateBySid(staffSid);
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_CLDJHT.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        }
+    }
 
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid);
+        if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getNodeState())) {
+            return rb.setMsg("该申请已提交，删除失败");
+        }
+        deleteBySid(contractSid);
+        busGinvoiceapplyVehicleService.delByAdvGinSid(contractSid);
+        return rb.success();
+    }
 }

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

@@ -56,4 +56,7 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
      * @return
      */
     IPage<ArrearsCarryVehicleVo> getArrearsVehicleList(IPage<ArrearsCarryVehicleVo> page, @Param(Constants.WRAPPER) Wrapper<ArrearsCarryVehicleQuery> qw);
+
+    IPage<AppArrearsCarryVehiclePageVo> getAdvanceInvoiceList(IPage<AppArrearsCarryVehicleQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppArrearsCarryVehicleQuery> qw, @Param("name") String name);
+
 }

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

@@ -54,4 +54,8 @@
         </where>
         ORDER BY bo.contractNo desc
     </select>
+    <select id="getAdvanceInvoiceList"
+            resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo">
+
+    </select>
 </mapper>

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

@@ -2,6 +2,8 @@ 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.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
 import com.yxt.common.base.utils.PagerUtil;
@@ -150,5 +152,17 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.saveArrearsAppendix(list);
     }
 
+    @Override
+    public ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        IPage<AppArrearsCarryVehiclePageVo> iPage = busArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery);
+        return rb.success().setData(iPage);
+    }
+
+    @Override
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid);
+    }
+
 
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
@@ -372,4 +374,26 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         return rb.success();
     }
+
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(contractSid);
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getNodeState())) {
+            return rb.setMsg("该申请已提交，删除失败");
+        }
+        deleteBySid(contractSid);
+        busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(contractSid);
+        return rb.success();
+    }
+
+    public IPage<AppArrearsCarryVehiclePageVo> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
+        AppArrearsCarryVehicleQuery params = pagerQuery.getParams();
+        QueryWrapper<AppArrearsCarryVehicleQuery> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(params.getUserSid())) {
+            qw.eq("createBySid", params.getUserSid());
+        }
+        IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
+        return iPage;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -35,6 +35,8 @@
             resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
         SELECT *
         FROM bus_delivered bd
+        WHERE
+        bd.`state` = 1
         group by bd.contractNo
         <where>
             ${ew.sqlSegment}
@@ -45,6 +47,7 @@
         SELECT vinNo as vin
         FROM bus_delivered
         WHERE contractNo = #{contractNo}
+          AND `state` = 1
     </select>
 
     <select id="getDeliveredPice"

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java

@@ -80,17 +80,19 @@ public interface SysMappingFeign {
     @ApiOperation("新增映射")
     @PostMapping("/saveMappingList")
     @ResponseBody
-    public ResultBean saveMappingList(@RequestBody List<SysMappingDto> dto);
+    public ResultBean saveMappingList(@RequestBody SaveListDto dto);
 
     @ApiOperation("根据条件查询详情")
     @PostMapping("/selectMappingInfo")
     @ResponseBody
     public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
+
     @PostMapping("/selectMappingListInfo")
     @ResponseBody
-    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid);
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(@RequestBody SysMappingListInfoQuery query);
+
     @ApiOperation("根据条件查询详情批量")
     @PostMapping("/selectMappingInfoBatch")
     @ResponseBody
-    public ResultBean<Map<String,Object>> selectMappingInfoBatch(@RequestBody List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) ;
+    public ResultBean<Map<String, Object>> selectMappingInfoBatch(@RequestBody List<Map<String, List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java

@@ -72,7 +72,7 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	}
 
 	@Override
-	public ResultBean saveMappingList(List<SysMappingDto> dto) {
+	public ResultBean saveMappingList(SaveListDto dto) {
 		return null;
 	}
 
@@ -82,7 +82,7 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	}
 
 	@Override
-	public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+	public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(SysMappingListInfoQuery query) {
 		return null;
 	}
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java

@@ -99,7 +99,7 @@ public class SysMappingRest implements SysMappingFeign {
     }
 
     @Override
-    public ResultBean saveMappingList(List<SysMappingDto> dto) {
+    public ResultBean saveMappingList(SaveListDto dto) {
         ResultBean rb = ResultBean.fireFail();
         sysMappingService.saveMappingList(dto);
         return rb.success();
@@ -113,16 +113,16 @@ public class SysMappingRest implements SysMappingFeign {
     }
 
     @Override
-    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(SysMappingListInfoQuery query) {
         ResultBean<List<SysMappingInfoVo>> rb = ResultBean.fireFail();
-        List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(dictSid);
+        List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(query.getDictSid());
         return rb.success().setData(vo);
     }
 
     @Override
-    public ResultBean<Map<String,Object>> selectMappingInfoBatch( @RequestBody List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
+    public ResultBean<Map<String, Object>> selectMappingInfoBatch(@RequestBody List<Map<String, List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
-        ResultBean<Map<String,Object>> rb = ResultBean.fireFail();
+        ResultBean<Map<String, Object>> rb = ResultBean.fireFail();
-        Map<String,Object> vos = sysMappingService.selectMappingInfoBatch(sysMappingInfoQuerys);
+        Map<String, Object> vos = sysMappingService.selectMappingInfoBatch(sysMappingInfoQuerys);
         return rb.success().setData(vos);
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@@ -138,13 +138,15 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
         return vo;
     }
 
-    public void saveMappingList(List<SysMappingDto> dto) {
+    public void saveMappingList(SaveListDto dto) {
-        if (dto.size() > 0) {
+        if (StringUtils.isNotBlank(dto.getDictSid())) {
-            baseMapper.deleteByDictSid(dto.get(0).getDictSid());
+            baseMapper.deleteByDictSid(dto.getDictSid());
-            for (SysMappingDto sysMappingDto : dto) {
+            List<SysMappingListDto> listDtos = dto.getListDtos();
+            for (SysMappingListDto sysMappingDto : listDtos) {
                 SysMapping entity = new SysMapping();
-                BeanUtil.copyProperties(sysMappingDto, entity);
+                BeanUtil.copyProperties(sysMappingDto, entity, "sid");
-                entity.setCreateBySid(sysMappingDto.getUserSid());
+                entity.setDictSid(dto.getDictSid());
+                entity.setCreateBySid(dto.getDictSid());
                 save(entity);
             }
         }
@@ -175,23 +177,23 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
         return baseMapper.selectMappingListInfo(dictSid);
     }
 
-    public  Map<String,Object> selectMappingInfoBatch(List<Map<String,List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
+    public Map<String, Object> selectMappingInfoBatch(List<Map<String, List<SysMappingInfoQueryBatch>>> sysMappingInfoQuerys) {
-        Map<String,Object> mapDict=new HashMap<>();
+        Map<String, Object> mapDict = new HashMap<>();
-        for(Map<String,List<SysMappingInfoQueryBatch>> s:sysMappingInfoQuerys){
+        for (Map<String, List<SysMappingInfoQueryBatch>> s : sysMappingInfoQuerys) {
-            String FNumber="";
+            String FNumber = "";
-            List<Map<String, Object>> l=new ArrayList<>();
+            List<Map<String, Object>> l = new ArrayList<>();
-            for(Map.Entry<String, List<SysMappingInfoQueryBatch>> entry : s.entrySet()){
+            for (Map.Entry<String, List<SysMappingInfoQueryBatch>> entry : s.entrySet()) {
                 FNumber = entry.getKey();
                 List<SysMappingInfoQueryBatch> mapValue = entry.getValue();
-                System.out.println(FNumber+":"+mapValue);
+                System.out.println(FNumber + ":" + mapValue);
-               for(SysMappingInfoQueryBatch ss:mapValue){
+                for (SysMappingInfoQueryBatch ss : mapValue) {
-                   SysMappingInfoQuery query=new SysMappingInfoQuery();
+                    SysMappingInfoQuery query = new SysMappingInfoQuery();
-                   BeanUtil.copyProperties(ss,query);
+                    BeanUtil.copyProperties(ss, query);
-                   Map<String, Object> stringObjectMap = BeanUtil.beanToMap(selectMappingInfo(query));
+                    Map<String, Object> stringObjectMap = BeanUtil.beanToMap(selectMappingInfo(query));
-                   l.add(stringObjectMap);
+                    l.add(stringObjectMap);
-               }
+                }
             }
-            mapDict.put(FNumber,l);
+            mapDict.put(FNumber, l);
         }
         return mapDict;
     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java

@@ -51,6 +51,8 @@ public class ScmVehiclePatrolinspection extends BaseEntity {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
     @ApiModelProperty("月度管理sid")
     private String mainSid; // 车架号
     @ApiModelProperty("存放地点sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@@ -56,6 +56,8 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String sid;
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
     @ApiModelProperty("巡检记录sid")
     private String mainSid; // 车架号
     @ApiModelProperty("车型sid")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -658,7 +658,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean rb = ResultBean.fireFail();
         List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos1 = dto.getScmVehicleGressionVehs();
         if (scmVehicleGressionVehDtos1.size() == 0) {
-            return rb.setMsg("请选择车架号！");
+            return rb.setMsg("车辆列表不能为空！");
         }
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -31,6 +31,7 @@ import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -201,7 +202,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             AppScmVehiclePatrolinspectionsheetInfoVo patrolinspectionsheetInfoVo = new AppScmVehiclePatrolinspectionsheetInfoVo();
             ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.fetchBySid(recordSid);
             patrolinspectionsheetInfoVo.setVin(scmVehiclePatrolinspection.getVinNo());
-            BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(scmVehiclePatrolinspection.getVinNo()).getData();
+            BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehiclePatrolinspection.getVehicleSid()).getData();
             patrolinspectionsheetInfoVo.setModel(data.getModelName());
             patrolinspectionsheetInfoVo.setModelSid(data.getModelSid());
             ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehiclePatrolinspection.getLocationSid());
@@ -273,6 +274,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
         Boolean newAdd = dto.getNewAdd();
         if (newAdd) {
+            if (StringUtils.isBlank(dto.getVinNo())) {
+                return rb.setMsg("请选择车架号");
+            }
             List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
             ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null;
             if (monthVoList.size() > 0) {
@@ -294,12 +298,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             }
             ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
             scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+            scmVehiclePatrolinspection.setVehicleSid(dto.getVehicleSid());
             scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
             scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
             scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
             scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
             scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
             scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspection.setState(0);
             scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
@@ -310,9 +316,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
             scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
             scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
-            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
+            scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
-            scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
+            scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
-            scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
             save(scmVehiclePatrolinspectionsheet);
             scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
@@ -620,9 +625,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             patrolinspectionsheet.setUseOrgSid(useOrgSid);
             patrolinspectionsheet.setCreateOrgSid(useOrgSid);
             patrolinspectionsheet.setCreateBySid(dto.getUserSid());
-            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
+//            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
-            patrolinspectionsheet.setModel(vehicleVo.getModelName());
+            patrolinspectionsheet.setModel(dto.getModel());
-            patrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
+            patrolinspectionsheet.setModelSid(dto.getModelSid());
             patrolinspectionsheet.setDutyName(dto.getLiableName());
             patrolinspectionsheet.setDutySid(dto.getLiableSid());
             scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -228,6 +228,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
             for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
                 ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
                 scmVehiclePatrolinspection.setVinNo(appScmInventoryRecordsVo.getVin());
+                scmVehiclePatrolinspection.setVehicleSid(appScmInventoryRecordsVo.getSid());
                 scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
                 scmVehiclePatrolinspection.setLocation(appScmInventoryRecordsVo.getWarehouse());
                 scmVehiclePatrolinspection.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
@@ -244,6 +245,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspection.setVinNo(inspection.getVin());
                     scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
                     BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), useOrgSid).getData();
+                    scmVehiclePatrolinspection.setVehicleSid(vehicle.getSid());
                     scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
                     scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
                     scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");

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

@@ -0,0 +1,51 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdvanceInvoiceDto implements Dto {
+    private static final long serialVersionUID = 3374676388152082886L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractId;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private String carList;
+    @ApiModelProperty("欠款金额")
+    private String cumulativeArrearsPrice;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String reasonWrite;
+    @ApiModelProperty("承诺回款日期")
+    private String collectionDate;
+    @ApiModelProperty("车辆登记合同")
+    private String registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonType;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+}

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

@@ -0,0 +1,52 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdvanceInvoiceInfoVo implements Vo {
+    private static final long serialVersionUID = 6256861573673134007L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同id")
+    private String contractId;
+    @ApiModelProperty("客户")
+    private String customerName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("车辆列表")
+    private List<AppCarListVo> carList;
+    @ApiModelProperty("欠款金额")
+    private String cumulativeArrearsPrice;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("开票信息确认书")
+    private List<String> confirmFile;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> applyFile;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("手写原因")
+    private String reasonWrite;
+    @ApiModelProperty("承诺回款日期")
+    private String collectionDate;
+    @ApiModelProperty("车辆登记合同")
+    private String registerFile;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonType;
+    @ApiModelProperty("提前开票原因 0手写 1选择")
+    private String reasonKey;
+    @ApiModelProperty("选择原因")
+    private String reasonChoose;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+
+}

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

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdvanceInvoicePageVo implements Vo {
+    private static final long serialVersionUID = -8631337422991366458L;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同状态")
+    private String contractType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("承诺汇款日期")
+    private String paymentDate;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @ApiModelProperty("数量")
+    private String number;
+    @ApiModelProperty("原因")
+    private String reason;
+    @ApiModelProperty("创建日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showUpdateBtn;
+    @ApiModelProperty("是否显示删除按钮")
+    private Boolean showDeleteBtn;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdvanceInvoiceQuery implements Query {
+    private static final long serialVersionUID = -7435351433058437187L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称字段 合同编号字段")
+    private String name;
+}

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

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageQuery;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
+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.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyFeign <br/>
+ * Description: 提前开票申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "提前开票申请")
+@FeignClient(
+        contextId = "anrui-terminal-BusAdvanceGinvoiceapply",
+        name = "anrui-terminal",
+        path = "autoservice/v1/advanceInvoice",
+        fallback = BusAdvanceGinvoiceapplyFeignFallback.class)
+public interface AppBusAdvanceGinvoiceapplyFeign {
+
+
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getAdvanceInvoiceList")
+    @ResponseBody
+    ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AdvanceInvoiceQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化提前开票申请")
+    @GetMapping("/initAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+
+    @ApiOperation("移动端-保存提前开票申请")
+    @PostMapping("/saveAdvanceInvoice")
+    @ResponseBody
+    public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto);
+
+    @ApiOperation("手机端-删除提前开票")
+    @GetMapping("/deleteAdvanceInvoice/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
+}

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

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyFeignFallback <br/>
+ * Description: 提前开票申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGinvoiceapplyFeign {
+
+
+    @Override
+    public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return null;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCarListVo implements Vo {
+    private static final long serialVersionUID = -7003788760351399800L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java

@@ -59,6 +59,9 @@ public class PatrolinspectionDto implements Dto {
     @JsonProperty("vin")
     private String vinNo;
 
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+
     @ApiModelProperty("车型")
     private String model;
 

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

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.autoservice.advanceInvoice;
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.*;
+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.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyRest <br/>
+ * Description: 提前开票申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "提前开票申请")
+@RestController()
+@RequestMapping("autoservice/v1/advanceInvoice")
+public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceapplyFeign {
+
+    @Autowired
+    private AppBusAdvanceGinvoiceapplyService appBusAdvanceGinvoiceapplyService;
+
+    @Override
+    public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
+        return appBusAdvanceGinvoiceapplyService.getAdvanceInvoiceList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
+    }
+
+    @Override
+    public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);
+    }
+
+    @Override
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
+    }
+}

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

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.autoservice.advanceInvoice;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
+import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoDto;
+import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoVo;
+import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationPageQuery;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationPageVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * Project: anrui_buscenter(销售业务) <br/>
+ * File: BusAdvanceGinvoiceapplyService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyService <br/>
+ * Description: 提前开票申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 16:02:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppBusAdvanceGinvoiceapplyService {
+
+    @Autowired
+    BusAdvanceGinvoiceapplyFeign busAdvanceGinvoiceapplyFeign;
+
+    public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
+        ResultBean<PagerVo<AdvanceInvoicePageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppAdvanceInvoiceQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppAdvanceInvoicePageVo>> advanceInvoiceList = busAdvanceGinvoiceapplyFeign.getAdvanceInvoiceList(pq);
+        PagerVo<AdvanceInvoicePageVo> vo = CoverUtils.selectPagerVo(advanceInvoiceList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
+        ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
+        AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
+        ResultBean<AppAdvanceInvoiceInfoVo> resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(contractSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppAdvanceInvoiceInfoVo appAdvanceInvoiceInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appAdvanceInvoiceInfoVo, vo);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
+        AppAdvanceInvoiceDto appAdvanceInvoiceDto = new AppAdvanceInvoiceDto();
+        BeanUtil.copyProperties(dto, appAdvanceInvoiceDto);
+        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.saveAdvanceInvoice(appAdvanceInvoiceDto);
+        return resultBean;
+    }
+
+    public ResultBean deleteAdvanceInvoice(String contractSid) {
+        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(contractSid);
+        return resultBean;
+    }
+}