考试

oa-app/src/main/java/com/css/oa/exam/exam/controller/ExamController.java

@@ -14,12 +14,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @author ：朱海文
 * @version : 1.0
 * @description ：考场控制器
 * @date ：2021/3/5
 */
@Api(tags = {"考试管理"})
@RestController
@RequestMapping("/exam")
@@ -114,6 +108,8 @@ public class ExamController extends BaseController {
    public Result add(@RequestBody Exam exam) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            String msg = mService.add(exam);
            result = setResult(msg);
        } catch (Exception e) {
@@ -128,6 +124,8 @@ public class ExamController extends BaseController {
    public Result update(@RequestBody Exam obj) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            if (TextUtils.isEmpty(obj.getUuid())) {
                return setErr("uuid参数不能为空");
            }
@@ -145,6 +143,8 @@ public class ExamController extends BaseController {
    public Result delete(@RequestBody List<String> ids) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            mService.delete(ids);
            result = setResult();
        } catch (Exception e) {

oa-app/src/main/java/com/css/oa/exam/exam/repository/Exam.java

@@ -45,15 +45,9 @@ public class Exam implements Serializable {
    @Column(name = "SUBJECT_NAME")
    private String subject_name;
    @Column(name = "SERIES_ID")
    private String series_id;
    @Column(name = "SERIES_NAME")
    private String series_name;
    @Column(name = "LEVEL_ID")
    private String level_id;
    @Column(name = "LEVEL_NAME")
    private String level_name;

oa-app/src/main/java/com/css/oa/exam/exam/service/ExamService.java

@@ -1,10 +1,11 @@
package com.css.oa.exam.exam.service;
import com.css.oa.exam.admin.bean.Admin;
import com.css.oa.exam.admin.repository.IUnitRepository;
import com.css.oa.exam.admin.repository.Unit;
import com.css.oa.exam.base.BaseService;
import com.css.oa.exam.exam.repository.IExamRepository;
import com.css.oa.exam.exam.repository.Exam;
import com.css.oa.exam.subject.repository.ISubjectRepository;
import com.css.oa.exam.subject.repository.Subject;
import com.css.oa.exam.util.UpdateObjectTool;
import com.css.oa.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
@@ -27,35 +28,43 @@ public class ExamService extends BaseService implements IExamService {
    @Autowired
    IExamRepository repository;
    @Autowired
    ISubjectRepository subjectRepository;
    IUnitRepository unitRepository;
    private void checkPermission(String msg) throws Exception {
        String adminUnitId = Admin.getAdminUnitId(token);
        List<Unit> unitList = unitRepository.getUnitBy(adminUnitId);
        if (unitList.size() > 0) {
            Unit unit = unitList.get(0);
            String parent_unit_id = unit.getParent_unit_id();
            if (!TextUtils.isEmpty(parent_unit_id)) {
                throw new Exception(msg);
            }
        }
    }
    private String addSubject(Exam obj){
    private String saveExam(Exam obj){
        if(TextUtils.isEmpty(obj.getSubject_code())){
            return "subject_code不能为空";
        }
        List<Subject> subjects = subjectRepository.queryById(obj.getSubject_code());
        if(subjects.size() == 0){
            return "您查找的subject_code不存在";
        if(TextUtils.isEmpty(obj.getSubject_name())){
            return "subject_name不能为空";
        }
        if(TextUtils.isEmpty(obj.getSeries_name())){
            return "series_name不能为空";
        }
        if(TextUtils.isEmpty(obj.getSeries_name())){
            return "level_name不能为空";
        }
        Subject subject = subjects.get(0);
        obj.setSubject_name(subject.getSubject_name());
//
//        int a = subject.getSeries();
//        String seriesName = SubjectMapping.getSeriesName(a);
//        obj.setSeries_name(seriesName);
//
//        int b = subject.getLevel();
//        String levelName = SubjectMapping.getLevelName(b);
//        obj.setLevel_name(levelName);
        repository.save(obj);
        return "保存成功";
    }
    @Override
    public String add(Exam obj) {
    public String add(Exam obj) throws Exception {
        System.out.println("传入的obj => " + obj.toString());
        checkPermission("管理员所在的单位没有创建考试的权限");
        if (obj.getUuid() == null) {
            String id = UUIDGenerator.getUUID();
            obj.setUuid(id);
@@ -73,15 +82,16 @@ public class ExamService extends BaseService implements IExamService {
        if (TextUtils.isEmpty(obj.getUpdate_user()) || obj.getCreate_user().equalsIgnoreCase("null")) {
            obj.setUpdate_user("系统");
        }
        return addSubject(obj);
        return saveExam(obj);
    }
    @Override
    public String update(Exam newObj) {
    public String update(Exam newObj) throws Exception {
        checkPermission("管理员所在的单位没有编辑考试的权限");
        Optional<Exam> byId = repository.findById(newObj.getUuid());
        Exam old = byId.get();
        UpdateObjectTool.copyNullProperties(old, newObj);
        return addSubject(newObj);
        return saveExam(newObj);
    }
    @Override
@@ -150,7 +160,8 @@ public class ExamService extends BaseService implements IExamService {
    }
    @Override
    public void delete(List<String> ids) {
    public void delete(List<String> ids) throws Exception {
        checkPermission("管理员所在的单位没有删除考试的权限");
        //ids = ["0","2","3"]
        repository.deleteRealByIds(ids);
    }

oa-app/src/main/java/com/css/oa/exam/exam/service/IExamService.java

@@ -7,15 +7,15 @@ import java.util.Map;
public interface IExamService {
    String add(Exam exam);
    String add(Exam exam) throws Exception;
    Map queryPage(Map map, int curPage, int pageSize);
    List queryToYear();
    String update(Exam newExam);
    String update(Exam newExam) throws Exception;
    void delete(List<String> ids);
    void delete(List<String> ids) throws Exception;
    List queryAll(String exam_name);