【修改】 考点服务器绑定专业sql增加查询条件
This commit is contained in:
@@ -115,6 +115,7 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
public PageResult<MonitorDO> getMonitorPage(MonitorPageReqVO pageReqVO) {
|
public PageResult<MonitorDO> getMonitorPage(MonitorPageReqVO pageReqVO) {
|
||||||
return monitorMapper.selectPage(pageReqVO);
|
return monitorMapper.selectPage(pageReqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getStuMonitor(StuMonitorPaperVo stuMonitorPaperVo) throws RuntimeException {
|
public long getStuMonitor(StuMonitorPaperVo stuMonitorPaperVo) throws RuntimeException {
|
||||||
String key = "userCache:" + stuMonitorPaperVo.getTaskId() + ":" + stuMonitorPaperVo.getStuId();
|
String key = "userCache:" + stuMonitorPaperVo.getTaskId() + ":" + stuMonitorPaperVo.getStuId();
|
||||||
@@ -171,7 +172,6 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 只有授权了“专业”,才去查 taskInVo 并校验
|
// 只有授权了“专业”,才去查 taskInVo 并校验
|
||||||
if (!authSpecialtyIds.isEmpty()) {
|
if (!authSpecialtyIds.isEmpty()) {
|
||||||
//查询 该试卷任务 设计的 专业
|
//查询 该试卷任务 设计的 专业
|
||||||
@@ -339,7 +339,6 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key), MonitorDO.class);
|
MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key), MonitorDO.class);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (info != null) {
|
if (info != null) {
|
||||||
if (!("1".equals(info.getExamStatus()))) {
|
if (!("1".equals(info.getExamStatus()))) {
|
||||||
return false;
|
return false;
|
||||||
@@ -386,7 +385,6 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
//考试下的任务 结束改为 结束 其他为待考
|
//考试下的任务 结束改为 结束 其他为待考
|
||||||
if ("1".equals(educationPaperTask.getTaskType())) {
|
if ("1".equals(educationPaperTask.getTaskType())) {
|
||||||
@@ -462,8 +460,6 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -488,13 +484,13 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
monitorMapper.updateById(monitorDO);
|
monitorMapper.updateById(monitorDO);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<TentSpecialy> filterSpecialtyList(List<TentSpecialy> inputList) {
|
public List<TentSpecialy> filterSpecialtyList(List<TentSpecialy> inputList) {
|
||||||
if (inputList == null || inputList.isEmpty()) {
|
if (inputList == null || inputList.isEmpty()) {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
@@ -527,6 +523,4 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -126,7 +126,7 @@
|
|||||||
<select id="selectExamSpecialtyBySpNameOne" parameterType="String" resultType="ExamSpecialty">
|
<select id="selectExamSpecialtyBySpNameOne" parameterType="String" resultType="ExamSpecialty">
|
||||||
SELECT *
|
SELECT *
|
||||||
from exam_specialty
|
from exam_specialty
|
||||||
where sp_name = #{name}
|
where sp_name = #{name} and deleted = 0 and status = 0
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectExamSpecialtyBySpName" parameterType="String"
|
<select id="selectExamSpecialtyBySpName" parameterType="String"
|
||||||
|
Reference in New Issue
Block a user