que

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

@@ -0,0 +1,34 @@
package com.css.oa.exam.place.bean;
import java.util.*;
public class DropdownVerifyState {
    private static DropdownVerifyState states;
    private static LinkedList list;
    public static String WAIT = "待提交";
    public static String ING = "审核中";
    public static String ED = "审核通过";
    public DropdownVerifyState() {
        //待提交、审核中、审核通过
        list = new LinkedList();
        list.add(WAIT);
        list.add(ING);
        list.add(ED);
    }
    public static DropdownVerifyState getInstance() {
        if (states == null) {
            states = new DropdownVerifyState();
        }
        return states;
    }
    public List getData() {
        return list;
    }
}

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

@@ -1,58 +0,0 @@
{
  "total": 3,
  "list":[
    {
      "year": 2021,
      "list": [
        {
          "exam_name": "上半年考试",
          "list": [
            {},{},{}
          ]
        },
        {
          "exam_name": "下半年考试",
          "list": [
            {},{},{}
          ]
        }
      ]
    },
    {
      "year": 2020,
      "list": [
        {
          "exam_name": "上半年考试",
          "list": [
            {},{},{}
          ]
        },
        {
          "exam_name": "下半年考试",
          "list": [
            {},{},{}
          ]
        }
      ]
    },
    {
      "year": 2019,
      "list": [
        {
          "exam_name": "上半年考试",
          "list": [
            {},{},{}
          ]
        },
        {
          "exam_name": "下半年考试",
          "list": [
            {},{},{}
          ]
        }
      ]
    }
  ]
}

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

@@ -1,10 +1,7 @@
package com.css.oa.exam.place.controller;
import com.css.oa.exam.base.BaseController;
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.VerifyReq;
import com.css.oa.exam.place.bean.*;
import com.css.oa.exam.place.repository.Place;
import com.css.oa.exam.place.service.PlaceService;
import com.css.oa.utils.Result;
@@ -14,6 +11,8 @@ 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;
@@ -36,8 +35,10 @@ 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参数不能为空(当前用户所属机构名称)");
                return setErr("unit参数不能为空");
            }
            mService.add(place);
            result = setResult();
@@ -182,4 +183,18 @@ public class PlaceController extends BaseController {
        return result;
    }
    @ApiOperation(value = "年份-考试-考点")
    @GetMapping("/dropdownState")
    public Result dropdownState() {
        Result<Map> result;
        try {
            List data = DropdownVerifyState.getInstance().getData();
            result = setResult("verifyState", data);
        } catch (Exception e) {
            result = setErr();
            e.printStackTrace();
        }
        return result;
    }
}

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

@@ -24,6 +24,12 @@ public class Place implements Serializable, Cloneable {
    @Column(name = "PLACE_CODE")
    public String place_code;
    @Column(name = "QUEUE")
    public String queue;
    @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/PlaceService.java

@@ -1,5 +1,8 @@
package com.css.oa.exam.place.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.Exam;
import com.css.oa.exam.exam.repository.IExamRepository;
@@ -46,7 +49,7 @@ public class PlaceService extends BaseService implements IPlaceService {
        return map;
    }
    private Specification getSpec(PlaceQueryReq.Condition condition){
    private Specification getSpec(PlaceQueryReq.Condition condition) {
        Specification<Place> spec = new Specification<Place>() {
            @Override
            public Predicate toPredicate(Root<Place> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
@@ -159,9 +162,49 @@ public class PlaceService extends BaseService implements IPlaceService {
        return list;
    }
    @Autowired
    IUnitRepository unitRepository;
    private ArrayList<String> getArr(Unit unit) {
        ArrayList list = new ArrayList();
        list.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));
            }
        }
        return list;
    }
    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);
            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;
                }
            }
            place.setQueue(que);
        }
    }
    @Override
    public void add(Place place) {
        log.info("examPlace => " + place.toString());
        if (place.getUuid() == null) {
            String id = UUIDGenerator.getUUID();
            place.setUuid(id);
@@ -179,6 +222,7 @@ public class PlaceService extends BaseService implements IPlaceService {
        if (TextUtils.isEmpty(place.getUpdate_user()) || place.getCreate_user().equalsIgnoreCase("null")) {
            place.setUpdate_user("无管理员");
        }
        setQue(place);
        repository.save(place);
    }