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

修改后台不同角色首页内容

Browse Source
This commit is contained in:
wans 2021-06-29 17:50:24 +08:00
parent b951422f9e
commit 915fab1632
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java
View File

@ -234,7 +234,6 @@ public class IndexCountController extends DefaultBaseController {
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
Map<String, Object> map2 = new HashMap<>(); Map<String, Object> map2 = new HashMap<>();
Map<String, Object> map3 = new HashMap<>();
String institutionId = this.getInstitutionId(); String institutionId = this.getInstitutionId();
if(!StringUtils.isBlank(institutionId)){ if(!StringUtils.isBlank(institutionId)){
Map<String, Object> resultMap= classPlanService.countPlanType(institutionId); Map<String, Object> resultMap= classPlanService.countPlanType(institutionId);
@ -245,9 +244,6 @@ public class IndexCountController extends DefaultBaseController {
map2.put("name","复训"); map2.put("name","复训");
map2.put("value",0); map2.put("value",0);
list.add(map2); list.add(map2);
map3.put("name","换证");
map3.put("value",0);
list.add(map3);
}else{ }else{
map1.put("name","初训"); map1.put("name","初训");
map1.put("value",resultMap.get("1")); map1.put("value",resultMap.get("1"));
@ -255,9 +251,6 @@ public class IndexCountController extends DefaultBaseController {
map2.put("name","复训"); map2.put("name","复训");
map2.put("value",resultMap.get("2")); map2.put("value",resultMap.get("2"));
list.add(map2); list.add(map2);
map3.put("name","换证");
map3.put("value",resultMap.get("3"));
list.add(map3);
} }
} }

2
src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java
View File

@ -231,7 +231,7 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp
Integer noCheck = statisticsCount(params); Integer noCheck = statisticsCount(params);
params.put("checkStatus", 1); params.put("checkStatus", 1);
Integer pass = statisticsCount(params); Integer pass = statisticsCount(params);
params.put("checkStatus", 2); params.put("checkStatus", -1);
Integer fail = statisticsCount(params); Integer fail = statisticsCount(params);
params = new HashMap<>(1); params = new HashMap<>(1);
params.put("noCheck", noCheck); params.put("noCheck", noCheck);

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

@ -231,9 +231,9 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe
public Map<String, Object> statistics(Map<String, Object> params) { public Map<String, Object> statistics(Map<String, Object> params) {
params.put("checkStatus", 0); params.put("checkStatus", 0);
Integer noCheck = statisticsCount(params); Integer noCheck = statisticsCount(params);
params.put("checkStatus", 2); params.put("checkStatus", 1);
Integer pass = statisticsCount(params); Integer pass = statisticsCount(params);
params.put("checkStatus", 3); params.put("checkStatus", -1);
Integer fail = statisticsCount(params); Integer fail = statisticsCount(params);
params = new HashMap<>(1); params = new HashMap<>(1);
params.put("noCheck", noCheck); params.put("noCheck", noCheck);

2
src/main/java/cn/com/tenlion/util/CertificateUtil.java
View File

@ -41,7 +41,7 @@ public class CertificateUtil {
// 查询文化程度 // 查询文化程度
if(applyStudentsNewDTO.getEducation() == null if(applyStudentsNewDTO.getEducation() == null
|| applyStudentsNewDTO.getEducation().length() == 0){ || applyStudentsNewDTO.getEducation().length() == 0){
cardentialDTO.setEducationDegree("EMPTY"); cardentialDTO.setEducationDegree("-");
} else { } else {
DataDTO educationData = dataService.get(applyStudentsNewDTO.getEducation()); DataDTO educationData = dataService.get(applyStudentsNewDTO.getEducation());
cardentialDTO.setEducationDegree(educationData.getDataName()); cardentialDTO.setEducationDegree(educationData.getDataName());

2
src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml
View File

@ -254,7 +254,7 @@
sum(case when teacher_catalog = 1 then 1 else 0 end) as '1', sum(case when teacher_catalog = 1 then 1 else 0 end) as '1',
sum(case when teacher_catalog = 2 then 1 else 0 end) as '2' sum(case when teacher_catalog = 2 then 1 else 0 end) as '2'
from e_teacher from e_teacher
WHERE is_delete = 0 AND org_id = #{orgId} WHERE is_delete = 0
</select> </select>
<resultMap id="teacherLessonsTimeDTO" type="cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO"> <resultMap id="teacherLessonsTimeDTO" type="cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO">

21
src/main/resources/templates/index2.html
View File

@ -42,12 +42,12 @@
<cite>考试机构管理</cite> <cite>考试机构管理</cite>
</a> </a>
</li> </li>
<li class="layui-col-xs3"> <!--<li class="layui-col-xs3">
<a lay-href="/route/examinationuser/list.html" lay-open-type="1"> <a lay-href="/route/examinationuser/list.html" lay-open-type="1">
<i class="layui-icon layui-icon-chat"></i> <i class="layui-icon layui-icon-chat"></i>
<cite>考务人员管理</cite> <cite>考务人员管理</cite>
</a> </a>
</li> </li>-->
<li class="layui-col-xs3"> <li class="layui-col-xs3">
<a lay-href="/route/examcheck/list.html" lay-open-type="1"> <a lay-href="/route/examcheck/list.html" lay-open-type="1">
<i class="layui-icon layui-icon-find-fill"></i> <i class="layui-icon layui-icon-find-fill"></i>
@ -60,12 +60,12 @@
<cite>考试申请审核</cite> <cite>考试申请审核</cite>
</a> </a>
</li> </li>
<li class="layui-col-xs3"> <!--<li class="layui-col-xs3">
<a lay-href="/route/examapply/list.html" lay-open-type="1"> <a lay-href="/route/examapply/list.html" lay-open-type="1">
<i class="layui-icon layui-icon-user"></i> <i class="layui-icon layui-icon-user"></i>
<cite>考试信息分配</cite> <cite>考试信息分配</cite>
</a> </a>
</li> </li>-->
</ul> </ul>
<!--<ul class="layui-row layui-col-space10"></ul>--> <!--<ul class="layui-row layui-col-space10"></ul>-->
</div> </div>
@ -98,12 +98,12 @@
<p><cite id="stationInstitutionNum">0</cite></p> <p><cite id="stationInstitutionNum">0</cite></p>
</a> </a>
</li> </li>
<li class="layui-col-xs6"> <!--<li class="layui-col-xs6">
<a lay-href="" class="layadmin-backlog-body"> <a lay-href="" class="layadmin-backlog-body">
<h3>考务人员</h3> <h3>考务人员</h3>
<p><cite id="examinationNum">0</cite></p> <p><cite id="examinationNum">0</cite></p>
</a> </a>
</li> </li>-->
<!--<li class="layui-col-xs6">--> <!--<li class="layui-col-xs6">-->
<!--&lt;!&ndash;onclick="layer.tips('不跳转', this, {tips: 3});"&ndash;&gt;--> <!--&lt;!&ndash;onclick="layer.tips('不跳转', this, {tips: 3});"&ndash;&gt;-->
<!--<a href="javascript:;" class="layadmin-backlog-body">--> <!--<a href="javascript:;" class="layadmin-backlog-body">-->
@ -132,7 +132,7 @@
<ul class="layui-tab-title" > <ul class="layui-tab-title" >
<li class="layui-this" lay-id="a">开班计划审核</li> <li class="layui-this" lay-id="a">开班计划审核</li>
<li lay-id="b">考试申请审核</li> <li lay-id="b">考试申请审核</li>
<li lay-id="c">考试信息分配</li> <!--<li lay-id="c">考试信息分配</li>-->
</ul> </ul>
<div class="layui-tab-content" > <div class="layui-tab-content" >
<iframe src="route/examcheck/list.html" id="iframeId" style="width: 100%; height: 568px; border:none"></iframe> <iframe src="route/examcheck/list.html" id="iframeId" style="width: 100%; height: 568px; border:none"></iframe>
@ -265,6 +265,13 @@
var date = new Date(); var date = new Date();
self.teachingPlan(calendar); self.teachingPlan(calendar);
calendar.render(); calendar.render();
setTimeout(function(){
var titles = $('.fc-event-title-container').find('div');
$.each(titles, function(){
$(this).parent().attr('title',$(this).html());
$(this).parent().attr('style','cursor: pointer');
});
},1000)
}, },
initEChart0: function(){ initEChart0: function(){
top.restAjax.get('api/indexcount/count-exam-check-num', {}, null, function(code, data) { top.restAjax.get('api/indexcount/count-exam-check-num', {}, null, function(code, data) {