Merge remote-tracking branch 'origin/master'

src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java

@@ -16,6 +16,7 @@ import cn.com.tenlion.pojo.dtos.apply.ApplyDTO;
 import cn.com.tenlion.pojo.vos.apply.ApplyVO;
 import cn.com.tenlion.service.apply.IApplyService;
 import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -149,6 +150,9 @@ public class ApplyController extends DefaultBaseController {
     @GetMapping("listpage")
     public SuccessResultList<List<ApplyDTO>> listPage(ListPage page) {
         Map<String, Object> params = requestParams();
+        if(!StringUtils.isBlank(params.get("applyAuditStates").toString())){
+            params.put("applyAuditStates",Arrays.asList(params.get("applyAuditStates")));
+        }
         page.setParams(params);
         return applyService.listPage(page);
     }

src/main/java/cn/com/tenlion/controller/api/classplan/ClassPlanController.java

@@ -12,6 +12,7 @@ import ink.wgink.pojo.result.SuccessResultList;
 import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO;
 import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO;
 import cn.com.tenlion.service.classplan.IClassPlanService;
+import ink.wgink.util.date.DateUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -86,7 +87,7 @@ public class ClassPlanController extends DefaultBaseController {
         return classPlanService.list(params);
     }
 
-    @ApiOperation(value = "分页列表", notes = "分页列表接口")
+    @ApiOperation(value = "培训计划分页列表", notes = "分页列表接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
         @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
@@ -102,6 +103,24 @@ public class ClassPlanController extends DefaultBaseController {
         return classPlanService.listPage(page);
     }
 
+    @ApiOperation(value = "考试申请分页列表", notes = "考试申请分页列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("list-page-exam")
+    public SuccessResultList<List<ClassPlanDTO>> listPageExam(ListPage page) {
+        Map<String, Object> params = requestParams();
+        params.put("examNowDate", DateUtil.getTime());
+        params.put("reportType", "2");
+        page.setParams(params);
+        return classPlanService.listPage(page);
+    }
+
     @ApiOperation(value = "统计", notes = "统计接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("count")

src/main/java/cn/com/tenlion/controller/app/api/basicstaffinfo/BasicStaffInfoAppController.java

@@ -0,0 +1,53 @@
+package cn.com.tenlion.controller.app.api.basicstaffinfo;
+
+import cn.com.tenlion.staff.pojo.dtos.basicstaffinfo.BasicStaffInfoDTO;
+import cn.com.tenlion.staff.pojo.vos.basicstaffinfo.BasicStaffInfoVO;
+import cn.com.tenlion.staff.service.basicstaffinfo.IBasicStaffInfoService;
+import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.exceptions.SaveException;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResult;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 人员信息接口
+ * @ClassName: ExamCheckAppController
+ * @Description: 
+ * @Author: CodeFactory
+ * @Date: 2021-05-04 14:47:38
+ * @Version: 3.0
+ **/
+@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "人员信息接口")
+@RestController
+@RequestMapping(ISystemConstant.APP_PREFIX + "/basic-staff-info")
+public class BasicStaffInfoAppController extends DefaultBaseController {
+
+    @Autowired
+    private IBasicStaffInfoService basicStaffInfoService;
+
+    @ApiOperation(value = "查询个人资料信息", notes = "查询个人资料信息接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("get-basic-staff-info")
+    public BasicStaffInfoDTO getBasicStaffInfo(@RequestHeader("token") String token) {
+        return basicStaffInfoService.getBindUserAccount(token);
+    }
+
+    @ApiOperation(value = "保存个人信息", notes = "保存个人信息接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", paramType = "header")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @PostMapping("save")
+    public SuccessResult save(@RequestHeader("token") String token,
+                              @RequestBody BasicStaffInfoVO basicStaffInfoVO) throws SaveException {
+        basicStaffInfoService.save(token, basicStaffInfoVO);
+        return new SuccessResult();
+    }
+
+}

src/main/java/cn/com/tenlion/controller/app/api/traininginstitution/TrainingInstitutionController.java

@@ -0,0 +1,61 @@
+package cn.com.tenlion.controller.app.api.traininginstitution;
+
+import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO;
+import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService;
+import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResultList;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 培训机构
+ */
+
+@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "培训机构接口")
+@RestController
+@RequestMapping(ISystemConstant.APP_PREFIX + "/traininginstitution")
+public class TrainingInstitutionController extends DefaultBaseController {
+    @Autowired
+    private IInstitutionService iInstitutionService;
+
+
+    @ApiOperation(value = "培训机构分页列表", notes = "培训机构分页列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpage"+ISystemConstant.APP_RELEASE_SUFFIX)
+    public SuccessResultList<List<InstitutionDTO>> listPage(ListPage page) {
+        Map<String, Object> params = requestParams();
+        params.put("institutionType","training");
+        page.setParams(params);
+        return iInstitutionService.listPage(page);
+    }
+
+
+    @ApiOperation(value = "培训机构详情(通过ID)", notes = "培训机构详情(通过ID)接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "applyId", value = "培训机构ID", paramType = "path")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("get/"+ISystemConstant.APP_RELEASE_SUFFIX+"/{applyId}")
+    public InstitutionDTO get( @PathVariable("applyId") String applyId) {
+        return iInstitutionService.get(applyId);
+    }
+
+
+}

src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java

@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -278,6 +279,10 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl
 
     @Override
     public SuccessResultList<List<ClassPlanDTO>> listPage(ListPage page) {
+        if(page.getParams().get("orgId") == null
+                || page.getParams().get("orgId").toString().length() == 0){
+            return new SuccessResultList<>(new ArrayList<>(), 0, 0L);
+        }
         PageHelper.startPage(page.getPage(), page.getRows());
         List<ClassPlanDTO> classPlanDTOs = list(page.getParams());
         for(ClassPlanDTO item : classPlanDTOs){

src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml

@@ -299,6 +299,9 @@
             AND t1.sign_up_start_time <![CDATA[ <= ]]> #{signNowDate}
             AND t1.sign_up_end_time <![CDATA[ >= ]]> #{signNowDate}
         </if>
+        <if test="examNowDate != null and examNowDate != ''">
+            AND t1.sign_up_end_time <![CDATA[ <= ]]> #{examNowDate}
+        </if>
         <if test="planType != null and planType != ''">
             AND t1.plan_type = #{planType}
         </if>

src/main/resources/static/route/apply/list.html

@@ -28,6 +28,16 @@
                         <div class="layui-inline">
                             <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
                         </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="applyAuditStates" name="applyAuditStates" lay-search>
+                                <option value="">查看全部</option>
+                                <option value="0">待审核</option>
+                                <option value="1">用户撤回</option>
+                                <option value="2">审核通过</option>
+                                <option value="3">报名完成</option>
+                                <option value="-1">审核不通过</option>
+                            </select>
+                        </div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
@@ -242,7 +252,8 @@
                 where: {
                     keywords: $('#keywords').val(),
                     startTime: $('#startTime').val(),
-                    endTime: $('#endTime').val()
+                    endTime: $('#endTime').val(),
+                    applyAuditStates:$('#applyAuditStates').val()
                 },
                 page: {
                     curr: currentPage

src/main/resources/static/route/classplan/list-report-exam.html

@@ -0,0 +1,398 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/signup/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/classplan/list-page-exam';
+        var orgInfo = {};
+
+        function initData(){
+            initDate();
+            getOrgInfo();
+        }
+        initData();
+
+        function getOrgInfo(){
+            top.restAjax.get(top.restAjax.path('api/teacher/getorginfo', []), {}, null, function (code, data) {
+                orgInfo = data;
+                initTable();
+            }, function (code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                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'
+                },
+                where : {
+                    orgId : orgInfo.institutionId
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {width:100, title: '操作', fixed: 'left', align:'center',
+                            templet: function(row) {
+                                var dom = '';
+                                if(row['reportType'] === '0'){
+                                    return '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reportEvent">报备</a>';
+                                }
+                                if(row['reportType'] === '1'){
+                                    return '<a type="button" class="layui-btn layui-btn-warm layui-btn-xs">报备待审</a>';
+                                }
+                                if(row['reportType'] === '2'){
+                                    return '<a type="button" class="layui-btn layui-btn-info layui-btn-xs">审核通过</a>';
+                                }
+                                return dom;
+                            }
+                        },
+                        {field: 'planNumber', width: 180, title: '培训计划编号', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planName', width: 180, title: '培训计划名称', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planType', width: 120, title: '培训类型', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(rowData == '1'){
+                                    return '初训';
+                                }
+                                if(rowData == '1'){
+                                    return '复训';
+                                }
+                                if(rowData == '1'){
+                                    return '换证';
+                                }
+                                return '-';
+                            }
+                        },
+                        {field: 'projectCatalogName', width: 180, title: '培训项目', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'workerCatalogName', width: 180, title: '培训工种', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planPersonNum', width: 120, title: '计划人数', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+
+                        {field: 'planAddress', width: 180, title: '培训地点', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'chargePerson', width: 180, title: '负责人', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'chargePersonTel', width: 180, title: '联系方式', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {width: 330, title: '培训时间', align:'center',
+                            templet: function(row) {
+                                var start = row['planStartTime'];
+                                var end = row['planEndTime'];
+                                return start + ' ~ ' + end;
+                            }
+                        },
+                        {width: 330, title: '报名时间', align:'center',
+                            templet: function(row) {
+                                var start = row['signUpStartTime'];
+                                var end = row['signUpEndTime'];
+                                return start + ' ~ ' + end;
+                            }
+                        },
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where: {
+                    keywords: $('#keywords').val(),
+                    startTime: $('#startTime').val(),
+                    endTime: $('#endTime').val(),
+                    orgId : orgInfo.institutionId
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+
+        // 初始化日期
+        function initDate() {
+            // 日期选择
+            laydate.render({
+                elem: '#startTime',
+                format: 'yyyy-MM-dd'
+            });
+            laydate.render({
+                elem: '#endTime',
+                format: 'yyyy-MM-dd'
+            });
+        }
+
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/classplan/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                if(typeof (orgInfo.institutionId) === 'undefined'
+                    || orgInfo.institutionId == ''){
+                    layer.msg('当前用户未绑定机构信息');
+                    return;
+                }
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/classplan/save.html?orgId={orgId}&orgName={orgName}',
+                        [orgInfo.institutionId,orgInfo.institutionName]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    if(checkDatas[0].reportType == '1'){
+                        layer.msg('报备待审状态下无法修改');
+                        return;
+                    }
+                    if(checkDatas[0].reportType == '2'){
+                        layer.msg('报备通过后无法修改');
+                        return;
+                    }
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/classplan/update.html?classPlanId={classPlanId}', [checkDatas[0].classPlanId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['classPlanId'];
+                    }
+                    removeData(ids);
+                }
+            }
+        });
+
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            if(layEvent == 'reportEvent'){
+                top.dialog.msg('确认提交报备？', {
+                    time: 0,
+                    btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                    shade: 0.3,
+                    yes: function (index) {
+                        top.dialog.close(index);
+                        var layIndex;
+                        top.restAjax.put(top.restAjax.path('api/classplan/update-report/{classPlanId}', [obj.data.classPlanId]), {reportType: '1'}, null, function (code, data) {
+                            top.dialog.msg('提交成功', {time: 1000});
+                            reloadTable();
+                        }, function (code, data) {
+                            top.dialog.msg(data.msg);
+                        }, function () {
+                            layIndex = top.dialog.msg('提交中', {icon: 16, time: 0, shade: 0.3});
+                        }, function () {
+                            top.dialog.close(layIndex);
+                        });
+                    }
+                });
+
+            }
+        })
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/classplan/list.html

@@ -109,7 +109,7 @@
                             templet: function(row) {
                                 var dom = '';
                                 if(row['reportType'] === '0'){
-                                    return '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reportEvent">报备</a>';
+                                    return '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reportEvent">开班报备</a>';
                                 }
                                 if(row['reportType'] === '1'){
                                     return '<a type="button" class="layui-btn layui-btn-warm layui-btn-xs">报备待审</a>';
@@ -117,6 +117,9 @@
                                 if(row['reportType'] === '2'){
                                     return '<a type="button" class="layui-btn layui-btn-info layui-btn-xs">审核通过</a>';
                                 }
+                                if(row['reportType'] === '3'){
+                                    return '<a type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="unPassEvent">审核不通过</a>';
+                                }
                                 return dom;
                             }
                         },
@@ -369,6 +372,8 @@
 
         table.on('tool(dataTable)', function(obj) {
             var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
             if(layEvent == 'reportEvent'){
                 top.dialog.msg('确认提交报备？', {
                     time: 0,
@@ -389,7 +394,21 @@
                         });
                     }
                 });
-
+                return;
+            }
+            if(layEvent == 'unPassEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/classplan/update.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
+                    end: function () {
+                        reloadTable();
+                    }
+                });
             }
         })
     });

src/main/resources/static/route/classplan/save.html

@@ -38,7 +38,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">计划编号</label>
                             <div class="layui-input-block">
-                                <input type="text" id="planNumber" name="planNumber" class="layui-input" value="" placeholder="请输入培训计划编号"  maxlength="100">
+                                <input type="text" id="planNumber" name="planNumber" class="layui-input" value="" placeholder="请输入培训计划编号"  readonly="readonly" maxlength="100">
                             </div>
                         </div>
                     </div>
@@ -215,8 +215,6 @@
         </div>
     </div>
 </div>
-<script src="assets/js/vendor/wangEditor/wangEditor.min.js"></script>
-<script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
@@ -232,16 +230,21 @@
         var admin = layui.admin;
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
-        var wangEditor = window.wangEditor;
-        var wangEditorObj = {};
-        var viewerObj = {};
         var teacherList = [];
         var orgId = top.restAjax.params(window.location.href).orgId;
         var orgName = top.restAjax.params(window.location.href).orgName;
 
         // 初始化内容
         function initData() {
+            //生成计划编号
+            var date = new Date();
+            var planNumber = '';
+            planNumber += date.getFullYear();
+            planNumber += (date.getMonth() + 1) + '';
+            planNumber += date.getDate();
+            planNumber += date.getTime();
             var dataObj = {}
+            dataObj['planNumber'] = planNumber;
             dataObj['orgId'] = orgId;
             dataObj['orgName'] = orgName;
             form.val('dataForm',dataObj);

src/main/resources/static/route/classplan/update.html

@@ -21,6 +21,7 @@
             </span>
         </div>
         <div class="layui-card-body" style="padding: 15px;">
+            <blockquote id="report-reason-block" class="layui-elem-quote" style="border-left: 5px solid #cc0200;display: none;">引用区域的文字</blockquote>
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
                 <div class="layui-row">
                     <div class="layui-col-md12">
@@ -253,6 +254,9 @@
                 dataFormData['signUpEndTime'] = dataFormData['signUpEndTime'].substring(0,10);
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
+                if(dataFormData['reportReason'] = ''){
+                    $('#report-reason-block').show();
+                }
                 initPlanStartTimeDateTime();
                 initPlanEndTimeDateTime();
                 initSignUpStartTimeDateTime();