|
@@ -11,7 +11,10 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
|
|
import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
|
|
-import com.qmth.teachcloud.common.util.*;
|
|
|
|
|
|
+import com.qmth.teachcloud.common.util.GsonUtil;
|
|
|
|
+import com.qmth.teachcloud.common.util.Result;
|
|
|
|
+import com.qmth.teachcloud.common.util.ResultUtil;
|
|
|
|
+import com.qmth.teachcloud.common.util.ServletUtil;
|
|
import com.qmth.teachcloud.obe.been.dto.CourseWeightDetailDto;
|
|
import com.qmth.teachcloud.obe.been.dto.CourseWeightDetailDto;
|
|
import com.qmth.teachcloud.obe.been.dto.CourseWeightDto;
|
|
import com.qmth.teachcloud.obe.been.dto.CourseWeightDto;
|
|
import com.qmth.teachcloud.obe.been.dto.TCUsualScoreDto;
|
|
import com.qmth.teachcloud.obe.been.dto.TCUsualScoreDto;
|
|
@@ -144,7 +147,7 @@ public class TCUsualScoreController {
|
|
List<ExcelField> excelFieldList = new ArrayList<>();
|
|
List<ExcelField> excelFieldList = new ArrayList<>();
|
|
excelFieldList = this.getUsualScoreList(cultureProgramId, courseId, excelFieldList);
|
|
excelFieldList = this.getUsualScoreList(cultureProgramId, courseId, excelFieldList);
|
|
excelFieldList.stream().peek(s -> s.setNull()).collect(Collectors.toList());
|
|
excelFieldList.stream().peek(s -> s.setNull()).collect(Collectors.toList());
|
|
- return ResultUtil.ok(JacksonUtil.parseJson(excelFieldList));
|
|
|
|
|
|
+ return ResultUtil.ok(excelFieldList);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "导入平时成绩")
|
|
@ApiOperation(value = "导入平时成绩")
|