改

oa-app/src/main/java/com/css/oa/exam/admin/bean/Admin.java

@@ -12,19 +12,19 @@ public class Admin {
        this.my_unit_id = my_unit_id;
    }
//    public static Admin getAdminByToken(@NotNull String token){
//        if(token.equals("1")){
//            return new Admin("中央水利局","0");
//        }else if(token.equals("2")){
//            return new Admin("华南水利局","1");
//        }else if(token.equals("3")){
//            return new Admin("湖南水利局","2");
//        }else if(token.equals("4")){
//            return new Admin("长沙市水利局","3");
//        }else {
//            return new Admin("长沙县水利局","4");
//        }
//    }
    public static Admin getAdminByToken(@NotNull String token){
        if(token.equals("1")){
            return new Admin("中央水利局朱局长","1");
        }else if(token.equals("2")){
            return new Admin("华南局朱董事","2");
        }else if(token.equals("3")){
            return new Admin("湖南水利厅朱厅长","3");
        }else if(token.equals("4")){
            return new Admin("长沙市水利所朱所长","4");
        }else {
            return new Admin("长沙县水利站朱站长","5");
        }
    }
    public static String getAdminUnitId(@NotNull String token){
        if(token.equals("1")){

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

@@ -76,11 +76,12 @@ public class ExamService extends BaseService implements IExamService {
        if (obj.getUpdate_time() == null) {
            obj.setUpdate_time(newDate);
        }
        if (TextUtils.isEmpty(obj.getCreate_user()) || obj.getCreate_user().equalsIgnoreCase("null")) {
            obj.setCreate_user("系统");
        Admin admin = Admin.getAdminByToken(token);
        if (TextUtils.isEmpty(obj.getCreate_user())) {
            obj.setCreate_user(admin.name);
        }
        if (TextUtils.isEmpty(obj.getUpdate_user()) || obj.getCreate_user().equalsIgnoreCase("null")) {
            obj.setUpdate_user("系统");
        if (TextUtils.isEmpty(obj.getUpdate_user())) {
            obj.setUpdate_user(admin.name);
        }
        return saveExam(obj);
    }
@@ -90,6 +91,8 @@ public class ExamService extends BaseService implements IExamService {
        checkPermission("管理员所在的单位没有编辑考试的权限");
        Optional<Exam> byId = repository.findById(newObj.getUuid());
        Exam old = byId.get();
        Admin admin = Admin.getAdminByToken(token);
        newObj.setUpdate_user(admin.name);
        UpdateObjectTool.copyNullProperties(old, newObj);
        return saveExam(newObj);
    }

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

@@ -0,0 +1,9 @@
package com.css.oa.exam.place.bean;
public class VerifyOneReq {
    public String uuid;
    public String suggest;
}

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

@@ -1,9 +1,10 @@
package com.css.oa.exam.place.bean;
import java.util.ArrayList;
import java.util.List;
public class VerifyReq {
    public String uuid;
    public int state;
    public String suggest;
    public List<String> ids = new ArrayList<>();
}

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

@@ -11,8 +11,6 @@ import org.apache.http.util.TextUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -68,6 +66,8 @@ public class PlaceController extends BaseController {
    public Result update(@RequestBody Place newPlace) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            if (TextUtils.isEmpty(newPlace.getUuid())) {
                return setErr("uuid参数不能为空");
            }
@@ -135,17 +135,16 @@ public class PlaceController extends BaseController {
    }
    @ApiOperation(value = "审核")
    @PostMapping("/verify")
    public Result verify(@RequestBody VerifyReq req) {
    @PostMapping("/verifyOne")
    public Result verifyOne(@RequestBody VerifyOneReq req) {
        Result<Map> result;
        try {
            if(TextUtils.isEmpty(req.uuid)){
            String token = getToken();
            mService.setToken(token);
            if (TextUtils.isEmpty(req.uuid)) {
                return setErr("uuid参数不能为空");
            }
            if(req.state == 0){
                return setErr("state参数不能为空或不能为0");
            }
            mService.verify(req.uuid, req.state, req.suggest);
            mService.verifyOne(req.uuid, req.suggest);
            result = setResult();
        } catch (Exception e) {
            result = setErr(e.getMessage());
@@ -154,6 +153,19 @@ public class PlaceController extends BaseController {
        return result;
    }
    @ApiOperation(value = "批量审核")
    @PostMapping("/batchVerify")
    public Result batchVerify(@RequestBody List<String> ids) {
        Result<Map> result;
        try {
            mService.batchVerify(ids);
            result = setResult();
        } catch (Exception e) {
            result = setErr(e.getMessage());
            e.printStackTrace();
        }
        return result;
    }
    @ApiOperation(value = "年份-考试-考点")
    @GetMapping("/queryToYear")

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

@@ -16,27 +16,32 @@ public interface IPlaceRepository extends JpaRepository<Place, String>, JpaSpeci
    //批量删除
    @Modifying
    @Transactional
    @Query(nativeQuery = true, value = "delete from ATT_EXAM_PLACE where UUID in :ids")
    @Query(nativeQuery = true, value = "delete from OP_EXAM_PLACE where UUID in :ids")
    void deleteRealByIds(@Param("ids") List<String> ids);
    @Modifying
    @Transactional
    @Query(nativeQuery = true , value = "select * from ATT_EXAM_PLACE where EXAM_ID = :exam_id")
    @Query(nativeQuery = true , value = "select * from OP_EXAM_PLACE where EXAM_ID = :exam_id")
    List<Place> queryById(@Param("exam_id")String exam_id);
    @Modifying
    @Transactional
    @Query(nativeQuery = true , value = "select UUID from ATT_EXAM_PLACE where EXAM_ID = :exam_id")
    @Query(nativeQuery = true, value = "select * from OP_EXAM_PLACE where UUID in :ids")
    List<Place> getAllByIds(@Param("ids") List<String> ids);
    @Modifying
    @Transactional
    @Query(nativeQuery = true , value = "select UUID from OP_EXAM_PLACE where EXAM_ID = :exam_id")
    List<String> queryMyIdByExamId(@Param("exam_id")String exam_id);
    @Modifying
    @Transactional
    @Query(nativeQuery = true, value = "select * from ATT_EXAM_PLACE where EXAM_ID in :ids")
    @Query(nativeQuery = true, value = "select * from OP_EXAM_PLACE where EXAM_ID in :ids")
    List<Place> queryByExamIds(@Param("ids") List<String> ids);
//    @Modifying
//    @Transactional
//    @Query(nativeQuery = true , value = "select * from ATT_EXAM_PLACE where EXAM_ID = :exam_id")
//    @Query(nativeQuery = true , value = "select * from OP_EXAM_PLACE where EXAM_ID = :exam_id")
//    List<ExamPlace> queryByName(@Param("name")String name);
}

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

@@ -45,9 +45,8 @@ public class Place implements Serializable, Cloneable {
    @Column(name = "EXAM_TYPE")
    public int exam_type;
    //状态  11一级审核通过 10一级审核未通过 15一级待审核,  20二级未通过 25二级待审核 , 35三级待提交
    @Column(name = "STATE")
    public int state;
    @Column(name = "VERIFY_STATE")
    public String verify_state;
//    @Column(name = "SUGGEST") //审核意见
//    public int suggest;

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

@@ -20,7 +20,9 @@ public interface IPlaceService {
    boolean duplicate(PlaceDuplicateBean bean);
    void verify(String uuid, int state, String suggest);
    void verifyOne(String uuid, String suggest);
    void batchVerify(List<String> ids);
    PlaceResultWrap queryToYear();

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

@@ -165,37 +165,47 @@ public class PlaceService extends BaseService implements IPlaceService {
    @Autowired
    IUnitRepository unitRepository;
    private Unit getUnit(String id) {
        List<Unit> unitList = unitRepository.getUnitBy(id);
        if (unitList.size() > 0) {
            Unit me = unitList.get(0);
            return me;
        }
        return null;
    }
    private ArrayList<String> getArr(Unit unit) {
        ArrayList list = new ArrayList();
        list.add(unit.uuid);
        ArrayList<String> ids = new ArrayList();
        ids.add(unit.uuid);
        String p_id = unit.getP_id();
        while (!TextUtils.isEmpty(p_id)) {
            List<Unit> unitList = unitRepository.getUnitBy(p_id);
            if (unitList.size() > 0) {
                Unit pUnit = unitList.get(0);
                list.add(pUnit.uuid);
                list.addAll(getArr(pUnit));
        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 list;
        return ids;
    }
    private void setQue(Place place) {
        String adminUnitId = Admin.getAdminUnitId(token);
        List<Unit> unitList = unitRepository.getUnitBy(adminUnitId);
        if (unitList.size() > 0) {
            Unit unit = unitList.get(0);
            place.setCurr_id(unit.uuid);
            ArrayList<String> list = getArr(unit);
        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){
                String id = list.get(i);
                if (i == 0) {
                    que = que + id;
                }else {
                } else {
                    que = que + "," + id;
                }
            }
            list.clear();
            place.setQueue(que);
        }
@@ -216,11 +226,12 @@ public class PlaceService extends BaseService implements IPlaceService {
        if (place.getUpdate_time() == null) {
            place.setUpdate_time(newDate);
        }
        if (TextUtils.isEmpty(place.getCreate_user()) || place.getCreate_user().equalsIgnoreCase("null")) {
            place.setCreate_user("无管理员");
        Admin admin = Admin.getAdminByToken(token);
        if (TextUtils.isEmpty(place.getCreate_user())) {
            place.setCreate_user(admin.name);
        }
        if (TextUtils.isEmpty(place.getUpdate_user()) || place.getCreate_user().equalsIgnoreCase("null")) {
            place.setUpdate_user("无管理员");
        if (TextUtils.isEmpty(place.getUpdate_user())) {
            place.setUpdate_user(admin.name);
        }
        setQue(place);
        repository.save(place);
@@ -240,6 +251,8 @@ public class PlaceService extends BaseService implements IPlaceService {
    public void update(Place newPlace) {
        Optional<Place> byId = repository.findById(newPlace.getUuid());
        Place oldPlace = byId.get();
        Admin admin = Admin.getAdminByToken(token);
        newPlace.setUpdate_user(admin.name);
        UpdateObjectTool.copyNullProperties(oldPlace, newPlace);
        repository.save(newPlace);
    }
@@ -269,17 +282,49 @@ public class PlaceService extends BaseService implements IPlaceService {
    }
    @Override
    public void verify(String uuid, int state, String suggest) {
    public void verifyOne(String uuid, String suggest) {
        Optional<Place> byId = repository.findById(uuid);
        Place oldPlace = byId.get();
        Admin admin = Admin.getAdminByToken(token);
        Place newPlace = new Place();
        newPlace.setState(state);
        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);
        }
        int i = ids.indexOf(oldPlace.getCurr_id());
        int j = ids.indexOf(admin.my_unit_id);
        if (i < j) {
            return false;
        }
        return true;
    }
    @Override
    public void batchVerify(List<String> ids) {
        Admin admin = Admin.getAdminByToken(token);
        List<Place> oldAll = repository.getAllByIds(ids);
        List<Place> newAll = new ArrayList<>();
        for (Place oldPlace : oldAll) {
            if (cannot(oldPlace, admin)) {
                continue;
            }
            Place newPlace = new Place();
            newPlace.setCurr_id(admin.my_unit_id);
            UpdateObjectTool.copyNullProperties(oldPlace, newPlace);
            newAll.add(newPlace);
        }
        repository.saveAll(newAll);
    }
    @Autowired
    IExamRepository examRepository;

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

@@ -1,7 +1,7 @@
package com.css.oa.exam.room.controller;
import com.css.oa.exam.base.BaseController;
import com.css.oa.exam.place.bean.VerifyReq;
import com.css.oa.exam.place.bean.VerifyOneReq;
import com.css.oa.exam.room.bean.RoomQueryReq;
import com.css.oa.exam.room.repository.Room;
import com.css.oa.exam.room.service.RoomService;
@@ -59,7 +59,7 @@ public class RoomController extends BaseController {
    @ApiOperation(value = "审核")
    @PostMapping("/verify")
    public Result verify(@RequestBody VerifyReq req) {
    public Result verify(@RequestBody VerifyOneReq req) {
        Result<Map> result;
        try {
            if(TextUtils.isEmpty(req.uuid)){

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

@@ -61,11 +61,12 @@ public class SubjectService extends BaseService implements ISubjectService {
        if (obj.getUpdate_time() == null) {
            obj.setUpdate_time(newDate);
        }
        if (TextUtils.isEmpty(obj.getCreate_user()) || obj.getCreate_user().equalsIgnoreCase("null")) {
            obj.setCreate_user("系统");
        Admin admin = Admin.getAdminByToken(token);
        if (TextUtils.isEmpty(obj.getCreate_user())) {
            obj.setCreate_user(admin.name);
        }
        if (TextUtils.isEmpty(obj.getUpdate_user()) || obj.getCreate_user().equalsIgnoreCase("null")) {
            obj.setUpdate_user("系统");
        if (TextUtils.isEmpty(obj.getUpdate_user())) {
            obj.setUpdate_user(admin.name);
        }
        repository.save(obj);
    }
@@ -114,12 +115,14 @@ public class SubjectService extends BaseService implements ISubjectService {
    }
    @Override
    public void update(Subject newTest) throws Exception {
    public void update(Subject newObj) throws Exception {
        checkPermission("管理员所在的单位没有编辑科目的权限");
        Optional<Subject> byId = repository.findById(newTest.getUuid());
        Optional<Subject> byId = repository.findById(newObj.getUuid());
        Subject old = byId.get();
        UpdateObjectTool.copyNullProperties(old, newTest);
        repository.save(newTest);
        Admin admin = Admin.getAdminByToken(token);
        newObj.setUpdate_user(admin.name);
        UpdateObjectTool.copyNullProperties(old, newObj);
        repository.save(newObj);
    }
    @Override