diff --git a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java index 99b3c2f..fdb01c2 100644 --- a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java +++ b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java @@ -176,7 +176,7 @@ public class ApplyController extends DefaultBaseController { Map params = requestParams(); if(null != params.get("applyAuditStates")){ if(!StringUtils.isBlank(params.get("applyAuditStates").toString())){ - params.put("applyAuditStates",Arrays.asList(params.get("applyAuditStates"))); + params.put("applyAuditStates",Arrays.asList(params.get("applyAuditStates").toString().split(","))); } } page.setParams(params); diff --git a/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java b/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java index 99461db..5c63695 100644 --- a/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java +++ b/src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java @@ -117,8 +117,6 @@ public class ClassPlanController extends DefaultBaseController { @GetMapping("list-page-exam") public SuccessResultList> listPageExam(ListPage page) { Map params = requestParams(); - params.put("examNowDate", DateUtil.getTime()); - params.put("reportType", "2"); page.setParams(params); return classPlanService.listPageExam(page); } diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java index c04df66..1443ff6 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java @@ -238,7 +238,7 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl } String startDate = params.get("startDate").toString(); String endDate = params.get("endDate").toString(); - String startTime = params.get("endTime").toString(); + String startTime = params.get("startTime").toString(); String endTime = params.get("endTime").toString(); List dayList = new ArrayList<>(); long daySub = DateUtil.getDaySub(startDate, endDate); @@ -343,6 +343,15 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl // 查询当前计划下所有课程和讲师绑定信息 List> lessonTeacherArray = classPlanDao.listClassPlanLessons(classPlanId); dto.setClassPlanLessons(lessonTeacherArray); + // 查询开班申请审核状态和原因 + params.clear(); + params.put("workTypeId", dto.getWorkerCatalog()); + params.put("orgId", dto.getOrgId()); + ExamCheckDTO examCheck = examCheckDao.getExamCheck(params); + if(examCheck != null){ + dto.setReportType(examCheck.getCheckStatus() + ""); + dto.setReportReason(examCheck.getReason()); + } return dto; } @@ -400,7 +409,7 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl //处理工种类型 WorkTypeDTO workTypeDTO = workTypeService.get(item.getWorkerCatalog()); item.setWorkerCatalogName(workTypeDTO == null ? "" : workTypeDTO.getWorkTypeName()); - //查询审核状态 + //查询考试申请状态 queryMap.clear(); queryMap.put("planId", item.getClassPlanId()); queryMap.put("workTypeId", item.getWorkerCatalog()); @@ -408,7 +417,7 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl ExamCheckDTO examCheck = examCheckDao.get(queryMap); item.setReportType(examCheck.getCheckStatus() + ""); //查询报名人数 - if(examCheck.getCheckStatus() == 2){ + if(examCheck.getCheckStatus() == 1){ List applyStudentsDTOS = studentsService.listByClssId(item.getClassPlanId()); item.setSignUpUserCount(applyStudentsDTOS == null ? 0 : applyStudentsDTOS.size()); } else { @@ -455,14 +464,16 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl || page.getParams().get("orgId").toString().length() == 0){ return new SuccessResultList<>(new ArrayList<>(), 0, 0L); } + // 开班计划审核状态 1通过 + page.getParams().put("checkStatus", "1"); + // 当前时间,目前约定只有培训结束时间大于当前时间才可以申请考试 + // TODO 正式上线时需要将约束放开 + //page.getParams().put("examNowDate", DateUtil.getTime()); PageHelper.startPage(page.getPage(), page.getRows()); List classPlanDTOs = list(page.getParams()); Map queryMap = getHashMap(4); for(ClassPlanDTO item : classPlanDTOs){ - //处理培训项目 - DataDTO dataDTO = dataService.get(item.getProjectCatalogId()); - item.setProjectCatalogName(dataDTO == null ? "" : dataDTO.getDataName()); - //处理工种类型 + // 查询工种类型 WorkTypeDTO workTypeDTO = workTypeService.get(item.getWorkerCatalog()); item.setWorkerCatalogName(workTypeDTO == null ? "" : workTypeDTO.getWorkTypeName()); //查询已报名人数 diff --git a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml index 9440e9b..cc8958d 100644 --- a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml +++ b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml @@ -309,21 +309,23 @@ FROM e_class_plan t1 LEFT JOIN e_work_type t2 ON t1.worker_catalog = t2.work_type_id + LEFT JOIN management_exam_check t3 ON t1.class_plan_id = t3.plan_id WHERE 1 = 1 - - AND t1.worker_catalog = #{workerCatalog} - AND t1.org_id = #{orgId} - - AND t1.report_type = #{reportType} + + AND t1.worker_catalog = #{workerCatalog} AND t1.sign_up_start_time #{signNowDate} AND t1.sign_up_end_time = ]]> #{signNowDate} + + + AND t3.check_status = #{checkStatus} + AND t1.plan_end_time #{examNowDate} diff --git a/src/main/resources/static/route/classplan/list-report-exam.html b/src/main/resources/static/route/classplan/list-report-exam.html index d220eb9..4917b6f 100644 --- a/src/main/resources/static/route/classplan/list-report-exam.html +++ b/src/main/resources/static/route/classplan/list-report-exam.html @@ -18,13 +18,7 @@
- -
-
- -
-
- +
+
@@ -115,6 +118,7 @@ $('#class-plan-btn-event').show(); } else { $('#class-plan-btn-event').hide(); + $('#is-commit-plan-btn').show(); } layer.close(loadIndex); }, function (code, data) { @@ -175,7 +179,8 @@ limitName: 'rows' }, where : { - applyWorkTypeId : workerCatalog + applyWorkTypeId : workerCatalog, + applyAuditStates : '-1,0,2,3' }, cols: [ [ @@ -254,11 +259,12 @@ templet: function(row) { var applyAuditState = row['applyAuditState']; var rowData = '
'; - rowData +=''; if (applyAuditState === 0) { - rowData +=''; + rowData +=''; + } else { + rowData +=''; } - rowData +='' + rowData +='' rowData +='
'; return rowData; } @@ -285,7 +291,7 @@ keywords: $('#keywords').val(), startTime: $('#startTime').val(), endTime: $('#endTime').val(), - applyAuditStates:$('#applyAuditStates').val(), + applyAuditStates:$('#applyAuditStates').val() == '' ? '-1,0,2,3' : $('#applyAuditStates').val(), applyWorkTypeId : workerCatalog }, page: { diff --git a/src/main/resources/static/route/classplan/list.html b/src/main/resources/static/route/classplan/list.html index 96a47d5..7069924 100644 --- a/src/main/resources/static/route/classplan/list.html +++ b/src/main/resources/static/route/classplan/list.html @@ -18,7 +18,7 @@
- +
@@ -97,12 +97,12 @@ dom += '查看申请'; return dom; } - if(row['reportType'] === '2'){ + if(row['reportType'] === '1'){ dom += '报名人员'; - dom += '申请通过'; + dom += '申请通过'; return dom; } - if(row['reportType'] === '3'){ + if(row['reportType'] === '-1'){ dom += '报名人员'; dom += '修改重申'; return dom; @@ -116,11 +116,11 @@ if(row['reportType'] === '0'){ return '等待审核'; } - if(row['reportType'] === '2'){ + if(row['reportType'] === '1'){ dom += '审核通过'; return dom; } - if(row['reportType'] === '3'){ + if(row['reportType'] === '-1'){ return '审核未通过'; } return dom; @@ -223,6 +223,7 @@ }, height: $win.height() - 90, }); + } // 初始化日期 diff --git a/src/main/resources/static/route/classplan/save.html b/src/main/resources/static/route/classplan/save.html index 4a99ece..c2ce584 100644 --- a/src/main/resources/static/route/classplan/save.html +++ b/src/main/resources/static/route/classplan/save.html @@ -461,6 +461,7 @@ var loadLayerIndex; top.restAjax.post(top.restAjax.path('api/classplan/save', []), formData.field, null, function(code, data) { top.dialog.close(index); + top.dialog.msg('申请已递交'); closeBox(); }, function(code, data) { top.dialog.msg(data.msg); diff --git a/src/main/resources/static/route/classplan/update.html b/src/main/resources/static/route/classplan/update.html index e508ac2..dc712c4 100644 --- a/src/main/resources/static/route/classplan/update.html +++ b/src/main/resources/static/route/classplan/update.html @@ -259,7 +259,7 @@ initPlanPDFUploadFile(); initPlanStartTimeDateTime(); initPlanEndTimeDateTime(); - if(dataFormData['reportReason'] != ''){ + if(dataFormData['reportReason'] != '' || dataFormData['reportType'] == '-1'){ $('#report-reason-block').text('未通过原因：' + dataFormData['reportReason']); $('#report-reason-block').show(); } diff --git a/src/main/resources/templates/index1.html b/src/main/resources/templates/index1.html index 80a1b90..16f6814 100644 --- a/src/main/resources/templates/index1.html +++ b/src/main/resources/templates/index1.html @@ -488,6 +488,14 @@ self.resizeTimeout = null; }, 500); }); + top.restAjax.get(top.restAjax.path('api/teacher/getorginfo', []), {}, null, function (code, data) { + if(typeof (data.institutionName) != 'undefined' + && data.institutionName != ''){ + $(parent.document).find('#sideMenu .layui-logo span').text(data.institutionName); + } + }, function (code, data) { + top.dialog.msg(data.msg); + }); } })