diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java index 0c95ddb..1ac0d0b 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -1,26 +1,32 @@ package cn.com.tenlion.service.apply.impl; +import cn.com.tenlion.dao.apply.IApplyDao; +import cn.com.tenlion.pojo.bos.apply.ApplyBO; +import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.pojo.pos.apply.ApplyPO; +import cn.com.tenlion.pojo.vos.apply.ApplyAuditVO; +import cn.com.tenlion.pojo.vos.apply.ApplyVO; +import cn.com.tenlion.pojo.vos.applyauditlog.ApplyAuditLogVO; +import cn.com.tenlion.pojo.vos.traininginstitutionuser.InstitutionUserVO; +import cn.com.tenlion.service.apply.IApplyService; +import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import cn.com.tenlion.dao.apply.IApplyDao; -import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; -import cn.com.tenlion.pojo.vos.apply.ApplyVO; -import cn.com.tenlion.pojo.bos.apply.ApplyBO; -import cn.com.tenlion.pojo.pos.apply.ApplyPO; -import cn.com.tenlion.service.apply.IApplyService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @ClassName: ApplyServiceImpl @@ -240,7 +246,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic - public void updateAuditState(String token,ApplyAuditVO applyAuditVO){ + public void updateAuditState(String token, ApplyAuditVO applyAuditVO){ Map params = new HashMap<>(); params.put("applyId",applyAuditVO.getApplyId()); params.put("applyAuditState",applyAuditVO.getApplyAuditState()); 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 cb4a8ae..55585ca 100644 --- a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml +++ b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml @@ -285,6 +285,9 @@ e_class_plan t1 WHERE 1 = 1 + + AND t1.worker_catalog = #{workerCatalog} + AND ( t1.id LIKE CONCAT('%', #{keywords}, '%') diff --git a/src/main/resources/static/route/classplan/save.html b/src/main/resources/static/route/classplan/save.html index 6c80141..61c3035 100644 --- a/src/main/resources/static/route/classplan/save.html +++ b/src/main/resources/static/route/classplan/save.html @@ -22,82 +22,155 @@
-
- -
- +
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
-
- -
- +
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+
+
@@ -121,67 +194,85 @@ base: 'assets/layuiadmin/' //静态资源所在路径 }).extend({ index: 'lib/index' //主入口模块 - }).use(['index', 'form', 'laydate', 'laytpl'], function(){ + }).use(['index', 'table', 'form', 'laydate', 'laytpl'], function(){ var $ = layui.$; + var $win = $(window); + var table = layui.table; var form = layui.form; + var admin = layui.admin; var laytpl = layui.laytpl; var laydate = layui.laydate; var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; - function closeBox() { - parent.layer.close(parent.layer.getFrameIndex(window.name)); + // 初始化内容 + function initData() { + initPlanStartTimeDateTime(); + initPlanEndTimeDateTime(); + initSignUpStartTimeDateTime(); + initSignUpEndTimeDateTime(); + initWorkerCatalogSelect(); } + initData(); - function refreshDownloadTemplet(fileName, file) { - var dataRander = {}; - dataRander[fileName] = file; - - laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) { - document.getElementById(fileName +'FileBox').innerHTML = html; + // 初始化培训工种下拉选择 + function initWorkerCatalogSelect() { + laytpl(document.getElementById('workerCatalogSelectTemplate').innerHTML).render([], function(html) { + document.getElementById('workerCatalogSelectTemplateBox').innerHTML = html; }); - } - - // 初始化文件列表 - function initFileList(fileName, ids, callback) { - var dataForm = {}; - dataForm[fileName] = ids; - form.val('dataForm', dataForm); - - if(!ids) { - refreshDownloadTemplet(fileName, []); - if(callback) { - callback(fileName, []); - } - return; - } - - top.restAjax.get(top.restAjax.path('api/file/list', []), { - ids: ids - }, null, function(code, data) { - refreshDownloadTemplet(fileName, data); - if(callback) { - callback(fileName, data); - } + /*top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/cbb5f8a8-595c-4df4-b38e-7cbb715f754f', []), {}, null, function(code, data, args) { + laytpl(document.getElementById('workerCatalogSelectTemplate').innerHTML).render(data, function(html) { + document.getElementById('workerCatalogSelectTemplateBox').innerHTML = html; + }); + form.render('select', 'workerCatalogSelectTemplateBox'); }, function(code, data) { top.dialog.msg(data.msg); + });*/ + } + + // 初始化表格 + function initTable() { + table.render({ + elem: '#dataTable', + id: 'dataTable', + url: top.restAjax.path('', []), + width: admin.screen() > 1 ? '100%' : '', + height: $win.height() - 90, + limit: 20, + limits: [20, 40, 60, 80, 100, 200], + toolbar: '#headerToolBar', + request: { + pageName: 'page', + limitName: 'rows' + }, + cols: [ + [ + {type: 'checkbox', fixed: 'left'}, + { + field: 'rowNum', + width: 80, + title: '序号', + fixed: 'left', + align: 'center', + templet: '{{d.LAY_INDEX}}' + } + ] + ], + page: false, + parseData: function (data) { + return { + 'code': 0, + 'msg': '', + 'count': data.total, + 'data': data.rows + }; + } }); } - // 初始化视频 - function initVideo(fileName, data) { - for(var i = 0, item; item = data[i++];) { - var player = new ckplayer({ - container: '#'+ fileName + i, - variable: 'player', - flashplayer: false, - video: { - file: 'route/file/download/true/'+ item.fileId, - type: 'video/mp4' - } - }); - } + function closeBox() { + parent.layer.close(parent.layer.getFrameIndex(window.name)); } // 初始化培训开始时间时间戳 @@ -224,16 +315,6 @@ }); } - - // 初始化内容 - function initData() { - initPlanStartTimeDateTime(); - initPlanEndTimeDateTime(); - initSignUpStartTimeDateTime(); - initSignUpEndTimeDateTime(); - } - initData(); - // 提交表单 form.on('submit(submitForm)', function(formData) { top.dialog.confirm(top.dataMessage.commit, function(index) {