|
|
@@ -3,7 +3,6 @@ package com.goafanti.order.bo;
|
|
|
import com.goafanti.common.utils.excel.Excel;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.Date;
|
|
|
|
|
|
public class OutOrderProject {
|
|
|
|
|
|
@@ -41,7 +40,7 @@ public class OutOrderProject {
|
|
|
/**
|
|
|
* 大客户
|
|
|
*/
|
|
|
- @Excel(name = "大客户")
|
|
|
+ @Excel(name = "大客户",readConverterExp = "0=否,1=是")
|
|
|
private Integer bigUser;
|
|
|
/**
|
|
|
* 是否特批 0-非特批 ,1-负责人审核,2-负责人通过,3-负责人驳回 4董事长待审核 5董事长通过 6董事长驳回
|
|
|
@@ -52,12 +51,12 @@ public class OutOrderProject {
|
|
|
* 签单时间
|
|
|
*/
|
|
|
@Excel(name = "签单时间")
|
|
|
- private Date signTime;
|
|
|
+ private String signTime;
|
|
|
/**
|
|
|
* 派单时间
|
|
|
*/
|
|
|
- @Excel(name = "营销负责人")
|
|
|
- private String 派单时间;
|
|
|
+ @Excel(name = "派单时间")
|
|
|
+ private String createTime;
|
|
|
/**
|
|
|
* 公司名称
|
|
|
*/
|
|
|
@@ -158,7 +157,7 @@ public class OutOrderProject {
|
|
|
* 订单类型 0认证项目 1科技项目 2 两化融化管理体系认证项目
|
|
|
*/
|
|
|
@Excel(name = "是否科技项目")
|
|
|
- private Integer orderType;
|
|
|
+ private String orderType;
|
|
|
@Excel(name = "项目数")
|
|
|
private String commodityQuantity;
|
|
|
@Excel(name = "项目成本")
|
|
|
@@ -179,7 +178,7 @@ public class OutOrderProject {
|
|
|
private String taskComment;
|
|
|
@Excel(name = "核算比例")
|
|
|
private String hsbl;
|
|
|
- @Excel(name = "订单情况")
|
|
|
+ @Excel(name = "订单情况",readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单")
|
|
|
private String orderStatus;
|
|
|
@Excel(name = "变更情况")
|
|
|
private String counts;
|
|
|
@@ -250,20 +249,20 @@ public class OutOrderProject {
|
|
|
this.approval = approval;
|
|
|
}
|
|
|
|
|
|
- public Date getSignTime() {
|
|
|
+ public String getSignTime() {
|
|
|
return signTime;
|
|
|
}
|
|
|
|
|
|
- public void setSignTime(Date signTime) {
|
|
|
+ public void setSignTime(String signTime) {
|
|
|
this.signTime = signTime;
|
|
|
}
|
|
|
|
|
|
- public String get派单时间() {
|
|
|
- return 派单时间;
|
|
|
+ public String getCreateTime() {
|
|
|
+ return createTime;
|
|
|
}
|
|
|
|
|
|
- public void set派单时间(String 派单时间) {
|
|
|
- this.派单时间 = 派单时间;
|
|
|
+ public void setCreateTime(String createTime) {
|
|
|
+ this.createTime = createTime;
|
|
|
}
|
|
|
|
|
|
public String getBuyerName() {
|
|
|
@@ -474,11 +473,11 @@ public class OutOrderProject {
|
|
|
this.cb = cb;
|
|
|
}
|
|
|
|
|
|
- public Integer getOrderType() {
|
|
|
+ public String getOrderType() {
|
|
|
return orderType;
|
|
|
}
|
|
|
|
|
|
- public void setOrderType(Integer orderType) {
|
|
|
+ public void setOrderType(String orderType) {
|
|
|
this.orderType = orderType;
|
|
|
}
|
|
|
|