From 8571dfc780117b94d7253148a6e716ba317af257 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 5 Jul 2022 18:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=94=AE=E4=B9=B0=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleActualSalesService.java                    | 6 ++++--
 .../base/biz/busvehicleapply/BusVehicleApplyService.java  | 4 +++-
 .../yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java   | 8 ++++++--
 .../yxt/anrui/fin/api/fincostapply/FinCostapplyVo.java    | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index 2f1a56c437..160d5eb9ec 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -139,7 +139,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (baseVehicleActualSales == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(scmVehicleActualSalesDto,baseVehicleActualSales);
+            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales);
             int i = baseMapper.updateById(baseVehicleActualSales);
             //查询details中是否有关于sales的该条sid数据
             List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);
@@ -501,7 +501,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
-                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                Map<String, Object> paramMap = BeanUtil.beanToMap(resultBean.getData());
+                paramMap.put("taskDefKey", "Event_end");
+                updateFlowFiled(paramMap);
                 return rb.success().setData(resultBean.getData());
             }
         }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index f40ca8111b..4dd06f26c6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -513,7 +513,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
-                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                Map<String, Object> paramMap = BeanUtil.beanToMap(resultBean.getData());
+                paramMap.put("taskDefKey", "Event_end");
+                updateFlowFiled(paramMap);
                 return rb.success().setData(resultBean.getData());
             }
         }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java
index e14b981e45..235c451096 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java
@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyDto.java <br/>
@@ -68,11 +70,13 @@ public class FinCostapplyDto implements Dto {
     private String useTypeKey;
     @ApiModelProperty("使用方式value")
     private String useTypeValue;
-    @ApiModelProperty(value = "是否涉及车辆:1是，0否",required = true)
+    @ApiModelProperty(value = "是否涉及车辆:1是，0否", required = true)
     private Integer isVeh;
     @ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
     private Integer isOutDoor;
-    @ApiModelProperty(value = "业务sid",required = false)
+    @ApiModelProperty(value = "车架号list")
+    private List<String> vinNoList;
+    @ApiModelProperty(value = "业务sid", required = false)
     private String busSid;
 
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyVo.java
index a4482516fe..f8d762804a 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyVo.java
@@ -51,7 +51,7 @@ public class FinCostapplyVo implements Vo {
 
     private static final long serialVersionUID = 8708055678633928645L;
     private String sid;
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "流程状态")
     private String nodeState;
     @ApiModelProperty(value = "申请日期")
     private String createTime;