diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java
index 7dd8790356..fd98d765cb 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingVo.java
@@ -26,12 +26,15 @@
package com.yxt.anrui.buscenter.api.busvalcustfiling;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-buscenter(价值客户备案申请)
* File: BusValcustFilingVo.java
@@ -60,7 +63,8 @@ public class BusValcustFilingVo implements Vo {
@ApiModelProperty("申请人姓名")
private String createByName;
@ApiModelProperty("申请日期")
- private String createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("车型名称")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java
index c77cb771c3..686a9e6806 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java
@@ -79,7 +79,9 @@ public class AppValcustFilingDetailsVo implements Vo {
@ApiModelProperty("0高开,1低开")
private String isGdk;
@ApiModelProperty("加装配置/销售让利金额")
- private String money; // 加装配置/销售让利金额
+ private String money;
+ @ApiModelProperty("加装配置/销售让利名称")
+ private String moneyName;
@ApiModelProperty("应收手续费")
private String ysMoney; // 应收手续费
@ApiModelProperty("实收手续费")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingVo.java
index 7439ed2850..b4c364b6d1 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingVo.java
@@ -26,11 +26,14 @@
package com.yxt.anrui.terminal.api.autoservice.valcustfiling;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* Project: anrui-buscenter(价值客户备案申请)
* File: BusValcustFilingVo.java
@@ -56,28 +59,15 @@ public class AppValcustFilingVo implements Vo {
private String company;
@ApiModelProperty("申请信息")
private String publishInfo;
- @ApiModelProperty("申请部门名称")
- private String applyDeptName;
- @ApiModelProperty("申请人姓名")
- private String createByName;
@ApiModelProperty("申请日期")
- private String createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("车架号")
private String vinNo;
- @ApiModelProperty("加装配置/销售让利金额")
- private String money;
- @ApiModelProperty("加装配置/销售让利名称")
- private String moneyName;
- @ApiModelProperty("应收手续费")
- private String ysMoney;
- @ApiModelProperty("实收手续费")
- private String ssMoney;
- @ApiModelProperty("流程定义id")
- private String procDefId;
- @ApiModelProperty("流程实例id")
- private String procInstId;
+ @ApiModelProperty("是否显示办理")
+ private Boolean showUpdateBtn = false;
}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java
index 50a54074e2..d67ef5f458 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java
@@ -71,10 +71,8 @@ public class AppValcustFilingService {
appValcustFilingVo.setCompany(record.getUseOrgName());
appValcustFilingVo.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName());
appValcustFilingVos.add(appValcustFilingVo);
- if ("0".equals(record.getIsGdk())){
- appValcustFilingVo.setMoneyName("加装配置金额");
- }else {
- appValcustFilingVo.setMoneyName("销售让利金额");
+ if ("待提交".equals(record.getNodeState())){
+ appValcustFilingVo.setShowUpdateBtn(true);
}
}
v.setRecords(appValcustFilingVos);
@@ -99,6 +97,11 @@ public class AppValcustFilingService {
BusValcustFilingDetailsVo busValcustFilingDetailsVo = busValcustFilingFeign.fetchDetailsBySid(sid).getData();
AppValcustFilingDetailsVo vo = new AppValcustFilingDetailsVo();
BeanUtil.copyProperties(busValcustFilingDetailsVo, vo);
+ if ("0".equals(busValcustFilingDetailsVo.getIsGdk())){
+ vo.setMoneyName("加装配置金额");
+ }else {
+ vo.setMoneyName("销售让利金额");
+ }
return rb.success().setData(vo);
}