|
@@ -18,6 +18,7 @@ import java.util.concurrent.LinkedBlockingQueue;
|
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
+import cn.com.qmth.scancentral.vo.*;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.io.IOUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -61,10 +62,6 @@ import cn.com.qmth.scancentral.support.SpringContextHolder;
|
|
|
import cn.com.qmth.scancentral.util.Calculator;
|
|
|
import cn.com.qmth.scancentral.util.DateUtil;
|
|
|
import cn.com.qmth.scancentral.util.FileUtil;
|
|
|
-import cn.com.qmth.scancentral.vo.ExportCetMarkingQueryVo;
|
|
|
-import cn.com.qmth.scancentral.vo.ExportCetVo;
|
|
|
-import cn.com.qmth.scancentral.vo.OmrGroupVo;
|
|
|
-import cn.com.qmth.scancentral.vo.SubjectConfigVo;
|
|
|
import cn.com.qmth.scancentral.vo.examinfo.SubjectConfig;
|
|
|
import cn.com.qmth.scancentral.vo.omr.OmrSubjectVo;
|
|
|
import cn.com.qmth.scancentral.vo.subject.DataExportTaskVo;
|
|
@@ -728,4 +725,22 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
|
}
|
|
|
return ret;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public UpdateTimeVo edit(Long examId, String subjectCode, String subjectName) {
|
|
|
+ QueryWrapper<SubjectEntity> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.lambda().eq(SubjectEntity::getExamId, examId);
|
|
|
+ queryWrapper.lambda().eq(SubjectEntity::getName, subjectName);
|
|
|
+ SubjectEntity subject = this.getOne(queryWrapper);
|
|
|
+ if (subject != null) {
|
|
|
+ throw new ParameterException("科目代码在本考试中已存在");
|
|
|
+ }
|
|
|
+ subject = this.findByExamIdAndCode(examId,subjectCode);
|
|
|
+ if(subject == null){
|
|
|
+ throw new ParameterException("subject不存在");
|
|
|
+ }
|
|
|
+ subject.setName(subjectName);
|
|
|
+ saveOrUpdateByMultiId(subject);
|
|
|
+ return UpdateTimeVo.create();
|
|
|
+ }
|
|
|
}
|