|
|
@@ -6,6 +6,7 @@ import com.goafanti.common.utils.excel.Excel;
|
|
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
public class InputExcelRdDetails extends InputRdDetails{
|
|
|
|
|
|
@@ -40,13 +41,14 @@ public class InputExcelRdDetails extends InputRdDetails{
|
|
|
* 开始时间
|
|
|
*/
|
|
|
@Excel(name="开始时间")
|
|
|
- private String rdStartStr;
|
|
|
+ private Date rdStart;
|
|
|
|
|
|
/**
|
|
|
* 结束时间
|
|
|
*/
|
|
|
@Excel(name="结束时间")
|
|
|
- private String rdEndStr;
|
|
|
+ private Date rdEnd;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 技术领域
|
|
|
@@ -161,20 +163,24 @@ public class InputExcelRdDetails extends InputRdDetails{
|
|
|
this.achieveResults = achieveResults;
|
|
|
}
|
|
|
|
|
|
- public String getRdStartStr() {
|
|
|
- return rdStartStr;
|
|
|
+ @Override
|
|
|
+ public Date getRdStart() {
|
|
|
+ return rdStart;
|
|
|
}
|
|
|
|
|
|
- public void setRdStartStr(String rdStartStr) {
|
|
|
- this.rdStartStr = rdStartStr;
|
|
|
+ @Override
|
|
|
+ public void setRdStart(Date rdStart) {
|
|
|
+ this.rdStart = rdStart;
|
|
|
}
|
|
|
|
|
|
- public String getRdEndStr() {
|
|
|
- return rdEndStr;
|
|
|
+ @Override
|
|
|
+ public Date getRdEnd() {
|
|
|
+ return rdEnd;
|
|
|
}
|
|
|
|
|
|
- public void setRdEndStr(String rdEndStr) {
|
|
|
- this.rdEndStr = rdEndStr;
|
|
|
+ @Override
|
|
|
+ public void setRdEnd(Date rdEnd) {
|
|
|
+ this.rdEnd = rdEnd;
|
|
|
}
|
|
|
|
|
|
@Override
|