From 915fab16325cd21bf0b3d2bb9025cac730b895d5 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Tue, 29 Jun 2021 17:50:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E8=A7=92=E8=89=B2=E9=A6=96=E9=A1=B5=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/indexcount/IndexCountController.java | 7 ------- .../examapply/impl/ExamApplyServiceImpl.java | 2 +- .../examcheck/impl/ExamCheckServiceImpl.java | 4 ++-- .../cn/com/tenlion/util/CertificateUtil.java | 2 +- .../mybatis/mapper/teacher/teacher-mapper.xml | 2 +- src/main/resources/templates/index2.html | 21 ++++++++++++------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java b/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java index 2ef4ff9..861c4c9 100644 --- a/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java +++ b/src/main/java/cn/com/tenlion/controller/api/indexcount/IndexCountController.java @@ -234,7 +234,6 @@ public class IndexCountController extends DefaultBaseController { List> list = new ArrayList<>(); Map map1 = new HashMap<>(); Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); String institutionId = this.getInstitutionId(); if(!StringUtils.isBlank(institutionId)){ Map resultMap= classPlanService.countPlanType(institutionId); @@ -245,9 +244,6 @@ public class IndexCountController extends DefaultBaseController { map2.put("name","复训"); map2.put("value",0); list.add(map2); - map3.put("name","换证"); - map3.put("value",0); - list.add(map3); }else{ map1.put("name","初训"); map1.put("value",resultMap.get("1")); @@ -255,9 +251,6 @@ public class IndexCountController extends DefaultBaseController { map2.put("name","复训"); map2.put("value",resultMap.get("2")); list.add(map2); - map3.put("name","换证"); - map3.put("value",resultMap.get("3")); - list.add(map3); } } diff --git a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java index 4d12c14..2f86af1 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java @@ -231,7 +231,7 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp Integer noCheck = statisticsCount(params); params.put("checkStatus", 1); Integer pass = statisticsCount(params); - params.put("checkStatus", 2); + params.put("checkStatus", -1); Integer fail = statisticsCount(params); params = new HashMap<>(1); params.put("noCheck", noCheck); diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index 507645a..63bb9e3 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -231,9 +231,9 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe public Map statistics(Map params) { params.put("checkStatus", 0); Integer noCheck = statisticsCount(params); - params.put("checkStatus", 2); + params.put("checkStatus", 1); Integer pass = statisticsCount(params); - params.put("checkStatus", 3); + params.put("checkStatus", -1); Integer fail = statisticsCount(params); params = new HashMap<>(1); params.put("noCheck", noCheck); diff --git a/src/main/java/cn/com/tenlion/util/CertificateUtil.java b/src/main/java/cn/com/tenlion/util/CertificateUtil.java index ad7d472..867f8fd 100644 --- a/src/main/java/cn/com/tenlion/util/CertificateUtil.java +++ b/src/main/java/cn/com/tenlion/util/CertificateUtil.java @@ -41,7 +41,7 @@ public class CertificateUtil { // 查询文化程度 if(applyStudentsNewDTO.getEducation() == null || applyStudentsNewDTO.getEducation().length() == 0){ - cardentialDTO.setEducationDegree("EMPTY"); + cardentialDTO.setEducationDegree("-"); } else { DataDTO educationData = dataService.get(applyStudentsNewDTO.getEducation()); cardentialDTO.setEducationDegree(educationData.getDataName()); diff --git a/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml b/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml index 0ca6bb2..808f262 100644 --- a/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml +++ b/src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml @@ -254,7 +254,7 @@ 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' from e_teacher - WHERE is_delete = 0 AND org_id = #{orgId} + WHERE is_delete = 0 diff --git a/src/main/resources/templates/index2.html b/src/main/resources/templates/index2.html index e2e0149..dbc760c 100644 --- a/src/main/resources/templates/index2.html +++ b/src/main/resources/templates/index2.html @@ -42,12 +42,12 @@ 考试机构管理 -
  • +
  • @@ -60,12 +60,12 @@ 考试申请审核
    • -
  • + @@ -98,12 +98,12 @@

    0

    • -
  • + @@ -132,7 +132,7 @@
    • 开班计划审核
    • 考试申请审核
      • -
    • 考试信息分配
      • +
    @@ -265,6 +265,13 @@ var date = new Date(); self.teachingPlan(calendar); 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(){ top.restAjax.get('api/indexcount/count-exam-check-num', {}, null, function(code, data) {