|
@@ -140,7 +140,9 @@ public class TRBasicInfoController {
|
|
ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ?
|
|
ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ?
|
|
JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) :
|
|
JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) :
|
|
null;
|
|
null;
|
|
- if (Objects.nonNull(reportCourseEvaluationResultDto.getWeightSettingSign())
|
|
|
|
|
|
+ if (Objects.nonNull(reportCourseEvaluationResultDto)
|
|
|
|
+ && Objects.nonNull(reportCourseEvaluationResultDto.getWeightSettingSign())
|
|
|
|
+ && Objects.nonNull(obeCourseWeightResult)
|
|
&& Objects.nonNull(obeCourseWeightResult.getWeightSettingSign())
|
|
&& Objects.nonNull(obeCourseWeightResult.getWeightSettingSign())
|
|
&& reportCourseEvaluationResultDto.getWeightSettingSign().longValue() != obeCourseWeightResult.getWeightSettingSign().longValue()) {
|
|
&& reportCourseEvaluationResultDto.getWeightSettingSign().longValue() != obeCourseWeightResult.getWeightSettingSign().longValue()) {
|
|
trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber,
|
|
trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber,
|