|
|
@@ -155,9 +155,9 @@ public class TeacherAwardController {
|
|
|
rowData.setIssueDate("");
|
|
|
}else{
|
|
|
if(el.getIsThesis() == 1){
|
|
|
- rowData.setIssueDate(sdf.format(el.getAwardDate()));
|
|
|
- }else if(el.getIsThesis() == 0){
|
|
|
rowData.setIssueDate(sdf.format(el.getIssueDate()));
|
|
|
+ }else if(el.getIsThesis() == 0){
|
|
|
+ rowData.setIssueDate(sdf.format(el.getAwardDate()));
|
|
|
}
|
|
|
}
|
|
|
if(rowData.getRemark() == null){
|