|
|
@@ -130,6 +130,7 @@ public class TeacherAwardController {
|
|
|
teacherAwardMPJLambdaWrapper
|
|
|
.disableSubLogicDel()
|
|
|
.selectAs(TeacherAwardItem::getIsThesis, TeacherAwardDetailPageVo::getIsThesis)
|
|
|
+ .selectAs(TeacherAwardItem::getScore, TeacherAwardDetailPageVo::getTeacherAwardItemScore)
|
|
|
.selectAs(XjrUser::getName, TeacherAwardDetailPageVo::getApplicantUserIdCn)
|
|
|
.select(TeacherAward.class,x -> VoToColumnUtil.fieldsToColumns(TeacherAwardDetailPageVo.class).contains(x.getProperty()))
|
|
|
.leftJoin(TeacherAwardItem.class, TeacherAwardItem::getId, TeacherAward::getTeacherAwardItemId)
|
|
|
@@ -175,6 +176,9 @@ public class TeacherAwardController {
|
|
|
if(rowData.getMediaType() == null){
|
|
|
rowData.setMediaType("");
|
|
|
}
|
|
|
+ if(rowData.getTeacherAwardItemScore() == null){
|
|
|
+ rowData.setTeacherAwardItemScore("");
|
|
|
+ }
|
|
|
|
|
|
|
|
|
if(el.getIsThesis() == 1){
|