a

oa-app/src/main/java/com/css/oa/exam/place/bean/VerifyOneReq.java

@@ -1,9 +1,13 @@
package com.css.oa.exam.place.bean;
import com.css.oa.exam.constants.BoolState;
public class VerifyOneReq {
    public String uuid;
    public int gree = BoolState.DEFULT;
    public String suggest;
}

oa-app/src/main/java/com/css/oa/exam/place/bean/VerifyReq.java

@@ -1,5 +1,7 @@
package com.css.oa.exam.place.bean;
import com.css.oa.exam.constants.BoolState;
import java.util.ArrayList;
import java.util.List;
@@ -7,4 +9,7 @@ public class VerifyReq {
    public List<String> ids = new ArrayList<>();
    public int gree = BoolState.DEFULT;
}

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

@@ -1,6 +1,7 @@
package com.css.oa.exam.place.controller;
import com.css.oa.exam.base.BaseController;
import com.css.oa.exam.constants.BoolState;
import com.css.oa.exam.place.bean.*;
import com.css.oa.exam.place.repository.Place;
import com.css.oa.exam.place.service.PlaceService;
@@ -52,6 +53,8 @@ public class PlaceController 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) {
@@ -146,9 +149,12 @@ public class PlaceController extends BaseController {
            if (TextUtils.isEmpty(req.uuid)) {
                return setErr("uuid参数不能为空");
            }
            if (req.gree == BoolState.DEFULT) {
                return setErr("gree参数不能为空");
            }
            String token = getToken();
            mService.setToken(token);
            mService.verifyOne(req.uuid, req.suggest);
            mService.verifyOne(req);
            result = setResult();
        } catch (Exception e) {
            result = setErr(e.getMessage());
@@ -159,12 +165,18 @@ public class PlaceController extends BaseController {
    @ApiOperation(value = "批量审核")
    @PostMapping("/batchVerify")
    public Result batchVerify(@RequestBody List<String> ids) {
    public Result batchVerify(@RequestBody VerifyReq req) {
        Result<Map> result;
        try {
            if (req.ids.size() == 0) {
                return setErr("ids数组元素 不能为空");
            }
            if (req.gree == BoolState.DEFULT) {
                return setErr("gree参数不能为空");
            }
            String token = getToken();
            mService.setToken(token);
            mService.batchVerify(ids);
            mService.batchVerify(req);
            result = setResult();
        } catch (Exception e) {
            result = setErr(e.getMessage());

oa-app/src/main/java/com/css/oa/exam/place/place.txt

@@ -0,0 +1,3 @@
考点管理：
1，审核状态如果是“上级审核中”,禁止删除本条数据
2，“上级审核中”，禁止编辑本条数据

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

@@ -1,5 +1,6 @@
package com.css.oa.exam.place.repository;
import com.css.oa.exam.constants.BoolState;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -18,18 +19,21 @@ public class Place implements Serializable, Cloneable {
    @Column(name = "UUID")
    private String uuid;
    @Column(name = "CREATE_UNIT_ID")
    public String create_unit_id;
    @Column(name = "CURR_ID")
    public String curr_id;
    @Column(name = "IS_REJECT")
    public int is_reject = BoolState.DEFULT;
    @Column(name = "PLACE_NAME")
    public String place_name;
    @Column(name = "PLACE_CODE")
    public String place_code;
    @Column(name = "QUEUE")
    public String queue;// 1,2,3,4
    @Column(name = "CURR_ID")
    public String curr_id;
    @Column(name = "ROOM_COUNT")
    public int room_count;

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

@@ -1,8 +1,6 @@
package com.css.oa.exam.place.service;
import com.css.oa.exam.place.bean.PlaceDuplicateBean;
import com.css.oa.exam.place.bean.PlaceQueryReq;
import com.css.oa.exam.place.bean.PlaceResultWrap;
import com.css.oa.exam.place.bean.*;
import com.css.oa.exam.place.repository.Place;
import java.util.List;
@@ -14,15 +12,15 @@ public interface IPlaceService {
    void add(Place examUser);
    void delete(List<String> ids);
    void delete(List<String> ids) throws Exception;
    void update(Place user);
    void update(Place user) throws Exception;
    boolean duplicate(PlaceDuplicateBean bean);
    void verifyOne(String uuid, String suggest);
    void verifyOne(VerifyOneReq req);
    void batchVerify(List<String> ids);
    void batchVerify(VerifyReq req);
    PlaceResultWrap queryToYear();

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

@@ -4,12 +4,10 @@ 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.constants.BoolState;
import com.css.oa.exam.exam.repository.Exam;
import com.css.oa.exam.exam.repository.IExamRepository;
import com.css.oa.exam.place.bean.DropdownVerifyState;
import com.css.oa.exam.place.bean.PlaceDuplicateBean;
import com.css.oa.exam.place.bean.PlaceQueryReq;
import com.css.oa.exam.place.bean.PlaceResultWrap;
import com.css.oa.exam.place.bean.*;
import com.css.oa.exam.place.repository.IPlaceRepository;
import com.css.oa.exam.place.repository.Place;
import com.css.oa.exam.util.UpdateObjectTool;
@@ -66,9 +64,12 @@ public class PlaceService extends BaseService implements IPlaceService {
                    //我创建的、我的下级提交的
                    Admin admin = Admin.getAdminByToken(token);
                    if (!TextUtils.isEmpty(admin.my_unit_id)) {
                        String pattern = "%" + admin.my_unit_id + "%";
                        Predicate inQueue = criteriaBuilder.like(root.get("queue").as(String.class), pattern);
                        predicateList.add(inQueue);//包含 包含条件
                        Predicate create_unit_id = criteriaBuilder.equal(root.get("create_unit_id").as(String.class), admin.my_unit_id);
                        //Predicate create_unit_id = criteriaBuilder.equal(root.get("create_unit_id").as(String.class), admin.my_unit_id);
                        Predicate predicate2 = null;
                        criteriaBuilder.or(create_unit_id,predicate2);
                    }
                    //1,考点名
                    String place_name = condition.place_name;
@@ -88,10 +89,10 @@ public class PlaceService extends BaseService implements IPlaceService {
                    }
                    //4.审核状态
                    String verify_state = condition.verify_state;
                    if(verify_state.equalsIgnoreCase(DropdownVerifyState.WAIT)){
                    if (verify_state.equalsIgnoreCase(DropdownVerifyState.WAIT)) {
                        //待提交
                        predicateList.add(criteriaBuilder.equal(root.get("curr_id").as(String.class), admin.my_unit_id));
                    }else if(verify_state.equalsIgnoreCase(DropdownVerifyState.ING)){
                    } else if (verify_state.equalsIgnoreCase(DropdownVerifyState.ING)) {
                        //上级审核中
                        Expression<String> queue = root.get("queue").as(String.class);
                        EntityType<Place> model = root.getModel();
@@ -99,10 +100,10 @@ public class PlaceService extends BaseService implements IPlaceService {
                        //root.join()
                        //Path<Place> queue1 = root.get("queue");
                    }else if(verify_state.equalsIgnoreCase(DropdownVerifyState.ED)){
                    } else if (verify_state.equalsIgnoreCase(DropdownVerifyState.ED)) {
                        //审核通过
                        List<Unit> top = unitRepository.getTop();
                        if(top != null && top.size() > 0){
                        if (top != null && top.size() > 0) {
                            predicateList.add(criteriaBuilder.equal(root.get("curr_id").as(String.class), top.get(0).getUuid()));
                        }
                    }
@@ -197,42 +198,42 @@ public class PlaceService extends BaseService implements IPlaceService {
        return null;
    }
    private ArrayList<String> getArr(Unit unit) {
        ArrayList<String> ids = new ArrayList();
        ids.add(unit.uuid);
        String p_id = unit.getP_id();
        boolean b = !TextUtils.isEmpty(p_id) && !p_id.equals("-1") && !p_id.equals(" ") && !p_id.contains(" ");
        if (b) {
            Unit pUnit = getUnit(p_id);
            if (pUnit != null) {
                ids.addAll(getArr(pUnit));
            }
        }
        return ids;
    }
    private void setQue(Place place) {
        String adminUnitId = Admin.getAdminUnitId(token);
        Unit me = getUnit(adminUnitId);
        if (me != null) {
            place.setCurr_id(me.uuid);
            place.setVerify_state("待提交");
            ArrayList<String> list = getArr(me);
            String que = "";
            for (int i = 0; i < list.size(); i++) {
                String id = list.get(i);
                if (i == 0) {
                    que = que + id;
                } else {
                    que = que + "," + id;
                }
            }
            list.clear();
            place.setQueue(que);
        }
    }
//    private ArrayList<String> getArr(Unit unit) {
//        ArrayList<String> ids = new ArrayList();
//        ids.add(unit.uuid);
//        String p_id = unit.getP_id();
//        boolean b = !TextUtils.isEmpty(p_id) && !p_id.equals("-1") && !p_id.equals(" ") && !p_id.contains(" ");
//        if (b) {
//            Unit pUnit = getUnit(p_id);
//            if (pUnit != null) {
//                ids.addAll(getArr(pUnit));
//            }
//        }
//        return ids;
//    }
//    private void setQue(Place place) {
//        String adminUnitId = Admin.getAdminUnitId(token);
//        Unit me = getUnit(adminUnitId);
//        if (me != null) {
//            place.setCurr_id(me.uuid);
//            place.setVerify_state("待提交");
//
//            ArrayList<String> list = getArr(me);
//            String que = "";
//            for (int i = 0; i < list.size(); i++) {
//                String id = list.get(i);
//                if (i == 0) {
//                    que = que + id;
//                } else {
//                    que = que + "," + id;
//                }
//            }
//            list.clear();
//            place.setQueue(que);
//        }
//
//    }
    @Override
    public void add(Place place) {
@@ -250,20 +251,35 @@ public class PlaceService extends BaseService implements IPlaceService {
            place.setUpdate_time(newDate);
        }
        Admin admin = Admin.getAdminByToken(token);
        if (place.getIs_reject() == BoolState.DEFULT) {
            place.setIs_reject(BoolState.NO);
        }
        place.setCurr_id(admin.my_unit_id);
        place.setCreate_unit_id(admin.my_unit_id);
        if (TextUtils.isEmpty(place.getCreate_user())) {
            place.setCreate_user(admin.name);
        }
        if (TextUtils.isEmpty(place.getUpdate_user())) {
            place.setUpdate_user(admin.name);
        }
        setQue(place);
        repository.save(place);
    }
    @Override
    public void delete(List<String> ids) {
        //ids = ["0","2","3"]
        repository.deleteRealByIds(ids);
    public void delete(List<String> uuids) throws Exception {
        Admin admin = Admin.getAdminByToken(token);
        for (String uuid : uuids) {
            Place oldPlace = repository.findById(uuid).get();
            //是我创建的、并且审核权在我手里边 的时候可以删除
            if (oldPlace.getCreate_unit_id().equalsIgnoreCase(admin.my_unit_id) &&
                    oldPlace.getCurr_id().equalsIgnoreCase(admin.my_unit_id)) {
            }else {
                throw new Exception("审核权不在您手中,禁止删除");
            }
        }
        repository.deleteRealByIds(uuids);
    }
@@ -271,10 +287,14 @@ public class PlaceService extends BaseService implements IPlaceService {
     * @param newPlace 这个方法，对象必须携带id
     */
    @Override
    public void update(Place newPlace) {
    public void update(Place newPlace) throws Exception {
        Admin admin = Admin.getAdminByToken(token);
        Optional<Place> byId = repository.findById(newPlace.getUuid());
        Place oldPlace = byId.get();
        Admin admin = Admin.getAdminByToken(token);
        if (!oldPlace.getCurr_id().equalsIgnoreCase(admin.my_unit_id)) {
            throw new Exception("审核权不在您手中,禁止编辑");
        }
        newPlace.setUpdate_user(admin.name);
        UpdateObjectTool.copyNullProperties(oldPlace, newPlace);
        repository.save(newPlace);
@@ -305,43 +325,51 @@ public class PlaceService extends BaseService implements IPlaceService {
    }
    @Override
    public void verifyOne(String uuid, String suggest) {
        Optional<Place> byId = repository.findById(uuid);
        Place oldPlace = byId.get();
    public void verifyOne(VerifyOneReq req) {
        Admin admin = Admin.getAdminByToken(token);
        Place newPlace = new Place();
        newPlace.setCurr_id(admin.my_unit_id);
        UpdateObjectTool.copyNullProperties(oldPlace, newPlace);
        repository.save(newPlace);
    }
    private boolean cannot(Place oldPlace, Admin admin) {
        String[] que = oldPlace.getQueue().split(",");
        ArrayList<String> ids = new ArrayList();
        for (String id : que) {
            ids.add(id);
        Optional<Place> byId = repository.findById(req.uuid);
        Place oldPlace = byId.get();
        //如果到了自己这一级,我就能审核
        if (!oldPlace.getCurr_id().equalsIgnoreCase(admin.my_unit_id)) {
            return;
        }
        int i = ids.indexOf(oldPlace.getCurr_id());
        int j = ids.indexOf(admin.my_unit_id);
        if (i < j) {
            return false;
        Place newPlace = new Place();
        Unit myUnit = getUnit(admin.my_unit_id);
        if (req.gree == BoolState.YES) {
            newPlace.setCurr_id(myUnit.getP_id());
            newPlace.setIs_reject(BoolState.NO);
        }
        return true;
        if (req.gree == BoolState.NO) {
            newPlace.setCurr_id(oldPlace.getCreate_unit_id());
            newPlace.setIs_reject(BoolState.YES);
        }
        UpdateObjectTool.copyNullProperties(oldPlace, newPlace);
        repository.save(newPlace);
    }
    @Override
    public void batchVerify(List<String> ids) {
    public void batchVerify(VerifyReq req) {
        Admin admin = Admin.getAdminByToken(token);
        List<Place> oldAll = repository.getAllByIds(ids);
        List<Place> oldAll = repository.getAllByIds(req.ids);
        List<Place> newAll = new ArrayList<>();
        for (Place oldPlace : oldAll) {
            if (cannot(oldPlace, admin)) {
            //如果到了自己这一级,我就能审核
            if (!oldPlace.getCurr_id().equalsIgnoreCase(admin.my_unit_id)) {
                continue;
            }
            Place newPlace = new Place();
            newPlace.setCurr_id(admin.my_unit_id);
            Unit myUnit = getUnit(admin.my_unit_id);
            if (req.gree == BoolState.YES) {
                newPlace.setCurr_id(myUnit.getP_id());
                newPlace.setIs_reject(BoolState.NO);
            }
            if (req.gree == BoolState.NO) {
                newPlace.setCurr_id(oldPlace.getCreate_unit_id());
                newPlace.setIs_reject(BoolState.YES);
            }
            UpdateObjectTool.copyNullProperties(oldPlace, newPlace);
            newAll.add(newPlace);
        }

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

@@ -33,12 +33,11 @@ public class SubjectService extends BaseService implements ISubjectService {
    ISubjectRepository repository;
    private void checkPermission(String msg) throws Exception {
        String adminUnitId = Admin.getAdminUnitId(token);
        List<Unit> unitList = unitRepository.getUnitBy(adminUnitId);
        String myUnitId = Admin.getAdminUnitId(token);
        List<Unit> unitList = unitRepository.getTop();
        if (unitList.size() > 0) {
            Unit unit = unitList.get(0);
            String parent_unit_id = unit.getP_id();
            if (!TextUtils.isEmpty(parent_unit_id)) {
            Unit top = unitList.get(0);
            if(!myUnitId.equalsIgnoreCase(top.uuid)){
                throw new Exception(msg);
            }
        }