Merge remote-tracking branch 'origin/master'

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

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -143,4 +143,8 @@ public interface BaseDistributorFeign {
     @ApiOperation("查询所有经销商信息")
     @GetMapping("/selectAllDisList")
     ResultBean<List<BaseDistributorListVo>> selectAllDisList();
+
+    @ApiOperation("根据sid查询所有经销商信息")
+    @GetMapping("/selectDisListBySid/{sid}")
+    ResultBean<BaseDistributorListVo> selectDisListBySid(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -157,5 +157,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -133,4 +133,5 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
 
     List<BaseDistributorListVo> selectAllDisList();
 
+    BaseDistributorListVo selectDisListBySid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -234,4 +234,16 @@
         FROM base_distributor
         WHERE isDelete = 0
     </select>
+
+    <select id="selectDisListBySid" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
+        SELECT sid,
+               disName AS 'name', registNum,
+               registDetailAddress,
+               invoPhone,
+               invoBank,
+               invoBankNum
+        FROM base_distributor
+        WHERE isDelete = 0
+        AND sid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -266,4 +266,9 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
         return baseDistributorService.selectAllDisList();
     }
+
+    @Override
+    public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
+        return baseDistributorService.selectDisListBySid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -876,4 +876,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         }
         return rb.success().setData(baseDistributorListVos);
     }
+
+    public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseDistributorListVo baseDistributorListVo = baseMapper.selectDisListBySid(sid);
+        return rb.success().setData(baseDistributorListVo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -494,8 +494,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             scmApplyInboundVehQueryDto.setIunit("辆");
             scmApplyInboundVehQueryDto.setNum("1");
             scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice()));
-            scmApplyInboundVehQueryDto.setLocalName("在途仓库");
+            scmApplyInboundVehQueryDto.setLocalName("正式仓库");
-            scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
+            scmApplyInboundVehQueryDto.setLocalCode("ARZSCK");
             scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
         }
         scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java

@@ -35,4 +35,23 @@ public class AppOrderPriceInfoVo implements Vo {
     @ApiModelProperty("xx日期限内")
     private String payDepositDays;
 
+
+
+    @ApiModelProperty("挂车价格")
+    private String gcPrice;
+    @ApiModelProperty("上装价格")
+    private String szPrice;
+    @ApiModelProperty("价格折让（元/台）")
+    private String priceDiscount;
+    @ApiModelProperty("中介返利（元/台）")
+    private String zjReturnPrice;
+    @ApiModelProperty("优惠套餐（元/台）")
+    private String pkgPrice;
+    @ApiModelProperty("实际成交价（元/台）")
+    private String realPrice;
+    @ApiModelProperty("差额")
+    private String diffPrice;
+
+
+
 }

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

@@ -2808,6 +2808,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 return rb.setMsg("订金信息存在错误，请检查");
             }
         }
+
+        if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+            //根据销售订单sid查询金融方案
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+            SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+            if (solutionsDetailsVo != null) {
+                if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                    if (!"02".equals(solutionsDetailsVo.getTypeKey())) {
+                        //判断实收和单台订金
+                        if(new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit())<0){
+                            return rb.setMsg("金融方案中实收金额小于单台订金");
+                        }
+                    }
+                } else {//担保贷款
+                    return rb.setMsg("金融方案中实收金额小于单台订金");
+                }
+            }
+        }
         return rb.success();
     }
 
@@ -3184,6 +3202,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setPriceInfo(priceInfo);
         }
         /***************************上装信息***************************************/
+        String topPriice = "";
         if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(busSalesOrder.getIsTop())) {
             AppOrderTopInfoVo topInfo = busSalesOrderMakeupService.selectTop(sid);
             if (topInfo != null) {
@@ -3201,6 +3220,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注：" + topInfo.getRemarks());
                 }
                 vo.setTopInfo(topInfo);
+                topPriice = "￥"+topInfo.getTopPrice();
             }
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
             String topMessage = "";
@@ -3262,17 +3282,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setTotaldiscount(bigDecimalAll.toString());
         }
         /*************************返利信息*******************************************/
+        BigDecimal zjAll = BigDecimal.ZERO;
         BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
         if (busSalesOrderSubmit != null) {
             //内部推荐人
             if (StringUtils.isNotBlank(busSalesOrderSubmit.getName())) {
                 vo.setRecommender(busSalesOrderSubmit.getName());
             }
+            //中介返利（元/台）
+            String zjReturnPrice = "";
+            boolean isShow = false;
             if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) {
                 SubmitVo submitVo = new SubmitVo();
                 submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorName());
                 submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobile());
                 if (busSalesOrderSubmit.getDistributorPrice() != null) {
+                    isShow = true;
+                    zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPrice());
                     submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPrice().toString());
                     if (priceInfo != null) {
                         submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(priceInfo.getNumber())).toString());
@@ -3286,6 +3312,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorNameTwo());
                 submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobileTwo());
                 if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
+                    isShow = true;
+                    zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPriceTwo());
                     submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPriceTwo().toString());
                     if (priceInfo != null) {
                         submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(priceInfo.getNumber())).toString());
@@ -3293,6 +3321,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 vo.setIntermediary2(submitVo);
             }
+            if (priceInfo != null) {
+                if(isShow){
+                    if(zjAll.compareTo(BigDecimal.ZERO)>0){
+                        //如果中介返利小于0，乘以-1
+                        zjAll = zjAll.multiply(new BigDecimal(-1));
+                        zjReturnPrice = "-￥"+zjAll.toString();
+                    }else{
+                        zjReturnPrice = "￥"+zjAll.toString();
+                    }
+                    priceInfo.setZjReturnPrice(zjReturnPrice);
+                }
+
+            }
+
         }
         //计算单台折让
         BigDecimal bigDecimalSing = new BigDecimal("0");
@@ -3336,8 +3378,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 list.removeAll(Collections.singleton(null));
                 List<String> stringList = new ArrayList<>();
                 if (!list.isEmpty()) {
-                    for (BusDepositFictitiousDetailsVo v : list) {
+                    for (int j = 0;j<list.size();j++) {
-                        String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
+                        BusDepositFictitiousDetailsVo v = list.get(j);
+                        String b = "";
+                        if(j == list.size() - 1){
+                            b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元。";
+                        }else{
+                            b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
+                        }
                         a = a + b;
                         if (StringUtils.isNotBlank(v.getPayPath())) {
                             List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
@@ -3346,7 +3394,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             }
                         }
                     }
-                    a = a + "原订金额度使用完后，其收据自动作废。";
+//                    a = a + "原订金额度使用完后，其收据自动作废。";
                     depositInfo.setDepositRemarks(a);
                     depositInfo.setImages(stringList);
                 }
@@ -3370,6 +3418,71 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
 //        vo = selectSolution(vo, sid);
         vo = selectSolutions(vo, sid);
+        //===============================================
+        //挂车价格（金融方案中取）
+        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+        List<OrderSolutionVo> list = new ArrayList<>();
+        if (solutionsDetailsVoResultBean.getData() != null) {
+            SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+            //挂车
+            if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
+                if(priceInfo != null){
+                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
+                }
+            }
+
+        }
+
+        if(priceInfo != null){
+            if(StringUtils.isNotBlank(topPriice)){
+                priceInfo.setSzPrice(topPriice);
+            }
+            //价格折让 = 销售合同价（整体成交价）-销售指导价（整体指导价）
+            //销售合同价-销售指导价
+            BigDecimal all = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
+                all = new BigDecimal(priceInfo.getSingleFinalPrice());
+            }
+            if(StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())){
+                all = all.subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            }
+            String priceAll = "";
+            if(all.compareTo(BigDecimal.ZERO) <0){
+                //如果价格折让小于0，乘以-1
+                all = all.multiply(new BigDecimal(-1));
+                priceAll = "-￥"+all.toString();
+            }else{
+                priceAll = "￥"+all.toString();
+            }
+            priceInfo.setPriceDiscount(priceAll);
+            //优惠套餐 = 优惠套餐总额/台数（保留到个位）
+            String pkgPrice = "";
+            BigDecimal oneAll = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(vo.getTotaldiscount())){
+                //总优惠/台数
+                oneAll = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()));
+                if(oneAll.compareTo(BigDecimal.ZERO) >0){
+                    //如果小于0，乘以-1
+                    oneAll = oneAll.multiply(new BigDecimal(-1));
+                    pkgPrice = "-￥"+oneAll.toString();
+                }else{
+                    pkgPrice = "￥"+oneAll.toString();
+                }
+                priceInfo.setPkgPrice(pkgPrice);
+            }
+            //实际成交 = 销售指导价-价格折让-中介返利-优惠套餐
+            BigDecimal realAll = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())){
+                realAll = realAll.add(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            }
+            realAll = realAll.add(all).add(zjAll.multiply(new BigDecimal(-1))).add(oneAll.multiply(new BigDecimal(-1)));
+            priceInfo.setRealPrice("￥"+realAll.toString());
+            //差额 = 实际成交价-销售指导价
+            BigDecimal diffAll = BigDecimal.ZERO;
+            diffAll = realAll.subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            priceInfo.setDiffPrice(diffAll.toString());
+        }
+
         return rb.success().setData(vo);
     }
 
@@ -4362,6 +4475,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //用户sid
         bv.setUserSid(busSalesOrder.get().getCreateBySid());
         bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
         String nextNodeUserSids_ = sysOrganization.getManagerSid();
         bv.setNextNodeUserSids(nextNodeUserSids_);
         //流程定义id
@@ -5033,16 +5148,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //是否排产
 //        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));//废弃
         //部门名称<客户>系列-全款/贷款销售订单
-        String orgName = busSalesOrder.getOrgName();
         String customerName = busSalesOrder.getCustomerName();
         String typeValue = "";
-        if ("1".equals(busSalesOrder.getPayTypeKey())) {
+        if("1".equals(busSalesOrder.getPayTypeKey())){
             typeValue = "全款销售订单";
-        } else {
+        }else{
             typeValue = "贷款销售订单";
         }
-        String orderNames = orgName + "<" + customerName + ">系列-" + typeValue;
+        String xilie = "";
-        variables.put("orderNames", orderNames);
+        BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
+        ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(busSalesOrderModel.getModelSid());
+        if(vehicleModelResultBean.getData() != null){
+            xilie = vehicleModelResultBean.getData().getProductLineValue();
+        }
+        ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid());
+        String orgName = "";
+        if(organizationResultBean.getData() != null){
+            orgName = organizationResultBean.getData().getName();
+        }
+        String orderNames = orgName+"<"+customerName+">"+xilie+"-"+typeValue;
+        variables.put("orderNames",orderNames);
         return variables;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -66,6 +66,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -166,6 +167,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
      * @param dto 数据传输对象
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean saveApp(AppBusSalesOrderModelDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String salesOrderSid = dto.getSaleOrderSid();

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBillApplicationDetailsQKQuery implements Query {
+    private static final long serialVersionUID = -4420699298916976735L;
+
+    @ApiModelProperty("申请sid")
+    private String sid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+}

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

@@ -186,4 +186,9 @@ public interface FinBillApplicationFeign {
     @ResponseBody
     public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto);
 
+    @ApiOperation("移动端欠款开票初始化")
+    @PostMapping("/appQKFetchDetailsBySid")
+    @ResponseBody
+    public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(@RequestBody AppBillApplicationDetailsQKQuery query);
+
 }

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

@@ -191,4 +191,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 	public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
+		return null;
+	}
 }

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

@@ -229,4 +229,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
     public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
         return finBillApplicationService.addInvoicedApply(dto);
     }
+
+    @Override
+    public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
+        return finBillApplicationService.appQKFetchDetailsBySid(query);
+    }
 }

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

@@ -26,9 +26,12 @@
 package com.yxt.anrui.fin.biz.finbillapplication;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
@@ -38,6 +41,7 @@ import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.commonappendix.*;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
@@ -46,6 +50,7 @@ import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.fin.api.finbillapplication.*;
@@ -146,6 +151,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     private BaseTrailerFeign baseTrailerFeign;
     @Autowired
     private FinVehicleInvoiceService finVehicleInvoiceService;
+    @Autowired
+    private BaseDistributorFeign baseDistributorFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -233,6 +240,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
                         finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                         finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                        finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
                         finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
                     }
                 }
@@ -352,6 +360,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
                     finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                     finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                    finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
                     finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
                 }
             }
@@ -749,6 +758,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                     finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                     finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                    BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
+                    finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                    finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                    finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                    finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
                     finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                 }
                 if (finBillTrailerVos != null){
@@ -768,6 +782,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                         finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                        BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
+                        finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                        finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                        finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                        finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
                         finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                     }
                 }
@@ -1507,6 +1526,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
                         finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                         finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                        finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
                         finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
                     }
                 }
@@ -1634,6 +1654,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
                     finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                     finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                    finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
                     finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
                 }
             }
@@ -1936,6 +1957,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public PagerVo<FinBillApplicationVo> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
         FinBillApplicationQuery query = pq.getParams();
         QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getOrgPath())){
+            String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+            query.setUseOrgSid(useOrgSid);
+        }
         qw.eq("fba.billStateKey", "003");
         qw.eq("fba.useOrgSid", query.getUseOrgSid());
         qw.eq("fba.createBySid", query.getCreateBySid());
@@ -2027,4 +2052,36 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return rb.setMsg("操作失败!提交的数据不一致");
         }
     }
+
+    public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = query.getSid();
+        String userSid = query.getUserSid();
+        String contractNo = query.getContractNo();
+        String orgPath = query.getOrgPath();
+        FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo();
+        if (StringUtils.isBlank(sid)){
+            finBillApplicationDetailsVo.setCreateBySid(userSid);
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+            finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName());
+            finBillApplicationDetailsVo.setDeptSid(sysUserVo.getDepartmentSid());
+            finBillApplicationDetailsVo.setDeptName(sysUserVo.getDepartmentName());
+            finBillApplicationDetailsVo.setApplyDate(DateUtil.formatDate(new Date()));
+            finBillApplicationDetailsVo.setStaffSid(sysUserVo.getStaffSid());
+            finBillApplicationDetailsVo.setStaffName(sysUserVo.getName());
+            finBillApplicationDetailsVo.setSaleDeptSid(sysUserVo.getDepartmentSid());
+            finBillApplicationDetailsVo.setSaleDeptName(sysUserVo.getDepartmentName());
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+            finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
+            finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());
+            finBillApplicationDetailsVo.setContractNo(contractNo);
+            CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
+            finBillApplicationDetailsVo.setOpenTickUnitName(commonContract.getPartyA());
+            finBillApplicationDetailsVo.setCustomerSid(commonContract.getCustomerSid());
+            finBillApplicationDetailsVo.setCustomerName(commonContract.getPartyB());
+        }else {
+            finBillApplicationDetailsVo = fetchDetailsVoBySid(sid);
+        }
+        return rb.success().setData(finBillApplicationDetailsVo);
+    }
 }

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

@@ -21,7 +21,7 @@ public enum ProcDefEnum {
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
     FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
     FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
-    RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
+    RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"),
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:9:1167504"),

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -191,7 +191,12 @@ public class FlowableRest implements FlowableFeign {
         }else{
             mfq.setMsgTitle(process.get("NAME_"));
         }
-        mfq.setMsgTitle(process.get("NAME_"));
+        if(processVariables.containsKey("orerNames")){
+            mfq.setMsgTitle(processVariables.get("orerNames").toString());
+        }else{
+            mfq.setMsgTitle(process.get("NAME_"));
+        }
+
         mfq.setUserSids(userSids.toString());
         ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
         log.info("抄送成功:{}", userName.toString());
@@ -695,7 +700,12 @@ public class FlowableRest implements FlowableFeign {
         BeanUtil.copyProperties(uff, messageFlowVo);
         mfq.setUfVo(messageFlowVo);
         mfq.setModuleName(process.get("NAME_"));
-        mfq.setMsgTitle(process.get("NAME_"));
+        if(processVariables.containsKey("orderNames")){
+            mfq.setMsgTitle(processVariables.get("orderNames").toString());
+        }else{
+            mfq.setMsgTitle(process.get("NAME_"));
+        }
+
         ResultBean<String> resultBean = messageFeign.pushMessageShare(mfq);
         log.info("分享成功-resultBean:{}", resultBean);
         if (!resultBean.getSuccess()) {

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -75,6 +75,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -506,7 +510,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     or.endOr();
                 }
                 if(StringUtils.isNotBlank(startUserSidParams)){
-                    or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
+                    or.processVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
                 }
                 //.taskCandidateGroupIn(roleSidList)
                 or.taskAssigneeLike("%" + userSid + "%")
@@ -1933,6 +1937,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         Page<FlowTaskDto> page = new Page<>();
         TaskQuery taskQuery = taskService.createTaskQuery();
         String names = "";
+        String startUserSidParams = "";
         // 流程参数
         Map<String, Object> paramMap = new HashMap<>();
         // 挂载表单参数
@@ -1950,6 +1955,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                         }
                     }
                 }
+                //发起人姓名查询
+                if("startUserSid".equals(btq.getField())){
+                    startUserSidParams = btq.getValue();
+                }
             }
             if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
@@ -1965,19 +1974,25 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             or.or();
             or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
             or.endOr();
+        }
+        if(StringUtils.isNotBlank(startUserSidParams)){
+            or.processVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
         }
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
         // 查询筛选条件
         if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {
-            taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
+            LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
+            taskQuery.taskCreatedAfter(Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()));
+//            taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
         }
         if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
-            taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
+            LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
+            taskQuery.taskCreatedBefore(Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()));
+//            taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
         }
-        /*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
-            taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
-        }*/
         page.setTotal(taskQuery.count());
         int p = (pageNum - 1) * pageSize;
         List<Task> taskList = taskQuery.listPage(p, pageSize);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java

@@ -22,4 +22,9 @@ public class FlowTaskDoQuery implements Query {
 
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+    @ApiModelProperty("日期至日期")
+    private String date;
+    @ApiModelProperty("用户sid")
+    private String createUser;
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java

@@ -59,4 +59,9 @@ public class FlowTaskFinishVo implements Vo {
 
     @ApiModelProperty("流程名称")
     private String flowableName;
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("发起人sid")
+    @JsonProperty("createUserSid")
+    private String startUserSid;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 public class PcSysStaffQuery implements Query {
     private static final long serialVersionUID = 1858291601540877140L;
-    @ApiModelProperty(value = "业务员sid")
+    @ApiModelProperty(value = "业务员sid",required = false)
     private String staffSid;
 
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.api.sysstaffinfo;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,7 +12,8 @@ import lombok.Data;
 @Data
 public class PcSysStaffVo implements Vo {
     private static final long serialVersionUID = -9042032921079833819L;
-
+    @ApiModelProperty("用户sid")
-    private String staffSid;
+    private String userSid;
+    @ApiModelProperty("人员")
     private String staffName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@@ -94,7 +94,7 @@ public interface SysStaffinfoFeign {
      */
     @ApiOperation("获取集团内全部员工姓名")
     @GetMapping("/getStaffName")
-    public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid);
+    public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid);
 
     /**
      * 获取部门内全部员工姓名
@@ -145,5 +145,13 @@ public interface SysStaffinfoFeign {
     @ApiOperation("切换机构：存放地点变更-获取人员列表")
     @ResponseBody
     @GetMapping("/getGressionUserList")
-    ResultBean<List<AppSysStaffVo>> getGressionUserList(@RequestParam("userSid")String userSid,@RequestParam("orgPath")String orgPath);
+    ResultBean<List<AppSysStaffVo>> getGressionUserList(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
+
+    @ApiOperation("获取集团所有人员")
+    @ResponseBody
+    @GetMapping("/selectStaffLists")
+    ResultBean<List<PcSysStaffVo>> selectStaffLists();
+
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -103,4 +103,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        return null;
+    }
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java

@@ -24,4 +24,7 @@ public class AppSysStaffQuery implements Query {
 
     @ApiModelProperty("已选人员sid")
     private List<String> selectSid;
+
+    @ApiModelProperty("state：1是所有，0是本分公司")
+    private int state;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -255,4 +255,5 @@ public interface SysUserFeign {
     @ApiOperation(value = "分享时查询的人员")
     @PostMapping(value = "/shareSelectUser")
     ResultBean<List<String>> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery);
+
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -486,6 +486,36 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        //发起日期查询
+        String date = params.getDate();
+        if(StringUtils.isNotBlank(date)){
+            String[] s = date.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("startDate");
+                taskParam.setValue(startDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
+                taskParamList.add(taskParam);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("endDate");
+                taskParam.setValue(endDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
+                taskParamList.add(taskParam);
+            }
+        }
+
+        if(StringUtils.isNotBlank(params.getCreateUser())){
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField("startUserSid");
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue(params.getCreateUser());
+            taskParamList.add(taskParam);
+        }
+
       /*  if (StringUtils.isNotBlank(orgPath)) {//切换机构
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField(BusinessVariables.ORGPATH);
@@ -585,6 +615,33 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        String date = params.getDate();
+        if(StringUtils.isNotBlank(date)){
+            String[] s = date.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("startDate");
+                taskParam.setValue(startDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
+                taskParamList.add(taskParam);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("endDate");
+                taskParam.setValue(endDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
+                taskParamList.add(taskParam);
+            }
+        }
+        if(StringUtils.isNotBlank(params.getCreateUser())){
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField("startUserSid");
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue(params.getCreateUser());
+            taskParamList.add(taskParam);
+        }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessDoneListForApp(userSid, taskQueryPagerQuery);
@@ -599,6 +656,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         for (int i = 0; i < voList.size(); i++) {
             FlowTaskFinishVo f = voList.get(i);
             Map<String, Object> flowMap = f.getProcessVariables();
+            f.setBusinessSid(flowMap.get("businessSid").toString());
             Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
             String json = JSONObject.toJSONString(appMap);
             AppVo appVo = new AppVo();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@@ -122,4 +122,6 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
     IPage<AppSysStaffVo> getUserList(IPage<SysStaffinfo> page, @Param(Constants.WRAPPER) QueryWrapper<AppSysStaffVo> qw, @Param("orgSid") String orgSid);
 
     List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
+
+    List<PcSysStaffVo> selectStaffLists();
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -309,9 +309,10 @@
     </update>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
-        select sso.staffSid, si.name staffName
+        select su.sid userSid, si.name staffName
         from sys_staff_org sso
                  left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on su.staffSid = si.sid
         where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
     </select>
 
@@ -377,4 +378,11 @@
             </if>
         </where>
     </select>
+
+    <select id="selectStaffLists" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
+        select su.sid         userSid,
+        si.name        staffName
+        from sys_user su
+        left join sys_staffinfo si on su.staffSid = si.sid
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@@ -220,5 +220,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return sysStaffinfoService.getGressionUserList(userSid, orgPath);
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        return sysStaffinfoService.selectStaffLists();
+    }
+
 
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -749,25 +749,19 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         QueryWrapper<AppSysStaffVo> qw = new QueryWrapper<>();
         String orgSid = "";
         if (params != null) {
-            if(StringUtils.isBlank(params.getOrgPath())){
+            if(StringUtils.isNotBlank(params.getOrgPath())){
-                if (StringUtils.isNotBlank(params.getUserSid())) {
-                    ResultBean<String> stringResultBean = sysStaffOrgService.getPathSidByUserSid(params.getUserSid());
-                    if (stringResultBean.getSuccess()) {
-                        orgSid = stringResultBean.getData();
-                    }
-                }
-            }else{
                 String orgPath = params.getOrgPath();
                 orgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
             }
-
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("si.name", params.getName());
             }
-
+            if (params.getSelectSid() != null && params.getSelectSid().size() > 0){
-            if (params.getSelectSid().size() > 0){
                 qw.notIn("su.sid",params.getSelectSid());
             }
+            if(params.getState() == 0){
+                qw.eq("si.personTypeKey","02");
+            }
         }
         IPage<AppSysStaffVo> pagging = baseMapper.getUserList(page, qw, orgSid);
         List<AppSysStaffVo> list = pagging.getRecords();
@@ -798,4 +792,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         List<AppSysStaffVo> list = baseMapper.getGressionUserList(useOrgSid);
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
+        List<PcSysStaffVo> list = baseMapper.selectStaffLists();
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }

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

@@ -1,60 +1,82 @@
 package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
 public class AdvanceInvoiceDto implements Dto {
     private static final long serialVersionUID = 3374676388152082886L;
 
+    @ApiModelProperty("欠款开票sid")
+    private String sid;
+    @ApiModelProperty("是否可以编辑开票价")
+    private boolean isCanEdit;
+    @ApiModelProperty("销售类型")
+    private String saleType;
+    @ApiModelProperty("部门-人员名")
+    private String publishInfo;
+    @ApiModelProperty("销售部门")
+    private String sellerDept;
+    @ApiModelProperty("销售人员")
+    private String sellerName;
+    @ApiModelProperty("发起日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("开票单位")
+    private String invoicingUnit;
+    @ApiModelProperty("是否领取原件")
+    private String getOriginalValue;
+    @ApiModelProperty("默认开票名称")
+    private String openTickName;
+    @ApiModelProperty("单台开票价")
+    private String invoiceMoney;
+    @ApiModelProperty("选择车辆列表")
+    private List<AppCarListDto> vinList  = new ArrayList<>();
+    @ApiModelProperty("欠款总金额")
+    private String invoiceTotal;
+    @ApiModelProperty("回款日期")
+    private String collectionDate;
+    @ApiModelProperty("欠款原因key")
+    private String reasonKey;
+    @ApiModelProperty("欠款原因value")
+    private String reasonValue;
+    @ApiModelProperty("原因备注")
+    private String remarks;
+    @ApiModelProperty("欠款开票挂车信息")
+    private List<FinBillTrailerDto> finBillTrailers;
+    @ApiModelProperty("证件")
+    private List<String> idCardImages;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> customerInvoiceApplyImages;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerContractImages;
+    @ApiModelProperty("确认书")
+    private List<String> invoiceApplyConfirmImages;
     @ApiModelProperty("用户sid")
     private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("合同sid")
     private String contractSid;
-    @ApiModelProperty("合同id")
+    @ApiModelProperty("合同编号")
-    @JsonProperty("contractId")
+    private String contractId;
-    private String contractNo;
+    @ApiModelProperty("单据编号")
-    @ApiModelProperty("客户")
+    private String billNo; // 单据编号
-    private String customerName;
-    @ApiModelProperty("申请日期")
-    private String applyDate;
-    @ApiModelProperty("车辆列表")
-    private List<AppCarListDto> carList;
-    @ApiModelProperty("欠款金额")
-    @JsonProperty("cumulativeArrearsPrice")
-    private String arrearsMoney;
-    @ApiModelProperty("车型")
-    @JsonProperty("modelName")
-    private String carModel;
-    @ApiModelProperty("开票信息确认书")
-    private List<String> confirmFile;
-    @ApiModelProperty("客户开票申请书")
-    private List<String> applyFile;
-    @ApiModelProperty("备注")
-    private String remarks;
-    @ApiModelProperty("手写原因")
-    @JsonProperty("reasonWrite")
-    private String otherReasons;
-    @ApiModelProperty("承诺回款日期")
-    @JsonProperty("collectionDate")
-    private String returnedMoneyDate;
-    @ApiModelProperty("车辆登记合同")
-    private List<String> registerFile;
-    @ApiModelProperty("提前开票原因 0手写 1选择")
-    @JsonProperty("reasonType")
-    private String advGinReasonType;
-    @ApiModelProperty("提前开票原因 0手写 1选择")
-    @JsonProperty("reasonChoose")
-    private String advGinReasonValue;
-    @ApiModelProperty("提前开票原因 0手写 1选择")
-    @JsonProperty("reasonKey")
-    private String advGinReasonKey;
     @ApiModelProperty("任务id")
     private String taskId;
     @ApiModelProperty("流程实列id")
     private String procInsId;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
 }

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

@@ -9,6 +9,11 @@ public class AdvanceInvoiceInfoQuery implements Query {
     private static final long serialVersionUID = 8149076217652242268L;
 
     @ApiModelProperty("申请sid")
-    private String contractSid;
+    private String sid;
-
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,54 +14,70 @@ import java.util.List;
 public class AdvanceInvoiceInfoVo implements Vo {
     private static final long serialVersionUID = 6256861573673134007L;
 
+    @ApiModelProperty("欠款开票sid")
+    private String sid;
+    @ApiModelProperty("是否可以编辑开票价")
+    private boolean isCanEdit;
+    @ApiModelProperty("销售类型")
+    private String saleType;
+    @ApiModelProperty("部门-人员名")
+    private String publishInfo;
+    @ApiModelProperty("销售部门")
+    private String sellerDept;
+    @ApiModelProperty("销售人员")
+    private String sellerName;
+    @ApiModelProperty("发起日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("开票单位")
+    private String invoicingUnit;
+    @ApiModelProperty("是否领取原件")
+    private String getOriginalValue;
+    @ApiModelProperty("默认开票名称")
+    private String openTickName;
+    @ApiModelProperty("单台开票价")
+    private String invoiceMoney;
+    @ApiModelProperty("选择车辆列表")
+    private List<AppCarListVo> vinList  = new ArrayList<>();
+    @ApiModelProperty("欠款总金额")
+    private String invoiceTotal;
+    @ApiModelProperty("回款日期")
+    private String collectionDate;
+    @ApiModelProperty("欠款原因key")
+    private String reasonKey;
+    @ApiModelProperty("欠款原因value")
+    private String reasonValue;
+    @ApiModelProperty("原因备注")
+    private String remarks;
+    @ApiModelProperty("欠款开票挂车信息")
+    private List<FinBillTrailerVo> finBillTrailers;
+    @ApiModelProperty("证件")
+    private List<String> idCardImages;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> customerInvoiceApplyImages;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerContractImages;
+    @ApiModelProperty("确认书")
+    private List<String> invoiceApplyConfirmImages;
     @ApiModelProperty("用户sid")
     private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
     @ApiModelProperty("合同sid")
     private String contractSid;
-    @ApiModelProperty("合同id")
+    @ApiModelProperty("合同编号")
-    @JsonProperty("contractId")
+    private String contractId;
-    private String contractNo;
+    @ApiModelProperty("单据编号")
-    @ApiModelProperty("客户")
+    private String billNo; // 单据编号
-    private String customerName;
-    @ApiModelProperty("申请日期")
-    private String applyDate;
-    @ApiModelProperty("选择车辆列表")
-    private List<AppCarListVo> carList  = new ArrayList<>();
-    @ApiModelProperty("所有车辆列表")
-    private List<AppCarListVo> vinList = new ArrayList<>();
-    @ApiModelProperty("欠款金额")
-    @JsonProperty("cumulativeArrearsPrice")
-    private BigDecimal arrearsMoney;
-    @ApiModelProperty("车型")
-    @JsonProperty("modelName")
-    private String carModel;
-    @ApiModelProperty("开票信息确认书")
-    private List<String> confirmFile = new ArrayList<>();
-    @ApiModelProperty("客户开票申请书")
-    private List<String> applyFile = new ArrayList<>();
-    @ApiModelProperty("备注")
-    private String remarks;
-    @ApiModelProperty("手写原因")
-    @JsonProperty("reasonWrite")
-    private String otherReasons;
-    @ApiModelProperty("承诺回款日期")
-    @JsonProperty("collectionDate")
-    private String returnedMoneyDate;
-    @ApiModelProperty("车辆登记合同")
-    private List<String> registerFile = new ArrayList<>();
-    @ApiModelProperty("提前开票原因 0手写 1选择")
-    @JsonProperty("reasonType")
-    private String advGinReasonType;
-    @ApiModelProperty("提前开票原因 0手写 1选择")
-    @JsonProperty("reasonChoose")
-    private String advGinReasonValue;
-    @ApiModelProperty("提前开票原因 0手写 1选择")
-    @JsonProperty("reasonKey")
-    private String advGinReasonKey;
     @ApiModelProperty("任务id")
     private String taskId;
     @ApiModelProperty("流程实列id")
-    @JsonProperty("procInsId")
+    private String procInsId;
-    private String procInstId;
+    @ApiModelProperty("流程状态")
-
+    private String nodeState;
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
 }

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

@@ -14,6 +14,6 @@ public class AdvanceInvoicePageQuery implements Query {
     @ApiModelProperty("客户名称字段 合同编号字段")
     private String name;
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty("组织全路径")
-    private String type;
+    private String orgPath;
 }

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

@@ -10,40 +10,23 @@ public class AdvanceInvoicePageVo implements Vo {
     private static final long serialVersionUID = -8631337422991366458L;
 
     @ApiModelProperty("sid")
-    @JsonProperty("contractSid")
     private String sid;
     @ApiModelProperty("合同状态")
-    @JsonProperty("contractType")
+    private String contractType;
-    private String nodeState;
     @ApiModelProperty("合同编号")
-    @JsonProperty("contractId")
+    private String contractId;
-    private String contractNo;
     @ApiModelProperty("欠款金额")
     private String arrearsMoney;
     @ApiModelProperty("承诺汇款日期")
-    @JsonProperty("paymentDate")
+    private String paymentDate;
-    private String returnedMoneyDate;
     @ApiModelProperty("申请人")
-    @JsonProperty("applicant")
+    private String applicant;
-    private String applyName;
     @ApiModelProperty("数量")
-    @JsonProperty("number")
+    private String number;
-    private String num;
     @ApiModelProperty("原因")
     private String reason;
-
-    @ApiModelProperty("选择 手写  key  0 1")
-    private String advGinReasonType;
-    @ApiModelProperty("选择value")
-    private String advGinReasonValue;
-    @ApiModelProperty("选择key")
-    private String advGinReasonKey;
-    @ApiModelProperty("手写")
-    private String otherReasons;
-
     @ApiModelProperty("创建日期")
-    @JsonProperty("date")
+    private String date;
-    private String applyDate;
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("是否显示办理按钮")

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

@@ -44,7 +44,7 @@ import javax.validation.Valid;
  * Project: anrui_buscenter(销售业务) <br/>
  * File: BusAdvanceGinvoiceapplyFeign.java <br/>
  * Class: com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyFeign <br/>
- * Description: 提前开票申请. <br/>
+ * Description: 欠款开票申请. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
  * Makedate: 2022-03-17 16:02:10 <br/>
@@ -53,7 +53,7 @@ import javax.validation.Valid;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "提前开票申请")
+@Api(tags = "欠款开票申请")
 @FeignClient(
         contextId = "anrui-terminal-BusAdvanceGinvoiceapply",
         name = "anrui-terminal",
@@ -62,27 +62,27 @@ import javax.validation.Valid;
 public interface AppBusAdvanceGinvoiceapplyFeign {
 
 
-    @ApiOperation("手机端-获取提前开票列表")
+    @ApiOperation("手机端-获取欠款开票列表")
     @PostMapping("/getAdvanceInvoiceList")
     @ResponseBody
     ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AdvanceInvoicePageQuery> pagerQuery);
 
-    @ApiOperation("移动端-新增提前开票申请")
+    @ApiOperation("移动端-新增欠款开票申请")
     @PostMapping("/addAdvanceInvoice")
     @ResponseBody
     public ResultBean addAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceVinDto dto);
 
-    @ApiOperation("手机端-初始化提前开票申请")
+    @ApiOperation("手机端-初始化欠款开票申请")
     @GetMapping("/initAdvanceInvoice")
     @ResponseBody
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
 
-    @ApiOperation("移动端-保存提前开票申请")
+    @ApiOperation("移动端-保存欠款开票申请")
     @PostMapping("/saveAdvanceInvoice")
     @ResponseBody
     public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto);
 
-    @ApiOperation("手机端-删除提前开票")
+    @ApiOperation("手机端-删除欠款开票")
     @DeleteMapping("/deleteAdvanceInvoice")
     @ResponseBody
     public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);

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

@@ -10,6 +10,16 @@ public class AppCarListDto implements Dto {
 
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("成交价")
+    @ApiModelProperty("开票类型key")
-    private String price;
+    private String invoiceTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceType;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey;
+    @ApiModelProperty("合格证状态value")
+    private String certificateState;
 }

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

@@ -10,6 +10,17 @@ public class AppCarListVo implements Vo {
 
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("成交价")
+    @ApiModelProperty("开票类型key")
-    private String price;
+    private String invoiceTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceType;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey;
+    @ApiModelProperty("合格证状态value")
+    private String certificateState;
+
 }

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

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
+ * Description: 开票挂车信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表 数据传输对象", description = "开票挂车信息表 数据传输对象")
+public class FinBillTrailerDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+    @ApiModelProperty("合格证图片")
+    private List<String> files;
+}

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

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo <br/>
+ * Description: 开票挂车信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象")
+public class FinBillTrailerVo implements Vo {
+
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+    @ApiModelProperty("合格证图片")
+    private List<String> files;
+}

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

@@ -31,6 +31,8 @@ public class BillApplicationIInfoDto implements Dto {
     private String openTickTypeKey;
     @ApiModelProperty(value = "开票类型value")
     private String openTickTypeValue;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
     @ApiModelProperty(value = "开票名称")
     private String openTickName;
     @ApiModelProperty("单台开票价")

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

@@ -31,6 +31,8 @@ public class BillApplicationIInfoVo implements Vo {
     private String openTickTypeKey;
     @ApiModelProperty(value = "开票类型value")
     private String openTickTypeValue;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
     @ApiModelProperty(value = "开票名称")
     private String openTickName;
     @ApiModelProperty("单台开票价")

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

@@ -58,6 +58,8 @@ public class FinBillTrailerVo implements Vo {
     private String billTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
     private String billTypeValue; // 开票类型value
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
 	@ApiModelProperty("开票名称")
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")

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

@@ -15,6 +15,8 @@ public class VinListDto implements Dto {
     private String invoiceTypeKey;
     @ApiModelProperty("开票类型")
     private String invoiceType;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
     @ApiModelProperty("开票名称")
     private String invoiceName;
     @ApiModelProperty("开票信息")

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

@@ -16,6 +16,8 @@ public class VinListVo implements Vo {
     private String invoiceTypeKey;
     @ApiModelProperty("开票类型")
     private String invoiceType;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
     @ApiModelProperty("开票名称")
     private String invoiceName;
     @ApiModelProperty("开票信息")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java

@@ -31,7 +31,21 @@ public class OrderPriceInfoVo implements Vo {
     @ApiModelProperty("单台整体成交价")
     @JsonProperty("overallPrice")
     private String singleFinalPrice;
-
+    @ApiModelProperty("单车折让")
-    //单车折让
     private String singleCarDiscountPrice;
+
+    @ApiModelProperty("挂车价格")
+    private String gcPrice;
+    @ApiModelProperty("上装价格")
+    private String szPrice;
+    @ApiModelProperty("价格折让（元/台）")
+    private String priceDiscount;
+    @ApiModelProperty("中介返利（元/台）")
+    private String zjReturnPrice;
+    @ApiModelProperty("优惠套餐（元/台）")
+    private String pkgPrice;
+    @ApiModelProperty("实际成交价（元/台）")
+    private String realPrice;
+    @ApiModelProperty("差额")
+    private String diffPrice;
 }

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

@@ -34,29 +34,37 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteA
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
+import com.yxt.anrui.fin.api.finbillapplication.*;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 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.anrui.scm.api.scmvehiclegression.flowable.*;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.*;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
 import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.BusOrderSalesVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.utils.StringUtils;
 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;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 
@@ -79,18 +87,48 @@ public class AppBusAdvanceGinvoiceapplyService {
     @Autowired
     BusAdvanceGinvoiceapplyFeign busAdvanceGinvoiceapplyFeign;
     @Autowired
+    FinBillApplicationFeign finBillApplicationFeign;
+    @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoicePageQuery> pagerQuery) {
         ResultBean<PagerVo<AdvanceInvoicePageVo>> rb = ResultBean.fireFail();
-        PagerQuery<AppAdvanceInvoicePageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        PagerQuery<FinBillApplicationQuery> pq = new PagerQuery<>();
-        ResultBean<PagerVo<AppAdvanceInvoicePageVo>> resultBean = busAdvanceGinvoiceapplyFeign.getAdvanceInvoiceList(pq);
+        AdvanceInvoicePageQuery params = pagerQuery.getParams();
-        List<AdvanceInvoicePageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdvanceInvoicePageVo.class)).collect(Collectors.toList());
+        FinBillApplicationQuery params1 = new FinBillApplicationQuery();
+        params1.setOrgPath(params.getOrgPath());
+        params1.setCreateBySid(params.getUserSid());
+        params1.setCustomerName(params.getName());
+        pq.setParams(params1);
+        ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPageQK(pq);
+        List<AdvanceInvoicePageVo> advanceInvoicePageVos = new ArrayList<>();
         PagerVo<AdvanceInvoicePageVo> v = new PagerVo<>();
-        BeanUtil.copyProperties(resultBean.getData(), v);
+        List<FinBillApplicationVo> records = resultBean.getData().getRecords();
-        v.setRecords(voList);
+        for (FinBillApplicationVo record : records) {
+            AdvanceInvoicePageVo advanceInvoicePageVo = new AdvanceInvoicePageVo();
+            advanceInvoicePageVo.setSid(record.getSid());
+            advanceInvoicePageVo.setContractId(record.getContractNo());
+            advanceInvoicePageVo.setArrearsMoney(record.getArrearsMoney());
+            advanceInvoicePageVo.setPaymentDate(record.getReturnedMoneyDate());
+            advanceInvoicePageVo.setApplicant(record.getCreateByName());
+            advanceInvoicePageVo.setNumber(record.getNum().toString());
+            advanceInvoicePageVo.setReason(record.getArrearsOpenYYValue());
+            advanceInvoicePageVo.setDate(record.getApplyDate());
+            advanceInvoicePageVo.setCustomerName(record.getCustomerName());
+            if (record.getNodeState().equals("待提交")){
+                advanceInvoicePageVo.setShowUpdateBtn(true);
+                advanceInvoicePageVo.setShowDeleteBtn(true);
+            }else {
+                advanceInvoicePageVo.setShowUpdateBtn(false);
+                advanceInvoicePageVo.setShowDeleteBtn(false);
+            }
+            advanceInvoicePageVos.add(advanceInvoicePageVo);
+        }
+        v.setRecords(advanceInvoicePageVos);
         return rb.success().setData(v);
     }
 
@@ -104,28 +142,201 @@ public class AppBusAdvanceGinvoiceapplyService {
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
         ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
         AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
-        AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery();
+        AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
-        BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery);
+        BeanUtil.copyProperties(query, appBillApplicationDetailsQKQuery);
-        ResultBean<AppAdvanceInvoiceInfoVo> resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(appAdvanceInvoiceInfoQuery);
+        ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
-        AppAdvanceInvoiceInfoVo appAdvanceInvoiceInfoVo = resultBean.getData();
+        FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
-        BeanUtil.copyProperties(appAdvanceInvoiceInfoVo, vo);
+        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
+        vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
+        vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
+        vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
+        vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
+        vo.setSellerName(finBillApplicationDetailsVo.getStaffName());
+        vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
+        vo.setName(finBillApplicationDetailsVo.getCustomerName());
+        vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
+        vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
+        vo.setContractId(finBillApplicationDetailsVo.getContractNo());
+        vo.setDate(finBillApplicationDetailsVo.getApplyDate());
+        vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        //车辆信息
+        List<AppCarListVo> vinListVos = new ArrayList<>();
+        List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
+        for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
+            AppCarListVo vinListVo = new AppCarListVo();
+            vinListVo.setVin(finBillVehicle.getVinNo());
+            vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
+            vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
+            vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
+            vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
+            vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
+            vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+            vinListVos.add(vinListVo);
+        }
+        vo.setVinList(vinListVos);
+        //挂车信息
+        List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
+        List<com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
+        if (finBillTrailers != null && finBillTrailers.size() > 0){
+            for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) {
+                com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
+                BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
+                String hgzImageUrl = finBillTrailer.getHgzImageUrl();
+                List<String> files = new ArrayList<>();
+                files.add(hgzImageUrl);
+                finBillTrailerVo.setFiles(files);
+                finBillTrailerVos.add(finBillTrailerVo);
+            }
+        }
+        vo.setFinBillTrailers(finBillTrailerVos);
+        //附件信息
+        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
+        List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
+        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
+        List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+        List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
+        List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
+        List<String> registerContractImages = new ArrayList<>();//车辆登记合同
+        List<String> idCardImages = new ArrayList<>();
+        if (zjApplicationAppendxs.size() > 0){
+            for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
+                idCardImages.add(zjApplicationAppendx.getFileUrl());
+            }
+        }
+        if (khkpsqsApplicationAppendxs.size() > 0){
+            for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
+                customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
+            }
+        }
+        if (kpxxqrsApplicationAppendxs.size() > 0){
+            for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
+                invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
+            }
+        }
+        if (cldjhtApplicationAppendxs.size() > 0){
+            for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
+                registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
+            }
+        }
+        vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
+        vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
+        vo.setRegisterContractImages(registerContractImages);
+        vo.setIdCardImages(idCardImages);
+        BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
+        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
+            vo.setCanEdit(false);
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }else {
+            vo.setCanEdit(true);
+        }
         return rb.success().setData(vo);
     }
 
     public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
-        AppAdvanceInvoiceDto appAdvanceInvoiceDto = new AppAdvanceInvoiceDto();
+        FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
-        BeanUtil.copyProperties(dto, appAdvanceInvoiceDto);
+        BeanUtil.copyProperties(dto, finBillApplicationDto);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.saveAdvanceInvoice(appAdvanceInvoiceDto);
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        finBillApplicationDto.setUseOrgSid(useOrgSid);
+        finBillApplicationDto.setCreateBySid(dto.getUserSid());
+        finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney());
+        finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
+        finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
+        finBillApplicationDto.setSaleDeptName(dto.getSellerName());
+        finBillApplicationDto.setStaffName(dto.getSellerName());
+        finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
+        finBillApplicationDto.setCustomerName(dto.getName());
+        finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
+        finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
+        finBillApplicationDto.setContractNo(dto.getContractId());
+        finBillApplicationDto.setApplyDate(dto.getDate());
+        finBillApplicationDto.setCreateBySid(dto.getUserSid());
+        finBillApplicationDto.setNodeState(dto.getNodeState());
+        finBillApplicationDto.setBillNo(dto.getBillNo());
+        String publishInfo = dto.getPublishInfo();
+        String[] split = publishInfo.split("-");
+        finBillApplicationDto.setDeptName(split[0]);
+        finBillApplicationDto.setCreateByName(split[1]);
+        //开票车辆信息
+        List<AppCarListDto> vinList = dto.getVinList();
+        List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
+        for (AppCarListDto vinListDto : vinList) {
+            FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
+            finBillVehicleDto.setVinNo(vinListDto.getVin());
+            finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
+            finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
+            finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
+            finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
+            finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
+            finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
+            finBillVehicleDtos.add(finBillVehicleDto);
+        }
+        finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);
+        //开票挂车信息
+        List<com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
+        List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
+        if (finBillTrailers != null && finBillTrailers.size() > 0){
+            for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) {
+                com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto();
+                BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto);
+                finBillTrailerDtos.add(finBillTrailerDto);
+            }
+        }
+        finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos);
+        //附件信息
+        List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
+        List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
+        List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
+        List<String> idCardImages = dto.getIdCardImages();//证件
+        List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
+        List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
+        List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
+        List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
+        if (customerInvoiceApplyImages != null){
+            for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(customerInvoiceApplyImage);
+                khkpsqsApplicationAppendxs.add(finBillFileDto);
+            }
+        }
+        if (invoiceApplyConfirmImages != null){
+            for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
+                kpxxqrsApplicationAppendxs.add(finBillFileDto);
+            }
+        }
+        if (registerContractImages != null){
+            for (String registerContractImage : registerContractImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(registerContractImage);
+                cldjhtApplicationAppendxs.add(finBillFileDto);
+            }
+        }
+        if (idCardImages != null){
+            for (String idCardImage : idCardImages) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(idCardImage);
+                idCardImagesPC.add(finBillFileDto);
+            }
+        }
+        finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
+        finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
+        finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
+        finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
+        ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
         return resultBean;
     }
 
     public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
-        AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery();
+        List<String> stringList = new ArrayList<>();
-        BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery);
+        stringList.add(query.getSid());
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(appAdvanceInvoiceInfoQuery);
+        String[] sids = stringList.toArray(new String[0]);
+        ResultBean resultBean = finBillApplicationFeign.delBySids(sids);
         return resultBean;
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -120,6 +120,7 @@ public class InvoicedService {
         vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
         vo.setOpenTickTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
         vo.setOpenTickTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue());
+        vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid());
         vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
         vo.setInvoiceStateKey(finBillApplicationDetailsVo.getBillStateKey());
         vo.setInvoiceState(finBillApplicationDetailsVo.getBillStateValue());
@@ -137,6 +138,7 @@ public class InvoicedService {
             vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
             vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
             vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
+            vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
             vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
             vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
             vinListVos.add(vinListVo);
@@ -216,6 +218,7 @@ public class InvoicedService {
         finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
         finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
         finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue());
+        finBillApplicationDto.setOpenTickSid(dto.getOpenTickSid());
         finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
         finBillApplicationDto.setBillStateKey(dto.getInvoiceStateKey());
         finBillApplicationDto.setBillStateValue(dto.getInvoiceState());
@@ -238,6 +241,7 @@ public class InvoicedService {
             finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
             finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
             finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
+            finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
             finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
             finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
             finBillVehicleDtos.add(finBillVehicleDto);
@@ -295,7 +299,7 @@ public class InvoicedService {
         finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
-        ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
+        ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto);
         return resultBean;
     }
 
@@ -389,6 +393,7 @@ public class InvoicedService {
         submitBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
         submitBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
         submitBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue());
+        submitBillApplicationDto.setOpenTickSid(dto.getOpenTickSid());
         submitBillApplicationDto.setOpenTickName(dto.getOpenTickName());
         submitBillApplicationDto.setBillStateKey(dto.getInvoiceStateKey());
         submitBillApplicationDto.setBillStateValue(dto.getInvoiceState());
@@ -411,6 +416,7 @@ public class InvoicedService {
             finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
             finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
             finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
+            finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
             finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
             finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
             finBillVehicleDtos.add(finBillVehicleDto);