|
@@ -33,6 +33,7 @@ import com.xjrsoft.module.xycxedu.vo.ExamSubjectScoreEnterImportVo;
|
|
|
import com.xjrsoft.module.xycxedu.vo.ExamSubjectScoreEnterPageVo;
|
|
|
import com.xjrsoft.module.xycxedu.vo.ExamSubjectScoreEnterVo;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import me.zhyd.oauth.log.Log;
|
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
|
import org.apache.poi.ss.usermodel.CellStyle;
|
|
|
import org.apache.poi.ss.usermodel.FillPatternType;
|
|
@@ -94,7 +95,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
|
|
|
.select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
|
|
|
.innerJoin(ExamSubjectScore.class, ExamSubjectScore::getUserId, User::getId)
|
|
|
.eq(User::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
-
|
|
|
+ .eq(ExamSubjectScore::getExamSubjectScoreEnterId, id)
|
|
|
.in(User::getCredentialNumber, credentialNumbers)
|
|
|
);
|
|
|
Map<String, Long> userMaps = userList.stream().collect(Collectors.toMap(User::getCredentialNumber, User::getId));
|
|
@@ -127,6 +128,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
|
|
|
scoreService.updateBatchById(updateList);
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
+ Log.error(e.getMessage(), e);
|
|
|
if(e.getClass().equals(ExcelDataConvertException.class)){
|
|
|
throw new MyException("班级排名和年级排名只能填写数字,请检查");
|
|
|
}else{
|