Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup

Browse Source
This commit is contained in:
wans 2021-05-15 17:08:31 +08:00
commit 4529cd056f
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java
View File

@ -242,10 +242,6 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe
ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params); ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params);
if(null == examCheckDTO) { if(null == examCheckDTO) {
return false; return false;
}else {
if(0 == examCheckDTO.getCheckStatus() || 3 == examCheckDTO.getCheckStatus()) {
return false;
}
} }
return true; return true;
} }
@ -258,10 +254,6 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe
ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params); ExamCheckDTO examCheckDTO = examCheckDao.getExamCheck(params);
if(null == examCheckDTO) { if(null == examCheckDTO) {
return true; return true;
}else {
if(0 == examCheckDTO.getCheckStatus() || 3 == examCheckDTO.getCheckStatus()) {
return true;
}
} }
return false; return false;
} }

1
src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml
View File

@ -381,6 +381,7 @@
management_exam_check t1 management_exam_check t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
AND (t1.check_status = 0 OR t1.check_status = 3)
<if test="workTypeId != null and workTypeId != ''"> <if test="workTypeId != null and workTypeId != ''">
AND t1.work_type_id = #{workTypeId} AND t1.work_type_id = #{workTypeId}
</if> </if>

2
src/main/resources/static/route/examapply/list-check.html
View File

@ -37,7 +37,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent"> <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
<i class="fa fa-lg fa-edit"></i> 考试申请审核 <i class="fa fa-lg fa-edit"></i> 考试申请审核
</button> </button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="checkMore"> <button type="button" class="layui-btn layui-btn-sm" lay-event="checkMore">
<i class="fa fa-lg fa-edit"></i> 考试申请批量审核 <i class="fa fa-lg fa-edit"></i> 考试申请批量审核
</button> </button>
</div> </div>

2
src/main/resources/static/route/examcheck/list.html
View File

@ -37,7 +37,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent"> <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
<i class="fa fa-lg fa-edit"></i> 开班计划审核 <i class="fa fa-lg fa-edit"></i> 开班计划审核
</button> </button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="checkMore"> <button type="button" class="layui-btn layui-btn-sm" lay-event="checkMore">
<i class="fa fa-lg fa-edit"></i> 开班计划批量审核 <i class="fa fa-lg fa-edit"></i> 开班计划批量审核
</button> </button>
</div> </div>