未售买断修复

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());
             }
         }

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());
             }
         }

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;
 
 }

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;