place半途

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

@@ -21,4 +21,9 @@ public interface IUnitRepository extends JpaRepository<Unit, String>, JpaSpecifi
    @Query(nativeQuery = true, value = "select * from OP_EXAM_UNIT where UUID = :unit_id")
    List<Unit> getUnitBy(@Param("unit_id") String unit_id);
    @Modifying
    @Transactional
    @Query(nativeQuery = true, value = "select * from OP_EXAM_UNIT where P_ID = -1")
    List<Unit> getTop();
}

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

@@ -14,14 +14,11 @@ public class PlaceQueryReq {
    //包含exam_id、考点名称、维护单位、区域、状态
    public class Condition {
        public String exam_id;
        public String place_name;
        public String unit;
        public String area;
        public String state;
        public String fatherName;
        public String myName;
        public ArrayList<String> sonNames = new ArrayList<>();
        public String verify_state;
    }

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

@@ -33,11 +33,11 @@ public class PlaceController extends BaseController {
    public Result add(@RequestBody Place place) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            if (TextUtils.isEmpty(place.getUnit())) {
                return setErr("unit参数不能为空");
            }
            String token = getToken();
            mService.setToken(token);
            mService.add(place);
            result = setResult();
        } catch (Exception e) {
@@ -66,11 +66,11 @@ 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参数不能为空");
            }
            String token = getToken();
            mService.setToken(token);
            mService.update(newPlace);
            result = setResult();
        } catch (Exception e) {
@@ -80,7 +80,7 @@ public class PlaceController extends BaseController {
        return result;
    }
    @ApiOperation(value = "考点管理-查询")
    @ApiOperation(value = "无条件查询")
    @PostMapping("/queryByExamId")
    public Result queryByExamId(@RequestBody PlaceQueryReq req) {
        //1,根据考试id查询考点
@@ -89,6 +89,8 @@ public class PlaceController extends BaseController {
            if (req.condition.exam_id == null || req.condition.exam_id.equals("")) {
                return setErr("exam_id不能为空");
            }
            String token = getToken();
            mService.setToken(token);
            Map obj = mService.query(req);
            result = setResult("places", obj);
        } catch (Exception e) {
@@ -107,6 +109,8 @@ public class PlaceController extends BaseController {
            if (req == null) {
                return setErr("请求参数格式错误");
            }
            String token = getToken();
            mService.setToken(token);
            Map obj = mService.query(req);
            result = setResult("places", obj);
        } catch (Exception e) {
@@ -139,11 +143,11 @@ public class PlaceController extends BaseController {
    public Result verifyOne(@RequestBody VerifyOneReq req) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            if (TextUtils.isEmpty(req.uuid)) {
                return setErr("uuid参数不能为空");
            }
            String token = getToken();
            mService.setToken(token);
            mService.verifyOne(req.uuid, req.suggest);
            result = setResult();
        } catch (Exception e) {
@@ -158,6 +162,8 @@ public class PlaceController extends BaseController {
    public Result batchVerify(@RequestBody List<String> ids) {
        Result<Map> result;
        try {
            String token = getToken();
            mService.setToken(token);
            mService.batchVerify(ids);
            result = setResult();
        } catch (Exception e) {

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

@@ -9,7 +9,7 @@ import java.io.Serializable;
@Data
@Entity
@Table(name = "ATT_EXAM_PLACE")
@Table(name = "OP_EXAM_PLACE")
public class Place implements Serializable, Cloneable {
    public static final long serialVersionUID = -2982710232836091001L;
@@ -25,7 +25,7 @@ public class Place implements Serializable, Cloneable {
    public String place_code;
    @Column(name = "QUEUE")
    public String queue;
    public String queue;// 1,2,3,4
    @Column(name = "CURR_ID")
    public String curr_id;

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

@@ -6,6 +6,7 @@ import com.css.oa.exam.admin.repository.Unit;
import com.css.oa.exam.base.BaseService;
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;
@@ -23,6 +24,8 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import javax.persistence.criteria.*;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import java.util.*;
@Slf4j
@@ -55,11 +58,18 @@ public class PlaceService extends BaseService implements IPlaceService {
            public Predicate toPredicate(Root<Place> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
                List<Predicate> predicateList = new ArrayList<>();
                if (condition != null) {
                    //0.
                    //0.所属考试
                    String exam_id = condition.exam_id;
                    if (!TextUtils.isEmpty(exam_id)) {
                        predicateList.add(criteriaBuilder.equal(root.get("exam_id").as(String.class), exam_id));
                    }
                    //我创建的、我的下级提交的
                    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);//包含 包含条件
                    }
                    //1,考点名
                    String place_name = condition.place_name;
                    if (!TextUtils.isEmpty(place_name)) {
@@ -76,14 +86,27 @@ public class PlaceService extends BaseService implements IPlaceService {
                    if (!TextUtils.isEmpty(area)) {
                        predicateList.add(criteriaBuilder.equal(root.get("area").as(String.class), area));
                    }
                    //4.状态
                    String state = condition.state;
                    if (!TextUtils.isEmpty(state)) {
                        int stateInt = Integer.parseInt(state);
                        predicateList.add(criteriaBuilder.equal(root.get("state").as(Integer.class), stateInt));
                    //4.审核状态
                    String verify_state = condition.verify_state;
                    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)){
                        //上级审核中
                        Expression<String> queue = root.get("queue").as(String.class);
                        EntityType<Place> model = root.getModel();
                        //Attribute<Place> queue1 = model.getAttribute("queue");
                        //root.join()
                        //Path<Place> queue1 = root.get("queue");
                    }else if(verify_state.equalsIgnoreCase(DropdownVerifyState.ED)){
                        //审核通过
                        List<Unit> top = unitRepository.getTop();
                        if(top != null && top.size() > 0){
                            predicateList.add(criteriaBuilder.equal(root.get("curr_id").as(String.class), top.get(0).getUuid()));
                        }
                    }
                    //进入考点管理页面默认的筛选
                    /*//进入考点管理页面默认的筛选
                    List<String> sonNames = condition.sonNames;
                    String myName = condition.myName;
                    if (sonNames == null || sonNames.size() == 0) {
@@ -145,7 +168,7 @@ public class PlaceService extends BaseService implements IPlaceService {
                            Predicate or = criteriaBuilder.or(isMe, totalSon);
                            predicateList.add(or);
                        }
                    }
                    }*/
                }
                Predicate[] pre = new Predicate[predicateList.size()];
                pre = predicateList.toArray(pre);

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

@@ -65,10 +65,10 @@ public class RoomController extends BaseController {
            if(TextUtils.isEmpty(req.uuid)){
                return setErr("uuid参数不能为空");
            }
            if(req.state == 0){
                return setErr("state参数不能为空或不能为0");
            }
            mService.verify(req.uuid, req.state, req.suggest);
//            if(req.state == 0){
//                return setErr("state参数不能为空或不能为0");
//            }
//            mService.verify(req.uuid, req.state, req.suggest);
            result = setResult();
        } catch (Exception e) {
            result = setErr(e.getMessage());