Merge remote-tracking branch 'origin/master'

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

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -41,4 +41,7 @@ public class BaseVehicleActualSales extends BaseEntity {
     private String carBrandSid;
     @ApiModelProperty(value = "品牌名称")
     private String carBrandName;
+
+    @ApiModelProperty("申请人的所在部门sid全路径")
+    private String orgSidPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -54,4 +54,6 @@ public class BaseVehicleActualSalesDto implements Dto {
     private String carBrandSid;
     @ApiModelProperty(value = "品牌名称")
     private String carBrandName;
+
+    private String orgSidPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.base.api.basevehiclecertificate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppHandoverCertificateInfoVo implements Vo {
+    private static final long serialVersionUID = 5182269192194137775L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("")
+    private String invoice;
+    @ApiModelProperty("合格证日期")
+    private String date;
+    @ApiModelProperty("合格证附件")
+    private List<String> invoiceImages;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -125,4 +125,9 @@ public interface BaseVehicleCertificateFeign {
     @PostMapping("/updateCertificate")
     @ResponseBody
     ResultBean updateCertificate(@RequestBody CertificateDto dto);
+
+    @ApiOperation("交车准备获取合格证信息")
+    @GetMapping("/getCertificateInfo/{vinNo}/{userSid}")
+    @ResponseBody
+    ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(@PathVariable("vinNo") String vinNo, @PathVariable("userSid") String userSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -77,4 +77,9 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
         return null;
     }
 
+    @Override
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        return null;
+    }
+
 }

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

@@ -50,11 +50,19 @@ import lombok.Data;
 public class BaseVehicleTempstate extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("车辆sid")
-    private String vehSid; // 车辆sid
-	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
-    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
-	@ApiModelProperty("业务sid")
-    private String busSid; // 业务sid
+    @ApiModelProperty("车辆sid")
+    private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateValue;
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey;
+    @ApiModelProperty("业务状态key")
+    private String tempKey;
+    @ApiModelProperty("业务状态value")
+    private String tempValue;
+    @ApiModelProperty("业务sid")
+    private String busSid;
 
 }

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

@@ -49,13 +49,19 @@ import lombok.Data;
 @ApiModel(value = "车辆临时状态表 视图数据详情", description = "车辆临时状态表 视图数据详情")
 public class BaseVehicleTempstateDetailsVo implements Vo {
 
-    private String sid; // sid
-
-	@ApiModelProperty("车辆sid")
-    private String vehSid; // 车辆sid
-	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
-    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
-	@ApiModelProperty("业务sid")
-    private String busSid; // 业务sid
+    @ApiModelProperty("车辆sid")
+    private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateValue;
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateKey;
+    @ApiModelProperty("业务状态key")
+    private String tempKey;
+    @ApiModelProperty("业务状态value")
+    private String tempValue;
+    @ApiModelProperty("业务sid")
+    private String busSid;
 
 }

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

@@ -54,8 +54,16 @@ public class BaseVehicleTempstateDto implements Dto {
 
     @ApiModelProperty("车辆sid")
     private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateValue;
     @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
     private String tempStateKey;
+    @ApiModelProperty("业务状态key")
+    private String tempKey;
+    @ApiModelProperty("业务状态value")
+    private String tempValue;
     @ApiModelProperty("业务sid")
     private String busSid;
 

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

@@ -49,12 +49,18 @@ import lombok.Data;
 @ApiModel(value = "车辆临时状态表 视图数据对象", description = "车辆临时状态表 视图数据对象")
 public class BaseVehicleTempstateVo implements Vo {
 
-    private String sid;
-
     @ApiModelProperty("车辆sid")
     private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    private String tempStateValue;
     @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
     private String tempStateKey;
+    @ApiModelProperty("业务状态key")
+    private String tempKey;
+    @ApiModelProperty("业务状态value")
+    private String tempValue;
     @ApiModelProperty("业务sid")
     private String busSid;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -82,4 +82,7 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
+    @ApiModelProperty("申请人的orgSidPath")
+    private String orgSidPath;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -82,4 +82,7 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
+    @ApiModelProperty("申请人orgSidPath")
+    private String orgSidPath;
+
 }

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

@@ -0,0 +1,44 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author hp
+ * @Date 2022/11/17 15:10
+ * @Description 临时状态 持久状态
+ */
+public class VehicleStateTempOrLast {
+    @Getter
+    public static enum PaymentEnum {
+
+        ARREARS_CARRY_VEHICLE("0001", "欠款提车"),
+
+        ARREARS_INVOICING("0004", "欠款开票"),
+
+        PAY_MODELS("0002", "交清车款"),
+
+        BAG_CARD_BUSINESS("0003", "包牌业务"),
+
+        FIN_PAYMENT("0005", "款项确认");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private PaymentEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -150,9 +150,26 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         String sid = scmVehicleActualSalesDto.getSid();
         if (StringUtils.isBlank(sid)) {
             //新增
+            //=======================================
+            String orgSidPath = scmVehicleActualSalesDto.getOrgSidPath();
+            if(StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())){
+                //根据用户sid获取staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
+            //===========================================
             BaseVehicleActualSales baseVehicleActualSales = new BaseVehicleActualSales();
             BeanUtils.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "sid");
             baseVehicleActualSales.setCreateBySid(scmVehicleActualSalesDto.getUserSid());
+            baseVehicleActualSales.setOrgSidPath(orgSidPath);
             boolean isSave = save(baseVehicleActualSales);
             if (!isSave) {
                 return rb.setMsg("保存失败");
@@ -175,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (baseVehicleActualSales == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales);
+            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales,"orgSidPath");
             int i = baseMapper.updateById(baseVehicleActualSales);
             //查询details中是否有关于sales的该条sid数据
             List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);
@@ -326,6 +343,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             }
         }
         //保存或修改未售买断申请
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateVehicleSales(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -443,6 +461,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             appMap.put("sid", bv.getBusinessSid());
             variables.put("app", appMap);
             bv.setFormVariables(variables);
+            bv.setOrgSidPath(baseVehicleActualSales.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -297,6 +297,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         return baseVehicleCertificateService.updateCertificate(dto);
     }
 
+    @Override
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid);
+    }
+
     /**
      * @param sheet      单元格
      * @param resultCell 列表的值

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -4,13 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,6 +37,15 @@ import java.util.List;
 @Service
 public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicleCertificateMapper, BaseVehicleCertificate> {
 
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+
+    @Autowired
+    CommonAppendixService commonAppendixService;
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
     /**
      * 台账信息条件分页查询
      *
@@ -190,4 +207,21 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         int count = baseMapper.updateCertificate(dto);
         return rb.success();
     }
+
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        ResultBean<AppHandoverCertificateInfoVo> rb = ResultBean.fireFail();
+        AppHandoverCertificateInfoVo vo = new AppHandoverCertificateInfoVo();
+        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        BaseVehicleCertificateVo baseVehicleCertificateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, userOrgSid);
+        vo.setVin(vinNo);
+        vo.setDate(baseVehicleCertificateVo.getCertificateDate());
+        vo.setInvoice(baseVehicleCertificateVo.getCertificationNo());
+        List<CommonAppendixVo> appAppendixList = commonAppendixService.getAppAppendixList(baseVehicleCertificateVo.getSid(), "0002");
+        List<String> invoiceImages = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : appAppendixList) {
+            invoiceImages.add(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+        }
+        vo.setInvoiceImages(invoiceImages);
+        return rb;
+    }
 }

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

@@ -220,6 +220,22 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
+            //=======================================
+            String orgSidPath = dto.getOrgSidPath();
+            if(StringUtils.isBlank(orgSidPath)){
+                //根据用户sid获取staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
+            //===========================================
             BusVehicleApply entity = new BusVehicleApply();
             BeanUtil.copyProperties(dto, entity, "sid");
             //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
@@ -227,6 +243,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             String billNo = getApplyCode(dto);
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.today());
+            entity.setOrgSidPath(orgSidPath);
             int i = 0;
             List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
@@ -260,7 +277,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (busVehicleApply == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(dto, busVehicleApply);
+            BeanUtil.copyProperties(dto, busVehicleApply,"orgSidPath");
             busVehicleApplyDetailService.delByApplySid(dto.getSid());
             busVehicleApplySzService.deleteByApplySid(dto.getSid());
             int i = 0;
@@ -364,6 +381,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return rb.setMsg("采购原因不能为空");
         }
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -511,6 +529,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(busVehicleApply.getOrgSidPath());
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

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

@@ -1541,6 +1541,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             unCollectionDto.setVinNo(vinList.get(i).toString());
                             unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
                             unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
                     } else {
@@ -1565,7 +1566,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
                             unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
                             unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
-//                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
                     }

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

@@ -49,4 +49,6 @@ public class AppAdvanceInvoiceDto implements Dto {
     private String taskId;
     @ApiModelProperty("流程实列id")
     private String procInsId;
+    @ApiModelProperty("当前用户部门的全路径")
+    private String orgSidPath;
 }

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

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +27,7 @@ public class AppAdvanceInvoiceInfoVo implements Vo {
     @ApiModelProperty("所有车辆列表")
     private List<AdCarListVo> vinList = new ArrayList<>();
     @ApiModelProperty("欠款金额")
-    private String arrearsMoney;
+    private BigDecimal arrearsMoney;
     @ApiModelProperty("车型")
     private String carModel;
     @ApiModelProperty("开票信息确认书")

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

@@ -13,4 +13,7 @@ public class AppAdvanceInvoicePageQuery implements Query {
 
     @ApiModelProperty("客户名称字段 合同编号字段")
     private String name;
+
+    @ApiModelProperty("状态")
+    private String type;
 }

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

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui_buscenter(销售业务) <br/>
  * File: BusAdvanceGinvoiceapply.java <br/>
@@ -49,27 +51,27 @@ import lombok.Data;
 @TableName("bus_advance_ginvoiceapply")
 public class BusAdvanceGinvoiceapply extends BaseEntity {
     private static final long serialVersionUID = 1L;
-	@ApiModelProperty("创建人接口")
+    @ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("数量")
+    @ApiModelProperty("数量")
     private Integer num; // 数量
-	@ApiModelProperty("欠款金额")
-    private Float arrearsMoney; // 欠款金额
-	@ApiModelProperty("承诺回款日期")
+    @ApiModelProperty("欠款金额")
+    private BigDecimal arrearsMoney; // 欠款金额
+    @ApiModelProperty("承诺回款日期")
     private String returnedMoneyDate; // 承诺回款日期
-	@ApiModelProperty("申请人")
+    @ApiModelProperty("申请人")
     private String applyName; // 申请人
-	@ApiModelProperty("车型")
+    @ApiModelProperty("车型")
     private String carModel; // 车型
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("提前开票原因key")
+    @ApiModelProperty("提前开票原因key")
     private String advGinReasonKey; // 提前开票原因key
-	@ApiModelProperty("提前开票原因value")
+    @ApiModelProperty("提前开票原因value")
     private String advGinReasonValue; // 提前开票原因value
     @ApiModelProperty("选择 手写  key  0 1")
     private String advGinReasonType;
@@ -83,6 +85,9 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
     @ApiModelProperty(value = "用户sid")
     private String createBySid;
 
+    @ApiModelProperty(value = "状态")
+    private String type;
+
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
     @ApiModelProperty(value = "节点id")
@@ -93,4 +98,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty(value = "当前用户部门全路径")
+    private String orgSidPath;
 }

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

@@ -41,4 +41,6 @@ public class AppArrearsCarryDto implements Dto {
     private String procInsId;
     @ApiModelProperty("用户sid")
     private String taskId;
+    @ApiModelProperty("当前用户部门的全路径")
+    private String orgSidPath;
 }

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

@@ -14,4 +14,7 @@ public class AppArrearsCarryVehicleQuery implements Query {
     @ApiModelProperty("客户名称 合同编号")
     private String name;
 
+    @ApiModelProperty("状态")
+    private String type;
+
 }

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

@@ -70,6 +70,9 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     @ApiModelProperty("分公司名称")
     private String useOrgName;
 
+    @ApiModelProperty("状态")
+    private String type;
+
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
     @ApiModelProperty(value = "节点id")
@@ -80,4 +83,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty("当前用户部门的全路径")
+    private String orgSidPath;
 }

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

@@ -98,7 +98,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
     public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto);
 
     @ApiOperation("手机端-删除欠款提车")
-    @GetMapping("/deleteArrearsTakeCar")
+    @DeleteMapping("/deleteArrearsTakeCar")
     @ResponseBody
     public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
 

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

@@ -16,6 +16,9 @@ public enum BuscenterFileEnum {
     ENTRUST("007", "委托提车授权书"),
     ENTRUST_CONFIRM("008", "交车资料确认单"),
     EXIT_TICKET("009", "出门证"),
+    HANDOVER_POLICY("010", "保单照片"),
+    HANDOVER_LICENCE("011", "临时牌照"),
+    HANDOVER_OTHRRDATA("012", "其他资料"),
     ;
 
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java

@@ -54,6 +54,8 @@ public class BusHandoverPrepare extends BaseEntity {
     private String contractNo; // 合同编号
 	@ApiModelProperty("客户名称")
     private String customerName; // 客户名称
+    @ApiModelProperty("客户sid")
+    private String customerSid;
 	@ApiModelProperty("联系电话")
     private String mobile; // 联系电话
 	@ApiModelProperty("品牌")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java

@@ -13,6 +13,8 @@ public class BusHandoverPrepareAddDto implements Dto {
 
     @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
+    @ApiModelProperty("客户Sid")
+    private String customerSid; // 客户名称
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
     @ApiModelProperty("联系电话")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java

@@ -140,5 +140,9 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
 
+    @ApiOperation("提交交车准备信息")
+    @PostMapping("/submitDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean submitDeliveryPlanInfo(@RequestBody AppSubmitHandoverPrepareDto dto);
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java

@@ -128,4 +128,9 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 	public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java

@@ -11,6 +11,8 @@ public class AppCertificateInfoQuery implements Query {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    private String sid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java

@@ -10,10 +10,10 @@ import java.util.List;
 public class AppCertificateInfoVo implements Vo {
     private static final long serialVersionUID = -4673876588141577559L;
 
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("")
     private String invoice;
     @ApiModelProperty("合格证日期")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java

@@ -11,7 +11,6 @@ public class AppInvoicingInfoQuery implements Query {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    private String sid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java

@@ -10,10 +10,10 @@ import java.util.List;
 public class AppInvoicingInfoVo implements Vo {
     private static final long serialVersionUID = 8827030575604891015L;
 
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("发票代码")
     private String invoice;
     @ApiModelProperty("开票日期")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java

@@ -11,10 +11,8 @@ public class AppOtherDataDto implements Dto {
 
     private static final long serialVersionUID = 6765583840451569166L;
 
-    @ApiModelProperty("")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java

@@ -8,10 +8,9 @@ import lombok.Data;
 public class AppOtherDataInfoQuery implements Query {
     private static final long serialVersionUID = 6544083379297436705L;
 
-    @ApiModelProperty("")
+
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java

@@ -10,10 +10,8 @@ import java.util.List;
 public class AppOtherDataInfoVo implements Vo {
     private static final long serialVersionUID = 7178241214019642737L;
 
-    @ApiModelProperty("")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java

@@ -14,10 +14,9 @@ public class AppPolicyDto implements Dto {
     private List<String> policyList;
     @ApiModelProperty("临时牌照")
     private List<String> licenceList;
-    @ApiModelProperty("sid")
+
     private String sid;
-    @ApiModelProperty("车辆照片")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java

@@ -13,7 +13,4 @@ public class AppPolicyInfoQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vin;
-
-    @ApiModelProperty("车辆sid")
-    private String carSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java

@@ -1,4 +1,20 @@
 package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
 
-public class AppPolicyInfoVo {
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppPolicyInfoVo implements Vo {
+    private static final long serialVersionUID = 5449450307167004770L;
+    private String sid;
+
+    @ApiModelProperty("保单照片")
+    private List<String> policyList;
+    @ApiModelProperty("临时牌照")
+    private List<String> licenceList;
+    @ApiModelProperty("车架号")
+    private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppSubmitHandoverPrepareDto implements Dto {
+    private static final long serialVersionUID = 138156532304986357L;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("车辆集合")
+    private List<AppBusHandoverPrepareVehicleDto> carDataList;
+    @ApiModelProperty("记录sid")
+    private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构")
+    private String orgPath;
+    @ApiModelProperty("付款方式")
+    private String payType;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("品牌")
+    private String brand;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java

@@ -13,15 +13,15 @@ public class AppBusHandoverPrepareVehicleDto implements Dto {
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("开票状态")
-    private int invoicingState; // 开票状态
+    private boolean invoicingState; // 开票状态
     @ApiModelProperty("合格证状态")
-    private int certificateState; // 合格证状态
+    private boolean certificateState; // 合格证状态
     @ApiModelProperty("保单状态")
-    private int policyState; // 保单状态
+    private boolean policyState; // 保单状态
     @ApiModelProperty("随车资料状态")
-    private int onBoardDataState; // 随车资料状态
+    private boolean onBoardDataState; // 随车资料状态
     @ApiModelProperty("其他资料状态")
-    private int otherDataState; // 其他资料状态
+    private boolean otherDataState; // 其他资料状态
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("创建组织名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java

@@ -8,6 +8,8 @@ import lombok.Data;
 public class AppBusHandoverPrepareVehicleInfoVo implements Vo {
     private static final long serialVersionUID = 1415137296013613928L;
 
+    @ApiModelProperty("sid")
+    private String sid; // 交车申请表sid
     @ApiModelProperty("交车申请表sid")
     private String mainSid; // 交车申请表sid
     @ApiModelProperty("车架号")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java

@@ -39,6 +39,12 @@ public class BusHandoverWait extends BaseEntity {
     @ApiModelProperty("付款状态value")
     private String payStateValue;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("车型别名")
+    private String modelName;
+
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java

@@ -45,4 +45,7 @@ public class BusHandoverWaitDto implements Dto {
     @ApiModelProperty("车型别名")
     private String modelName;
 
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -228,5 +228,8 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<AppRovalContractPageQuery> pagerQuery);
 
-
+    @ApiOperation("查询该合同下的该辆车架号的车辆sid")
+    @GetMapping("/getVinSidByConSid")
+    @ResponseBody
+    ResultBean<String> getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -203,4 +203,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> getVinSidByConSid(String contractNo, String vinNo) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java

@@ -14,4 +14,7 @@ public class AppRovalContractPageQuery implements Query {
 
     @ApiModelProperty("车架号 客户名称 合同编号")
     private String name;
+
+    @ApiModelProperty("状态")
+    private int stateType;
 }

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -69,4 +70,7 @@ public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper<BusAdvanceGinv
     IPage<AppAdvanceInvoicePageVo> getAdvanceInvoiceList(IPage<AppAdvanceInvoicePageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppAdvanceInvoicePageQuery> qw, @Param("name") String name);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    @Update("update bus_advance_ginvoiceapply set `type` = '2' where sid =#{sid}")
+    void updateType(@Param("sid") String sid);
 }

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

@@ -30,16 +30,20 @@ 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.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceInvoiceTaskQuery;
 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.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto;
@@ -81,6 +85,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -133,6 +138,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
     private CrmCustomerTempFeign crmCustomerTempFeign;
     @Autowired
     private FinBillApplicationFeign finBillApplicationFeign;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     public PagerVo<BusAdvanceGinvoiceapply> listPage(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
         BusAdvanceGinvoiceapplyQuery query = pq.getParams();
@@ -385,6 +392,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         if (StringUtils.isNotBlank(params.getUserSid())) {
             qw.eq("createBySid", params.getUserSid());
         }
+        if (StringUtils.isNotBlank(params.getType())) {
+            qw.eq("type", params.getType());
+        }
         IPage<AppAdvanceInvoicePageQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppAdvanceInvoicePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
         for (AppAdvanceInvoicePageVo record : iPage.getRecords()) {
@@ -408,18 +418,14 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         vo.setContractSid(contractSid);
         List<AdCarListVo> carList = new ArrayList<>();
         List<AdCarListVo> vinList = new ArrayList<>();
-        int arrearsMoney = 0;
         List<BusGinvoiceapplyVehicleDetailsVo> carLists = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid);
         for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : carLists) {
             AdCarListVo adCarListVo = new AdCarListVo();
             adCarListVo.setPrice(vehicleDetailsVo.getDealMoney());
             adCarListVo.setVin(vehicleDetailsVo.getVinNo());
             carList.add(adCarListVo);
-            int dealMoney = Integer.parseInt(vehicleDetailsVo.getDealMoney());
-            arrearsMoney = dealMoney + arrearsMoney;
         }
         vo.setCarList(carList);
-        vo.setArrearsMoney(String.valueOf(arrearsMoney));
         List<AppRovalContractPageVo> vinLists = busSalesOrderService.selectByContractNo(busAdvanceGinvoiceapply.getContractNo());
         if (vinLists.size() > 0) {
             for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
@@ -482,6 +488,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         busAdvanceGinvoiceapply.setApplyName(sysUserVo.getName());
         busAdvanceGinvoiceapply.setApplyDate(sf.format(new Date()));
         busAdvanceGinvoiceapply.setUseOrgName(sysOrganizationVo.getName());
+        BigDecimal arrearsMoney = new BigDecimal(0);
         if (dto.getVinList().size() > 0) {
             for (String vin : dto.getVinList()) {
                 BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
@@ -492,11 +499,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                     busGinvoiceapplyVehicle.setVehicleSid(baseVehicle.getSid());
                 }
                 busGinvoiceapplyVehicle.setDealMoney(price);
+
+                BigDecimal dealMoney = new BigDecimal(busGinvoiceapplyVehicle.getDealMoney());
+                arrearsMoney = dealMoney.add(arrearsMoney);
                 busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
             }
         }
+        busAdvanceGinvoiceapply.setArrearsMoney(arrearsMoney);
         busAdvanceGinvoiceapply.setNum(dto.getVinList().size());
         busAdvanceGinvoiceapply.setCarModel(modelName);
+        busAdvanceGinvoiceapply.setType("1");
         save(busAdvanceGinvoiceapply);
         return rb.success().setData(busAdvanceGinvoiceapply.getSid());
     }
@@ -506,8 +518,17 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
+        if (StringUtils.isBlank(dto.getOrgSidPath())){
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            //用户的组织全路径
+            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            dto.setOrgSidPath(orgSidPath);
+        }
         BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
-        updateById(busAdvanceGinvoiceapply);
         String sid = dto.getContractSid();
         busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
         List<AdCarListDto> carList = dto.getCarList();
@@ -522,6 +543,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
             busGinvoiceapplyVehicle.setDealMoney(adCarListDto.getPrice());
             busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
         }
+        busAdvanceGinvoiceapply.setNum(carList.size());
+        updateById(busAdvanceGinvoiceapply);
         commonAppendixFeign.deleteFiles(dto.getContractSid());
         saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid());
         return rb.success().setData(busAdvanceGinvoiceapply.getSid());
@@ -583,6 +606,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
         int r = submitBusinessData(dto, busAdvanceGinvoiceapply);
         if (r == 3) {
@@ -591,12 +615,23 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        dto.setOrgSidPath(orgSidPath);
         //新增修改保存
         ResultBean<String> resultBean = saveAdvanceInvoice(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        //修改状态
+        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+        baseVehicleTempstateDto.setBusSid(businessSid);
+        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode());
+        List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid());
+        for (BusGinvoiceapplyVehicleDetailsVo busGinvoiceapplyVehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
+            baseVehicleTempstateDto.setVehSid(busGinvoiceapplyVehicleDetailsVo.getVehicleSid());
+            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+        }
+        baseMapper.updateType(busAdvanceGinvoiceapply.getSid());
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -694,6 +729,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getOrgSidPath())) {
+            bv.setOrgSidPath(busAdvanceGinvoiceapply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         if (bv.getTaskId().equals(busAdvanceGinvoiceapply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -727,8 +767,6 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 addInvoicedApplyDto.setApplyDate(busAdvanceGinvoiceapply.getApplyDate());
                 addInvoicedApplyDto.setContractNo(busAdvanceGinvoiceapply.getContractNo());
                 addInvoicedApplyDto.setCustomerName(busAdvanceGinvoiceapply.getCustomerName());
-                addInvoicedApplyDto.setBillTypeKey("001");
-                addInvoicedApplyDto.setBillTypeValue("欠款开票");
                 addInvoicedApplyDto.setUseOrgSid(busAdvanceGinvoiceapply.getUseOrgSid());
                 addInvoicedApplyDto.setCreateBySid(bv.getUserSid());
                 List<AppVinListDto> vinList = new ArrayList<>();
@@ -736,6 +774,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
                     AppVinListDto appVinListDto = new AppVinListDto();
                     appVinListDto.setVIN(vehicleDetailsVo.getVinNo());
+                    appVinListDto.setBillTypeKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode());
+                    appVinListDto.setBillTypeValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getRemarks());
                     vinList.add(appVinListDto);
                 }
                 addInvoicedApplyDto.setVinList(vinList);
@@ -798,6 +838,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getOrgSidPath())) {
+            bv.setOrgSidPath(busAdvanceGinvoiceapply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -850,8 +895,6 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 addInvoicedApplyDto.setApplyDate(busAdvanceGinvoiceapply.getApplyDate());
                 addInvoicedApplyDto.setContractNo(busAdvanceGinvoiceapply.getContractNo());
                 addInvoicedApplyDto.setCustomerName(busAdvanceGinvoiceapply.getCustomerName());
-                addInvoicedApplyDto.setBillTypeKey("001");
-                addInvoicedApplyDto.setBillTypeValue("欠款开票");
                 addInvoicedApplyDto.setUseOrgSid(busAdvanceGinvoiceapply.getUseOrgSid());
                 addInvoicedApplyDto.setCreateBySid(bv.getUserSid());
                 List<AppVinListDto> vinList = new ArrayList<>();
@@ -859,6 +902,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
                     AppVinListDto appVinListDto = new AppVinListDto();
                     appVinListDto.setVIN(vehicleDetailsVo.getVinNo());
+                    appVinListDto.setBillTypeKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode());
+                    appVinListDto.setBillTypeValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getRemarks());
                     vinList.add(appVinListDto);
                 }
                 addInvoicedApplyDto.setVinList(vinList);

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

@@ -74,4 +74,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
      * @return
      */
     int updateFlowFiled(Map<String, Object> map);
+
+    void updateType(@Param("businessSid") String businessSid);
 }

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

@@ -98,4 +98,10 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <update id="updateType">
+        update bus_arrears_carry_vehicle_apply
+        set `type` = '2'
+        where sid = #{businessSid}
+    </update>
 </mapper>

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

@@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
@@ -23,6 +26,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService;
 import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
@@ -30,6 +34,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -129,6 +135,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
     @Autowired
     private BusDeliveredService busDeliveredService;
 
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
+
     /**
      * 欠款提车分页列表查询条件
      *
@@ -452,6 +464,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (StringUtils.isNotBlank(params.getUserSid())) {
             qw.eq("createBySid", params.getUserSid());
         }
+        if (StringUtils.isNotBlank(params.getType())) {
+            qw.eq("type", params.getType());
+        }
         IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
         return iPage;
@@ -554,8 +569,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         busArrearsCarryVehicleApply.setCustomerName(customerName);// 客户名称
         busArrearsCarryVehicleApply.setContractNo(contractNo);// 合同编号
         busArrearsCarryVehicleApply.setContractMoney(new BigDecimal(contractAmount));//合同总金额
-//        busArrearsCarryVehicleApply.setContractCollectionMoney(new BigDecimal());//合同收款金额
-//        busArrearsCarryVehicleApply.setArrearsMoney();//欠款金额
+        busArrearsCarryVehicleApply.setType("1");
+        AppBusArrearsCarryMoneyVo appBusArrearsCarryMoneyVo = finCollectionConfirmationFeign.selectArrearsMoneyOrCollectionMoney(contractNo).getData();
+        if (appBusArrearsCarryMoneyVo != null) {
+            busArrearsCarryVehicleApply.setContractCollectionMoney(appBusArrearsCarryMoneyVo.getContractCollectionMoney());//合同收款金额
+            busArrearsCarryVehicleApply.setArrearsMoney(appBusArrearsCarryMoneyVo.getArrearsMoney());//欠款金额
+        }
         // 添加欠款提车 车辆表数据
         if (dto.getVinList().size() > 0) {
             List<String> vinList = dto.getVinList();
@@ -587,8 +606,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         ResultBean rb = ResultBean.fireFail();
         // 取出分公司sid
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        // 取出当前登录用户信息
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        if (StringUtils.isBlank(dto.getOrgSidPath())){
+            // 取出当前登录用户信息
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            //用户的组织全路径
+            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            dto.setOrgSidPath(orgSidPath);
+        }
         //根据申请sid查询数据
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
         BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply);
@@ -631,6 +660,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
         int r = submitBusinessData(dto, busArrearsCarryVehicleApply);
         if (r == 3) {
@@ -645,6 +675,16 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+
+        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+        baseVehicleTempstateDto.setBusSid(businessSid);
+        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+        List<BusArrearsCarryVehicleDetailsVo> busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
+        for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) {
+            baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid());
+            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+        }
+        baseMapper.updateType(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -742,6 +782,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
+            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -770,6 +815,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
                 List<String> recipientSidList = new ArrayList<>();
 
+                //修改状态
+                baseMapper.updateType(bv.getBusinessSid());
+
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -780,10 +828,15 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         if (baseVehicleSelectVo != null) {
                             addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName());
                         }
-
                         addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney()));
                         addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
                         addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName());
+
+                        BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getByContractNo(busArrearsCarryVehicleApply.getContractNo());
+                        addRetrievalApplyDto.setPaymentMethod(busSalesOrderDetailsVo.getPayType());// 付款方式
+                        addRetrievalApplyDto.setPaymentMethodKey(busSalesOrderDetailsVo.getPayTypeKey());// 付款方式
+                        addRetrievalApplyDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); // 款项状态
+                        addRetrievalApplyDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());// 款项状态
                         busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
                     }
                 }
@@ -851,6 +904,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
+            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -899,6 +957,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
                 List<String> recipientSidList = new ArrayList<>();
 
+                //修改状态
+                baseMapper.updateType(bv.getBusinessSid());
+
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -909,6 +970,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         if (baseVehicleSelectVo != null) {
                             addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName());
                         }
+                        BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getByContractNo(busArrearsCarryVehicleApply.getContractNo());
+                        addRetrievalApplyDto.setPaymentMethod(busSalesOrderDetailsVo.getPayType());// 付款方式
+                        addRetrievalApplyDto.setPaymentMethodKey(busSalesOrderDetailsVo.getPayTypeKey());// 付款方式
+                        addRetrievalApplyDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); // 款项状态
+                        addRetrievalApplyDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());// 款项状态
                         addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney()));
                         addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
                         addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName());

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

@@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.buscenterfile;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,9 +15,12 @@ import java.util.List;
  */
 @Mapper
 public interface BuscenterFileMapper extends BaseMapper<BuscenterFile> {
-    List<BuscenterFile> selectByLinkSid(@Param("sid") String sid, @Param("attachType")String attachType);
+    List<BuscenterFile> selectByLinkSid(@Param("sid") String sid, @Param("attachType") String attachType);
 
     int deleteByLinkSid(String sid);
 
     BuscenterFile selectByLinkSidOne(@Param("sid") String sid, @Param("attachType") String attachType);
+
+    @Delete("delete from buscenter_file where linkSid = #{sid} and attachType = #{attachType}")
+    void delByLinkSidOrType(@Param("sid") String sid, @Param("attachType") String attachType);
 }

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

@@ -48,4 +48,8 @@ public class BuscenterFileService extends MybatisBaseService<BuscenterFileMapper
     public BuscenterFile selectByLinkSidOne(String sid, String attachType) {
         return baseMapper.selectByLinkSidOne(sid, attachType);
     }
+
+    public void delByLinkSidOrType(String sid, String attachType) {
+        baseMapper.delByLinkSidOrType(sid,attachType);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@@ -158,4 +158,9 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
     public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
         return busHandoverPrepareService.getDeliveryPlanInfoDetail(query);
     }
+
+    @Override
+    public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
+        return busHandoverPrepareService.submitDeliveryPlanInfo(dto);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -28,15 +28,27 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
+import com.yxt.anrui.base.api.basevehiclecertificate.AppHandoverCertificateInfoVo;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign;
+import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
+import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
 import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -47,6 +59,7 @@ 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.List;
 
 /**
@@ -70,6 +83,16 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private FinBillVehicleFeign finBillVehicleFeign;
+    @Autowired
+    BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BuscenterFileService buscenterFile;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusHandoverWaitService busHandoverWaitService;
 
     private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -182,27 +205,70 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         ResultBean<AppInvoicingInfoVinNoVo> resultBean = finBillVehicleFeign.selDetailsByVinNo(vin);
         AppInvoicingInfoVinNoVo data = resultBean.getData();
         BeanUtil.copyProperties(data, vo);
+        vo.setVin(vin);
         return rb.success().setData(vo);
     }
 
     public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
-        return null;
+        ResultBean<AppCertificateInfoVo> rb = new ResultBean();
+        AppCertificateInfoVo vo = new AppCertificateInfoVo();
+        String vinNo = query.getVin();
+        String userSid = query.getUserSid();
+        ResultBean<AppHandoverCertificateInfoVo> resultBean = baseVehicleCertificateFeign.getCertificateInfo(vinNo, userSid);
+        AppHandoverCertificateInfoVo data = resultBean.getData();
+        BeanUtil.copyProperties(data, vo);
+        vo.setVin(vinNo);
+        return rb.success().setData(vo);
     }
 
     public ResultBean<AppPolicyInfoVo> getPolicyInfo(AppPolicyInfoQuery query) {
-        return null;
+        ResultBean<AppPolicyInfoVo> rb = new ResultBean<>();
+        AppPolicyInfoVo vo = new AppPolicyInfoVo();
+        List<String> policyList = new ArrayList<>();// 保单照片
+        List<String> licenceList = new ArrayList<>();// 临时牌照
+        List<BuscenterFile> policyFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        for (BuscenterFile file : policyFiles) {
+            policyList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+        }
+        List<BuscenterFile> licenceFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        for (BuscenterFile file : licenceFiles) {
+            licenceList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+        }
+        vo.setPolicyList(policyList);
+        vo.setLicenceList(licenceList);
+        vo.setSid(query.getSid());
+        vo.setVin(query.getVin());
+        return rb.success().setData(vo);
     }
 
     public ResultBean savePolicyInfo(AppPolicyDto dto) {
-        return null;
+        ResultBean rb = new ResultBean<>();
+        buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        buscenterFile.saveAll(dto.getSid(), dto.getPolicyList(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        buscenterFile.saveAll(dto.getSid(), dto.getLicenceList(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        return rb.success();
     }
 
     public ResultBean<AppOtherDataInfoVo> getOtherDataInfo(AppOtherDataInfoQuery query) {
-        return null;
+        ResultBean<AppOtherDataInfoVo> rb = new ResultBean<>();
+        AppOtherDataInfoVo vo = new AppOtherDataInfoVo();
+        List<BuscenterFile> otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        List<String> otherInfo = new ArrayList<>();
+        for (BuscenterFile file : otherFiles) {
+            otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+        }
+        vo.setOtherInfo(otherInfo);
+        vo.setSid(query.getSid());
+        vo.setVin(query.getVin());
+        return rb.success().setData(vo);
     }
 
     public ResultBean saveOtherDataInfo(AppOtherDataDto dto) {
-        return null;
+        ResultBean rb = new ResultBean<>();
+        buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        buscenterFile.saveAll(dto.getSid(), dto.getOtherInfo(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        return rb.success();
     }
 
     public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) {
@@ -225,6 +291,51 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     }
 
     public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
-        return null;
+        ResultBean<AppBusHandoverPrepareInfoVo> rb = ResultBean.fireFail();
+        String sid = query.getSid();
+        AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo();
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(sid);
+        BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo);
+        List<AppBusHandoverPrepareVehicleInfoVo> list = busHandoverPrepareVehicleService.selByMainSid(sid);
+        appBusHandoverPrepareInfoVo.setCarDataList(list);
+        appBusHandoverPrepareInfoVo.setUserSid(query.getUserSid());
+        return rb.success().setData(appBusHandoverPrepareInfoVo);
+    }
+
+    public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid());
+        BeanUtil.copyProperties(dto, busHandoverPrepare);
+        List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
+        if (handoverPrepareVehicleDtos.size() > 0) {
+            String sid = dto.getSid();
+            busHandoverPrepareVehicleService.deleteByMainSid(sid);
+            for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+                BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
+                busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+
+                BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto();
+                busHandoverWaitDto.setContractNo(busHandoverPrepare.getContractNo());
+                busHandoverWaitDto.setCustomerName(busHandoverPrepare.getCustomerName());
+                busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid());
+                busHandoverWaitDto.setVinNo(handoverPrepareVehicleDto.getVinNo());
+                BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(handoverPrepareVehicleDto.getVinNo(), busHandoverPrepare.getUseOrgSid()).getData();
+                if (data!=null){
+                    busHandoverWaitDto.setVinSid(data.getSid());
+                    busHandoverWaitDto.setModelSid(data.getModelSid());
+                    busHandoverWaitDto.setModelName(data.getModelName());
+                }
+                busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid());
+                busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey());
+                busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType());
+                busHandoverWaitService.saveAll(busHandoverWaitDto);
+            }
+        }
+        busHandoverPrepare.setHandoverPrepareState("已准备");
+        busHandoverPrepare.setHandoverPrepareStateKey("2");
+        updateById(busHandoverPrepare);
+        return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java

@@ -67,19 +67,19 @@ public interface BusHandoverPrepareVehicleMapper extends BaseMapper<BusHandoverP
     List<AppBusHandoverPrepareVehicleInfoVo> selByMainSid(@Param("sid") String sid);
 
 
-    @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where mainSid = #{sid} and vinNo = #{vin}")
+    @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where sid = #{sid} and vinNo = #{vin}")
     void saveInvoiceState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set  certificateState = 1 where mainSid = #{sid} and vinNo = #{vin} ")
+    @Update("update bus_handover_prepare_vehicle set  certificateState = 1 where sid = #{sid} and vinNo = #{vin} ")
     void saveCertificateState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set policyState = 1 where mainSid = #{sid} and vinNo = #{vin}  ")
+    @Update("update bus_handover_prepare_vehicle set policyState = 1 where sid = #{sid} and vinNo = #{vin}  ")
     void savePolicyState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set  onBoardDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ")
+    @Update("update bus_handover_prepare_vehicle set  onBoardDataState = 1 where sid = #{sid} and vinNo = #{vin} ")
     void saveOnBoardState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where mainSid = #{sid} and vinNo = #{vin}  ")
+    @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where sid = #{sid} and vinNo = #{vin}  ")
     void saveOtherDataState(@Param("sid") String sid, @Param("vin") String vin);
 
     @Delete("delete from bus_handover_prepare_vehicle where mainSid = #{sid}")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml

@@ -16,7 +16,8 @@
     </select>
     <select id="selByMainSid"
             resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo">
-        select mainSid,
+        select sid,
+               mainSid,
                vinNo,
                invoicingState   as invoicingStateb,
                certificateState as certificateStateb,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -134,7 +134,7 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
 
     int updateByNodeState(@Param("nodeState") String nodeState, @Param("businessSid") String businessSid);
 
-    IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("name") String name);
+    IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("names") String names);
 
     String selectNum(String bill);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -57,10 +57,11 @@
                 , #{name}
                 , '%')
             </if>
-        </where> order by bmd.id desc ) a
+        </where>
+        order by bmd.id desc ) a
         <if test="name != '' and name != null">
             UNION ALL
-           select * from( SELECT
+            select * from( SELECT
             bmd.sid AS virtualOrderSid,
             bmd.billNo AS virtualOrderId,
             bmd.createDate AS virtualOrderDate,
@@ -80,7 +81,8 @@
                     , #{name}
                     , '%')
                 </if>
-            </where> order by bmd.id desc ) b
+            </where>
+            order by bmd.id desc ) b
             UNION ALL
             select * from( SELECT
             bmd.sid AS virtualOrderSid,
@@ -102,7 +104,8 @@
                     , #{name}
                     , '%')
                 </if>
-            </where> order by bmd.id desc ) c
+            </where>
+            order by bmd.id desc ) c
         </if>
     </select>
 
@@ -308,11 +311,14 @@
         left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid
         <where>
             ${ew.sqlSegment}
-            <if test="name != null and name != ''">
-                and concat(bd.billNo
-                , bc.customerName
-                , bc.customerMobile) LIKE concat('%'
-                , #{name}
+            <if test="names != null and names != ''">
+                and concat(IFNULL(bd.billNo
+                , '')
+                , ifnull(bc.customerName
+                , '')
+                , ifnull(bc.customerMobile
+                , '')) LIKE concat('%'
+                , #{names}
                 , '%')
             </if>
         </where>
@@ -344,6 +350,8 @@
     </select>
 
     <update id="updateModify">
-        update bus_main_deposit set modifyTime = #{date} where sid = #{sid}
+        update bus_main_deposit
+        set modifyTime = #{date}
+        where sid = #{sid}
     </update>
 </mapper>

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

@@ -178,4 +178,9 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     IPage<AppRovalContractPageVo> getApprovalContractList(IPage<AppRovalContractPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppRovalContractPageVo> qw, @Param("name") String name);
 
     List<AppRovalContractPageVo> selectByContractNo(@Param("contractNo") String contractNo);
+
+
+    BusSalesOrderDetailsVo getByContractNo(String contractNo);
+
+    String getVinsidByConSid(@Param("contractNo") String contractNo, @Param("vinNo") String vinNo);
 }

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

@@ -244,13 +244,14 @@
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bo.contractNo
-                , '')
-                , ifnull(bo.customerName
-                , '')) LIKE concat('%'
-                , #{name}
-                , '%')
+                  , '')
+                  , ifnull(bo.customerName
+                  , '')) LIKE concat('%'
+                  , #{name}
+                  , '%')
             </if>
-              and length(bo.contractNo) > 1
+            and length(bo.contractNo)
+              > 1
         </where>
     </select>
     <select id="selectByContractNo"
@@ -263,4 +264,17 @@
                  LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         WHERE bo.contractNo = #{contractNo}
     </select>
+    <select id="getByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo">
+        SELECT *
+        FROM bus_sales_order bo
+        WHERE bo.contractNo = #{contractNo}
+    </select>
+
+    <select id="getVinsidByConSid" resultType="java.lang.String">
+        select linkSid
+        from bus_sales_order_vehicle bv
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bo.contractNo = #{contractNo}
+          and bv.linkNo = #{vinNo}
+    </select>
 </mapper>

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

@@ -280,4 +280,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         PagerVo<AppRovalContractPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppRovalContractPageVo>>().success().setData(pagerVo);
     }
+
+    @Override
+    public ResultBean<String> getVinSidByConSid(String contractNo, String vinNo) {
+        return busSalesOrderService.getVinSidByConSid(contractNo,vinNo);
+    }
 }

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

@@ -42,6 +42,8 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
@@ -53,6 +55,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
@@ -232,6 +235,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BusDepositService busDepositService;
     @Autowired
     private BusDepositVehicleService busDepositVehicleService;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     /**
      * 构造查询条件
@@ -2851,6 +2856,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
         QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
         qw.eq("bo.staffSid", sysUserVo.getStaffSid());
+        List<String> vinList = new ArrayList();
+        if (params.getStateType() == 1) {
+            List<BaseVehicleTempstateVo> data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+            for (BaseVehicleTempstateVo datum : data) {
+                BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData();
+                vinList.add(vehicleSelectVo.getVinNo());
+            }
+        } else if (params.getStateType() == 2) {
+            List<BaseVehicleTempstateVo> data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()).getData();
+            for (BaseVehicleTempstateVo datum : data) {
+                BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData();
+                vinList.add(vehicleSelectVo.getVinNo());
+            }
+        }
+        if (vinList.size() > 0) {
+            qw.notIn("bsov.linkNo", vinList);
+        }
         IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppRovalContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw, params.getName());
         for (AppRovalContractPageVo record : iPage.getRecords()) {
@@ -2868,4 +2890,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<AppRovalContractPageVo> list = baseMapper.selectByContractNo(contractNo);
         return list;
     }
+
+    public BusSalesOrderDetailsVo getByContractNo(String contractNo) {
+        BusSalesOrderDetailsVo vo = baseMapper.getByContractNo(contractNo);
+        return vo;
+    }
+
+    public ResultBean<String> getVinSidByConSid(String contractNo, String vinNo) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String vinSid = baseMapper.getVinsidByConSid(contractNo, vinNo);
+        if (StringUtils.isBlank(vinSid)) {
+            return rb.setData("");
+        }
+        return rb.success().setData(vinSid);
+    }
 }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@@ -109,7 +109,7 @@
         </div>
       </div>
     </div>
-    <acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState"/>
+    <acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <acknowledgementReceiptInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
@@ -183,7 +183,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: ''
+          createBySid: '',
+          state: ''
         },
         total: 0
       }
@@ -242,6 +243,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.state = 0
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.code === '200') {
@@ -266,7 +268,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: ''
+          createBySid: '',
+          state: ''
         },
         total: 0
       }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -555,13 +555,14 @@ export default {
         this.submitdisabled = false
         if (resp.code === '200') {
           this.$message({ showClose: true, type: 'success', message: resp.msg })
-          this.handleReturn()
+          this.handleReturn('true')
         }
       }).catch(() => {
         this.submitdisabled = false
       })
     },
-    handleReturn() {
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
         sid: '',
         createByName: window.sessionStorage.getItem('name'),
@@ -579,10 +580,18 @@ export default {
         remittanceConfirmationUrl: '',
         balance: '',
         useOrgSid: '',
+        userSid: '',
         finSelectedReceivablesDetaileds: [],
         paymentVoucherAppendixs: [],
         remittanceConfirmationAppendixs: []
       }
+      this.listQuery = {
+        contractNo: '',
+        customerName: '',
+        customerPhone: '',
+        sids: [],
+        createBySid: ''
+      }
       this.list1 = []
       this.list2 = []
       this.forbidden = false

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@@ -166,7 +166,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: window.sessionStorage.getItem('staffSid')
+          createBySid: '',
+          state: ''
         },
         total: 0
       }
@@ -208,6 +209,8 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.state = 1
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.code === '200') {
@@ -231,7 +234,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: window.sessionStorage.getItem('staffSid')
+          createBySid: '',
+          state: ''
         },
         total: 0
       }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue

@@ -157,11 +157,11 @@
             {{ scope.row.subscriptionDate }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState == 3 ? '已审核' : '其他' }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="状态" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState == 3 ? '已审核' : '其他' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
     </div>
   </div>
@@ -222,23 +222,20 @@ export default {
             type: 'success'
             }
           )
-          this.handleReturn()
+          this.handleReturn('true')
         }
       })
     },
     handReject() {
       cashierReject({ sid: this.sid }).then((res) => {
         if (res.code === '200') {
-          this.message({
-              showClose: true,
-              message: '已驳回',
-              type: 'success'
-            }
+          this.message({ showClose: true, message: '已驳回', type: 'success' }
           )
         }
       })
     },
-    handleReturn() {
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {}
       this.list1 = []
       this.list2 = []

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -96,7 +96,6 @@
         SELECT *, emergencyMobile AS mobile2
         FROM crm_customer_temp
         WHERE sid = #{sid}
-          AND staffSid = #{staffSid}
     </select>
     <!--根据客户的手机号以及当前登录者所在部门的sid查询该部门内是否有重复的-->
     <select id="selectByMobile" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java

@@ -49,7 +49,7 @@ public interface CrmVisitMapper extends BaseMapper<CrmVisit> {
     @Update("update crm_visit set follow_state=#{followState}, follow_state_key=#{followStateKey} where sid=#{sid} limit 1")
     int updateAppFollowState(@Param("sid") String sid, @Param("followState") String followState, @Param("followStateKey") String followStateKey);
 
-    @Select("select * from crm_visit where customerSid=#{customerSid} and staffSid=#{staffSid} order by id desc ")
+    @Select("select * from crm_visit where customerSid=#{customerSid} order by id desc ")
     List<CrmVisitVo> selectListByCustomerSid(@Param("customerSid") String customerSid, @Param("staffSid") String staffSid);
 
     IPage<CrmVisitVo> pagerList(IPage<CrmVisitQuery> page, @Param(Constants.WRAPPER) Wrapper<CrmVisitVo> qw);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml

@@ -113,7 +113,6 @@
                positionInformation AS address
         from crm_visit
         where customerSid = #{sid}
-          and staffSid = #{staffSid}
         order by id desc LIMIT 0,1
     </select>
 

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

@@ -19,12 +19,6 @@ public class AddInvoicedApplyDto implements Dto {
     @ApiModelProperty("申请日期")
     private String applyDate;
 
-    @ApiModelProperty("开票类型key")
-    private String billTypeKey;
-
-    @ApiModelProperty("开票类型value")
-    private String billTypeValue;
-
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 

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

@@ -89,6 +89,7 @@ public class FinBillApplication extends BaseEntity {
     private String nodeState;
     @ApiModelProperty(value = "是否延迟开票")
     private Integer isDelayBill;
-
+    @ApiModelProperty("当前用户部门全路径")
+    private String orgSidPath;
     private String taskId;
 }

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

@@ -93,6 +93,8 @@ public class FinBillApplicationDto implements Dto {
     private String isHighAndLowOpen;
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("当前用户部门全路径")
+    private String orgSidPath;
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
     @ApiModelProperty("客户开票申请书附件信息")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@@ -51,6 +51,8 @@ import java.util.List;
 @Data
 public class FinCollectionConfirmationDetailsVo implements Vo {
 
+    @ApiModelProperty("sid")
+    private String sid;
     
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@@ -81,8 +81,8 @@ public class FinCollectionConfirmationDto implements Dto {
     private String paymentVoucherUrl; // 打款凭证Url
 	@ApiModelProperty("汇款确认书Url")
     private String remittanceConfirmationUrl; // 汇款确认书Url
-	@ApiModelProperty("余额")
-    private String balance; // 余额
+/*	@ApiModelProperty("余额")
+    private String balance;*/
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("备注")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -25,12 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -121,5 +123,9 @@ public interface FinCollectionConfirmationFeign {
     @GetMapping("/billeNoList")
     ResultBean<List<String>> billeNoList();
 
+    @ApiOperation("欠款提车-查询欠款金额及收款金额")
+    @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}")
+    ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo);
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -126,4 +127,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<List<String>> billeNoList() {
         return null;
     }
+
+    @Override
+    public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@@ -66,6 +66,6 @@ public class FinCollectionConfirmationVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
     private Integer auditState; // 审核状态
-    /*@ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
-    private Integer subscriptionState; // 审核状态*/
+    @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
+    private Integer subscriptionState; // 审核状态
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AppBusArrearsCarryMoneyVo implements Vo {
+    private static final long serialVersionUID = 315129249938477010L;
+
+    @ApiModelProperty("合同金额")
+    private BigDecimal contractAmount;
+
+    @ApiModelProperty("收款总金额")
+    private BigDecimal contractCollectionMoney;
+
+    @ApiModelProperty("欠款金额")
+    private BigDecimal arrearsMoney;
+
+    @ApiModelProperty("收款金额")
+    private BigDecimal subscriptionMoney;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java

@@ -55,4 +55,7 @@ public class AppFinPaymentApplyVo implements Vo {
 
     private String sid;
 
+    @ApiModelProperty("品牌")
+    private String brand;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java

@@ -82,4 +82,7 @@ public class FinSelectedReceivablesDetailed extends BaseEntity {
 	private Integer auditState; // 审核状态
 	@ApiModelProperty("审核时间")
 	private String auditDate; // 审核时间
+
+	@ApiModelProperty("应收未收sid")
+	private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@@ -78,4 +78,7 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
     private String subscriptionDate; // 认款申请日期
 	@ApiModelProperty("收款确认单sid")
     private String collSid; // 收款确认单sid
+
+    @ApiModelProperty("应收未收款项sid")
+    private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java

@@ -82,4 +82,7 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
     
 	@ApiModelProperty("当前应收金额")
     private BigDecimal currentReceivableMoney; // 当前应收金额
+
+    @ApiModelProperty("应收金额（不变）")
+    private String reveivableMoney;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java

@@ -49,4 +49,8 @@ public class UnCollectionDto implements Dto {
     @ApiModelProperty("用户sid:创建人")
     private String userSid;
 
+
+    @ApiModelProperty("应收金额（不变）")
+    private String reveivableMoney;
+
 }

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

@@ -78,7 +78,6 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -200,6 +199,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dto.getOrgSidPath())) {
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            //用户的组织全路径
+            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            dto.setOrgSidPath(orgSidPath);
+        }
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
         List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
         List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
@@ -686,6 +700,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         appMap.put("contractSid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(finBillApplication.getOrgSidPath());
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -868,6 +883,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         FinBillApplication finBillApplication = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, finBillApplication);
         if (r == 3) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -100,4 +101,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
 
 
     List<AppCollectionConfirmationStateVo> selectByState();
+
+    int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -86,4 +86,8 @@
                  left join fin_selected_receivables_detailed fsrd on fcc.sid = fsrd.collSid
         where fcc.auditState = 1
     </select>
+
+    <update id="updateBalanceBySid">
+        update fin_collection_confirmation set balance = #{balanceBigDecimal} where sid = #{sid}
+    </update>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.utils.PagerUtil;
@@ -199,4 +200,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean<List<String>> billeNoList() {
         return finCollectionConfirmationService.billNoList();
     }
+
+    @Override
+    public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
+        return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -28,11 +28,19 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
-import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
+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.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
@@ -95,15 +103,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private CommonContractFeign commonContractFeign;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
         qw.eq("useOrgSid", query.getUseOrgSid());
-        if (StringUtils.isNotBlank(query.getCreateBySid())) {
-            qw.eq("createBySid", query.getCreateBySid());
-        }
         String collectionStartDate = query.getCollectionStartDate();
         String collectionEndDate = query.getCollectionEndDate();
         qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
@@ -118,6 +131,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (StringUtils.isNotBlank(query.getSubscriptionState())) {
             qw.eq("paymentState", query.getSubscriptionState());
         }
+        //0是申请管理的，1是出纳款项管理
+        if (StringUtils.isNotBlank(query.getState())) {
+            if ("0".equals(query.getState())) {
+                qw.eq("pushMessgae", 0);
+                if (StringUtils.isNotBlank(query.getCreateBySid())) {
+                    qw.eq("createBySid", query.getCreateBySid());
+                }
+            }
+        }
         return qw;
     }
 
@@ -141,7 +163,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
             }
         }*/
-        //根据业务员sid查询分公司sid
+        //根据用户sid查询分公司sid
         String createBySid = query.getCreateBySid();
         String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
         query.setUseOrgSid(userOrgSid);
@@ -183,7 +205,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
         List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
-        CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+
         List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
         if (paymentVoucherAppendixs.size() == 0) {
             return rb.setMsg("请上传打款凭证附件");
@@ -192,9 +214,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (remittanceConfirmationAppendixs.size() == 0) {
             return rb.setMsg("请上传汇款确认书附件");
         }
-        String sid1 = finCollectionConfirmation.getSid();
-        BeanUtil.copyProperties(dto, finCollectionConfirmation);
-        finCollectionConfirmation.setSid(sid1);
+        //款项申请主表sid
+        String sid = finCollectionConfirmation.getSid();
+        BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
+//        finCollectionConfirmation.setSid(sid1);
         String payFilePath = "";
         String remFilePath = "";
        /* String staffSid = dto.getStaffSid();
@@ -215,16 +238,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
             }
         }*/
+        //用户sid
         String createBySid = dto.getUserSid();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
         finCollectionConfirmation.setCreateBySid(createBySid);
         finCollectionConfirmation.setUseOrgSid(useOrgSid);
+        //附件进行保存
         for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
+            CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
             BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
             String s = commonAppendixDto.getFilePath();
             if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 s = s.replace(fileUploadComponent.getUrlPrefix(), "");
-                commonAppendixDto.setLinkSid(sid1);
+                commonAppendixDto.setLinkSid(sid);
                 commonAppendixDto.setFilePath(s);
                 commonAppendixDto.setCreateBySid(dto.getStaffSid());
                 commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
@@ -234,27 +260,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         finCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
         for (FinCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
+            CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
             BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto);
             String s = commonAppendixDto.getFilePath();
             if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 s = s.replace(fileUploadComponent.getUrlPrefix(), "");
-                commonAppendixDto.setLinkSid(sid1);
+                commonAppendixDto.setLinkSid(sid);
                 commonAppendixDto.setFilePath(s);
                 commonAppendixDto.setCreateBySid(dto.getStaffSid());
-                commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
                 commonAppendixFeign.save(commonAppendixDto);
             }
             remFilePath += s + ",";
         }
         finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
         for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) {
+            //已选
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
             BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed);
-            finSelectedReceivablesDetailed.setCollSid(sid1);
+            //主表sid
+            finSelectedReceivablesDetailed.setCollSid(sid);
+            //设置审核状态为待审核
             finSelectedReceivablesDetailed.setAuditState(1);
+            finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid);
             finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
+            //添加已选车架号为临时状态
+            BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+            baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
+            baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
+            baseVehicleTempstateDto.setTempKey("1");
+            baseVehicleTempstateDto.setTempValue("待审核");
+            baseVehicleTempstateDto.setBusSid(sid);
+            //根据合同编号和车架号查询该合同的车辆sid
+            ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailedDto.getContractNo(), finSelectedReceivablesDetailedDto.getVIN());
+            if (resultBean.getSuccess()) {
+                baseVehicleTempstateDto.setVehSid(resultBean.getData());
+            }
+            ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
             //已选应收款项-车架号
-            String vin = finSelectedReceivablesDetailed.getVIN();
+           /* String vin = finSelectedReceivablesDetailed.getVIN();
             //已选应收款项-应收项目名称
             String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
             FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
@@ -262,6 +306,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
             //已选应收款项-认款金额
             BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
+            if (subscriptionMoney == null) {
+                return rb.setMsg("请输入认款金额");
+            }
             BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
             if (subtract.compareTo(BigDecimal.ZERO) < 0) {
                 return rb.setMsg("认款金额超出应收金额，请重新输入");
@@ -269,20 +316,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
             FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
             BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
-            finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
+            finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());*/
         }
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1);
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
         BigDecimal totalSubscriptionMone = new BigDecimal(0);
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
             BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
             totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney);
         }
+        //收款金额
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
-        BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
-        if (subtract.compareTo(BigDecimal.ZERO) < 0) {
+//        BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
+       /* if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
-        }
-        finCollectionConfirmation.setBalance(subtract);
+        }*/
+//        finCollectionConfirmation.setBalance(collectionMoney);
+        FinCollectionConfirmation confirmation = fetchBySid(dto.getSid());
+        finCollectionConfirmation.setBalance(confirmation.getBalance());
         finCollectionConfirmation.setAuditState(1);
         finCollectionConfirmation.setPaymentState(1);
         save(finCollectionConfirmation);
@@ -293,13 +343,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo();
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
-        FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
-        FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
-        ArrayList<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
-        ArrayList<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
-        String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl();
-        String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();
-        String[] split1 = remittanceConfirmationUrl.split(",");
+        BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
+
+        List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
+        List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
+       /* String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl();
+        String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();*/
+      /*  String[] split1 = remittanceConfirmationUrl.split(",");
         String[] split = paymentVoucherUrl.split(",");
         BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
         for (String s : split) {
@@ -311,9 +361,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BeanUtil.copyProperties(data, paymentVoucherAppendixVo);
             paymentVoucherAppendixVo.setFilePath(filePath);
             paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
+        }*/
+        CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+        commonAppendixSelectQuery.setLinkSid(sid);
+        //打款凭证附件
+        commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+        ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
+        if (listResultBean.getSuccess()) {
+            for (CommonAppendixVo commonApp : listResultBean.getData()) {
+                FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
+                commonApp.setFilePath(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath());
+                BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo);
+                paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
+            }
         }
         finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs);
-        for (String s : split1) {
+      /*  for (String s : split1) {
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
             String filePath = data.getFilePath();
@@ -322,6 +385,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BeanUtil.copyProperties(data, remittanceConfirmationAppendixVo);
             remittanceConfirmationAppendixVo.setFilePath(filePath);
             remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
+        }*/
+        commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+        commonAppendixSelectQuery.setLinkSid(sid);
+        //打款凭证附件
+        commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
+        listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
+        if (listResultBean.getSuccess()) {
+            for (CommonAppendixVo commonApp : listResultBean.getData()) {
+                FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
+                commonApp.setFilePath(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath());
+                BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo);
+                remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
+            }
         }
         finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
@@ -469,6 +545,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         finCollectionConfirmation.setBalance(subtract);
         finCollectionConfirmation.setPaymentState(1);
+        finCollectionConfirmation.setCreateBySid(dto.getUserSid());
         save(finCollectionConfirmation);
         return rb.success().setData(finCollectionConfirmation.getSid());
     }
@@ -541,6 +618,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
+        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getContractList();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
         if (StringUtils.isBlank(dto.getCollectionBillSid())) {
@@ -577,23 +655,37 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
                 BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
                 finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
+                //车辆状态表锁定
+                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
+                baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
+                baseVehicleTempstateDto.setTempKey("0001");
+                baseVehicleTempstateDto.setTempValue("待审核");
+                baseVehicleTempstateDto.setBusSid(finSelectedReceivablesDetailed.getSid());
+                baseVehicleTempstateDto.setVinNo(finSelectedReceivablesDetailed.getVIN());
+                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), userOrgSid).getData();
+                if (baseVehicle != null) {
+                    baseVehicleTempstateDto.setVehSid(baseVehicle.getSid());
+                }
+                baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
             }
             List<String> payConfirmFiles = dto.getPayConfirmFiles();
             String remFilePath = "";
             for (String payFilePath : payConfirmFiles) {
                 if (payFilePath != null) {
                     remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                    commonAppendixDto.setLinkSid(dto.getSid());
-                    commonAppendixDto.setFilePath(payFilePath);
+                    commonAppendixDto.setLinkSid(dto.getCollectionBillSid());
+                    commonAppendixDto.setFilePath(remFilePath);
                     commonAppendixDto.setCreateBySid(staffSid);
                     commonAppendixDto.setFileName("汇款确认");
-                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
                     commonAppendixFeign.save(commonAppendixDto);
                 }
                 remFilePath += remFilePath + ",";
             }
             finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
             finCollectionConfirmation.setAuditState(1);
+            finCollectionConfirmation.setCreateBySid(dto.getUserSid());
             save(finCollectionConfirmation);
         } else {
             FinCollectionConfirmation finCollectionConfirmation = fetchBySid(dto.getCollectionBillSid());
@@ -630,18 +722,31 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
                 BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
                 finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
+                //车辆状态表锁定
+                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
+                baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
+                baseVehicleTempstateDto.setTempKey("0001");
+                baseVehicleTempstateDto.setTempValue("待审核");
+                baseVehicleTempstateDto.setBusSid(finSelectedReceivablesDetailed.getSid());
+                baseVehicleTempstateDto.setVinNo(finSelectedReceivablesDetailed.getVIN());
+                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), userOrgSid).getData();
+                if (baseVehicle != null) {
+                    baseVehicleTempstateDto.setVehSid(baseVehicle.getSid());
+                }
+                baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
             }
-            commonAppendixFeign.delFilesByLinkSidAndAttachType(dto.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+            commonAppendixFeign.delFilesByLinkSidAndAttachType(dto.getCollectionBillSid(), CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
             List<String> payConfirmFiles = dto.getPayConfirmFiles();
             String remFilePath = "";
             for (String payFilePath : payConfirmFiles) {
                 if (payFilePath != null) {
                     remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                    commonAppendixDto.setLinkSid(dto.getSid());
-                    commonAppendixDto.setFilePath(payFilePath);
+                    commonAppendixDto.setLinkSid(dto.getCollectionBillSid());
+                    commonAppendixDto.setFilePath(remFilePath);
                     commonAppendixDto.setCreateBySid(staffSid);
                     commonAppendixDto.setFileName("汇款确认");
-                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
                     commonAppendixFeign.save(commonAppendixDto);
                 }
                 remFilePath += remFilePath + ",";
@@ -694,11 +799,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             qw.notIn("sid", params.getSidList());
         }
         qw.ne("currentReceivableMoney", 0);
-//        List<AppCollectionConfirmationStateVo> vos = baseMapper.selectByState();
-//        for (AppCollectionConfirmationStateVo vo : vos) {
-//            vo.getContractNo();
-//            vo.getVinNo();
-//        }
+        List<String> vinNoList = new ArrayList<>();
+        List<BaseVehicleTempstateVo> baseVehicleTempstateVos = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()).getData();
+        for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) {
+            String vehSid = baseVehicleTempstateVo.getVehSid();
+            BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehSid).getData();
+            vinNoList.add(baseVehicleSelectVo.getVinNo());
+        }
+        if (vinNoList.size() > 0) {
+            qw.notIn("VIN", vinNoList);
+        }
         IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
         List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
         for (AppFinUncollectedReceivablesDetailedVo record : records) {
@@ -730,14 +840,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         int auditState = 1;
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
-            String vin = finSelectedReceivablesDetailedVo.getVIN();
+            //更新审核时间
+            finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2");
+           /* String vin = finSelectedReceivablesDetailedVo.getVIN();
             String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
             BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
             FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
             String sid1 = finUncollectedReceivablesDetailedVo.getSid();
             BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
             String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney));
-            finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);
+            finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);*/
         }
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
@@ -745,34 +857,48 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         FinCollectionConfirmationDto finCollectionConfirmationDto = new FinCollectionConfirmationDto();
         BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDto);
         updateBySid(finCollectionConfirmationDto, finCollectionConfirmationDto.getSid());
+        //删除临时表的数据
+        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
         return rb.success().setMsg("驳回成功");
     }
 
     public ResultBean cashierConfirm(String sid) {
         ResultBean rb = ResultBean.fireFail();
+        FinCollectionConfirmation confirmation = fetchBySid(sid);
         baseMapper.cashierConfirm(sid);
         int auditState = 1;
+        //总共认款金额
         BigDecimal totalSubscriptionMoney = new BigDecimal(0);
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
             String sid1 = finSelectedReceivablesDetailedVo.getSid();
-            finSelectedReceivablesDetailedService.cashierConfirm(sid1);
-            finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1);
+//            finSelectedReceivablesDetailedService.cashierConfirm(sid1);
+            //更新审核时间
+            finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1, "3");
+            //认款金额
             BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
             totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney);
             String vin = finSelectedReceivablesDetailedVo.getVIN();
             String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
-            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
-            String sid2 = finUncollectedReceivablesDetailedVo.getSid();
+            String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid();
+//            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
+            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecNameOrgSid(vin, receivablesName, useOrgSid);
+//            String sid2 = finUncollectedReceivablesDetailedVo.getSid();
+            //应收未收款项-当前应收金额
             BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
+            //已选应收款项-认款金额
             BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
-            if (subtract.compareTo(BigDecimal.ZERO) == 0) {
+            finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
+            FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
+            BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
+            finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
+        /*    if (subtract.compareTo(BigDecimal.ZERO) == 0) {
                 int subscriptionState = 3;
                 finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
             } else {
                 int subscriptionState = 2;
                 finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
-            }
+            }*/
         }
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
@@ -784,6 +910,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             int paymentState = 2;
             baseMapper.updatePaymentStateBySid(sid, paymentState);
         }
+        //更新余额
+        BigDecimal balanceBigDecimal = confirmation.getBalance().subtract(totalSubscriptionMoney);
+        baseMapper.updateBalanceBySid(sid,balanceBigDecimal);
+        //删除临时表的数据
+        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
         return rb.success().setMsg("款项确认成功");
     }
 
@@ -808,4 +939,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         List<String> stringList = baseMapper.billNoList();
         return rb.success().setData(stringList);
     }
+
+    public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
+        ResultBean<AppBusArrearsCarryMoneyVo> rb = ResultBean.fireFail();
+        AppBusArrearsCarryMoneyVo vo = new AppBusArrearsCarryMoneyVo();
+        //获取已认款金额
+        List<AppBusArrearsCarryMoneyVo> list = finSelectedReceivablesDetailedService.selByContractNo(contractNo);
+        BigDecimal subscriptionMoney = new BigDecimal(0);
+        for (AppBusArrearsCarryMoneyVo appBusArrearsCarryMoneyVo : list) {
+            subscriptionMoney = subscriptionMoney.add(appBusArrearsCarryMoneyVo.getSubscriptionMoney());
+        }
+        vo.setContractCollectionMoney(subscriptionMoney);
+        //获取欠款金额
+        CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
+        String contractAmount = commonContract.getContractAmount();
+        BigDecimal contractAmountMoney = new BigDecimal(contractAmount);
+        BigDecimal arrearsMoney = contractAmountMoney.subtract(subscriptionMoney);
+        vo.setArrearsMoney(arrearsMoney);
+        return rb.success().setData(vo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml

@@ -122,7 +122,8 @@
                fp.sid,
                fp.createBySid,
                fp.taskId,
-               fp.procInstId
+               fp.procInstId,
+               fp.carBrandName                                      brand
         from fin_paymentapply fp
         where sid = #{sid}
     </select>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
@@ -92,8 +93,10 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
 
     List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay();
 
-    @Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}")
-    void updateAuditDateBySid(String sid1);
+    @Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}")
+    void updateAuditDateBySid(@Param("sid1") String sid1,@Param("auditState") String auditState);
 
     List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
+
+    List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -84,4 +84,15 @@
         FROM fin_selected_receivables_detailed
         WHERE collSid = #{collectionBillSid}
     </select>
+
+    <select id="selByContractNo"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo">
+        SELECT
+            fsrd.subscriptionMoney
+        FROM
+            fin_selected_receivables_detailed fsrd
+                LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid
+        WHERE
+            fcc.paymentState = 1
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery;
@@ -199,11 +200,16 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         return baseMapper.selectDetailedGroupConAndRecAndPay();
     }
 
-    public void updateAuditDateBySid(String sid1) {
-        baseMapper.updateAuditDateBySid(sid1);
+    public void updateAuditDateBySid(String sid1,String auditState) {
+        baseMapper.updateAuditDateBySid(sid1,auditState);
     }
 
     public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
         return baseMapper.selectByCollSid(collectionBillSid);
     }
+
+    public List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo) {
+        List<AppBusArrearsCarryMoneyVo> list = baseMapper.selByContractNo(contractNo);
+        return list;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -66,6 +66,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     List<FinUncollectedReceivablesDetailedVo> selectListVo();
 
     FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName);
+    FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(@Param("vin") String vin, @Param("receivablesName") String receivablesName,@Param("useOrgSid")String useOrgSid);
 
     @Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}")
     void updateCurRecMoneyBySid(@Param("curRecMoney") String curRecMoney, @Param("sid") String sid);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -27,6 +27,14 @@
           AND receivablesName = #{receivablesName}
     </select>
 
+    <select id="fetchByVinAndRecNameOrgSid"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
+        SELECT *
+        FROM fin_uncollected_receivables_detailed
+        WHERE VIN = #{vin}
+        AND receivablesName = #{receivablesName} and useOrgSid = #{useOrgSid}
+    </select>
+
     <select id="selectGroupConAndRecAndPay"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
         SELECT receivablesName,

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -94,6 +94,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 }
             }
         }
+        //查询待审核状态下的款项申请的
+//        ResultBean<Boolean> resultBean =
+
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.like("contractNo", query.getContractNo());
         }
@@ -109,6 +112,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (StringUtils.isNotBlank(query.getSubscriptionState())) {
             qw.eq("subscriptionState", query.getSubscriptionState());
         }
+        //当前应收金额
+        qw.ne("currentReceivableMoney", new BigDecimal("0"));
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -163,6 +168,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         return baseMapper.fetchByVinAndRecName(vin, receivablesName);
     }
 
+    public FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(String vin, String receivablesName,String useOrgSid) {
+        return baseMapper.fetchByVinAndRecNameOrgSid(vin, receivablesName,useOrgSid);
+    }
+
     public void updateCurRecMoneyBySid(String curRecMoney, String sid) {
         baseMapper.updateCurRecMoneyBySid(curRecMoney, sid);
     }

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

@@ -15,16 +15,32 @@ public enum ProcDefEnum {
     //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
     //    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:822504"),//测试销售政策流程定义id
+//    FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
+    FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:1:862516"),//测试（新）2022、11、22
+//    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
+//    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
+    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试（新）2022、11、22
+//    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
 //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
     //    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+//    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
+//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
     //    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"),
+    SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
+//    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
+//    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
@@ -34,17 +50,26 @@ public enum ProcDefEnum {
     FINPAYAPPLY("付款申请", "process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"),
+    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:675012"),
+//    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
+    FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
+    FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
+    BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
+    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:717504"), //测试调账流程定义id
     //BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id
-    BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
-    BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
-    SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
-    SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"),
-    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"),
-    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"),
-    SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
-    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
-    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
-    CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
+    BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
+    BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
+    SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),
+    SCMVEHREBATECHECKAPPLY("单车返利核对申请","process_3xtbbru8:1:560004"),
+    SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"),
+    SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"),
+    SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请","process_h3w1aval:1:615004"),
+    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"),
+    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"),
+    CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

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

@@ -27,7 +27,6 @@ package com.yxt.anrui.flowable.biz.flow;
 
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.yxt.anrui.flowable.api.flow.*;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@@ -306,6 +305,7 @@ public class FlowableRest implements FlowableFeign {
                     UserTask userTask=(UserTask)flowElement1;
                     List<String> candidateGroups = userTask.getCandidateGroups();
                     List<SysUserVo> sysUserVoLists=new ArrayList<>();
+                    //根据角色查询用户
                     for(String roleSid:candidateGroups){
                         UserQuery userQuery = new UserQuery();
                         userQuery.setRoleSid(roleSid);
@@ -317,6 +317,8 @@ public class FlowableRest implements FlowableFeign {
                         }
                         sysUserVoLists.addAll(userByRole.getData());
                     }
+                    //当前环节运营部总经理 刘丽艳  点击同意 下一环节 事业部副总经理 （nextUserSid） 和事业部总经理（sysUserVoLists.get(0).getSid()）
+                    //判断查询回来的用户的集合size是1  并且用户的sid和下一环节的用户的sid相同。
                     if(sysUserVoLists.size()==1&&sysUserVoLists.get(0).getSid().equals(nextUserSid)){
                         contains=true;
                         break;