金隅教师信息导入修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs

@@ -63,6 +63,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             ViewBag.NewEmpId = Guid.NewGuid().ToString();
             return View();
         }
+        /// <summary>
+        /// 导入页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ImportForm()
+        {
+            return View();
+        }
         [HttpGet]
         public ActionResult FormView()
         {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs

@@ -413,6 +413,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             return Success(data);
         }
+
+        /// <summary>
+        /// 学期下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetSemesterDataTwo()
+        {
+            var data = WebHelper.GenerateNearBySemeterTwo();
+
+            return Success(data);
+        }
         /// <summary>
         /// 班级下拉框信息【成绩录入新页面】
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml

@@ -39,9 +39,10 @@
     </ul>
 </div>
 <div class="tab-content lr-tab-content" id="lr_tab_content">
-    <div class="lr-form-wrap tab-pane" id="tab1">
-        <div class="col-xs-12 lr-form-item">
+    <div class="lr-form-wrap tab-pane"  id="tab1">
+        <div class="col-xs-12  lr-form-item" style="text-align: right;" >
             <div class="lr-form-item-title lr-title">个人信息</div>
+            <a id="lr_print"class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -154,6 +154,12 @@ var bootstrap = function ($, learun) {
                     $("#Birthday").val(date);
                 }
             });
+
+
+            $('#lr_print').on('click',function() {
+                $('#tab1').print();
+            })
+
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.cshtml

@@ -0,0 +1,25 @@
+@{
+    ViewBag.Title = "Form";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<link href="~/Content/webuploader/webuploader.css" rel="stylesheet" />
+<script src="~/Content/webuploader/webuploader.nolog.min.js"></script>
+@Html.AppendCssFile("/Areas/PersonnelManagement/Views/Sal_UserSalary/ImportForm.css")
+
+<div class="lr-form-layout lr-form-layout-top-bottom">
+    <div class="lr-form-layout-header">
+        <div id="lr_add_file_btn"><i class="fa fa-cloud-upload"></i><span class="lrlt">上传文件</span></div>
+        @*<div class="webuploader-pick"  id="lr_down_file_btn"><i class="fa fa-download"></i><span class="lrlt">下载模板</span></div>*@
+    </div>
+    <div class="lr-form-layout-body">
+        <div class="lr-form-file-queue-wrap" id="lr_form_file_queue">
+            <div class="lr-form-file-queue" id="lr_form_file_queue_list">
+
+            </div>
+            <div class="lr-form-file-queue-bg">
+                <h1><span class="lrlt">试试将电脑里的文件拖拽到此上传</span></h1>
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.css

@@ -0,0 +1,136 @@
+.lr-form-layout-body {
+    padding:0 5px 5px 5px;
+}
+.lr-form-file-queue-wrap {
+    position:relative;
+    width:100%;
+    height:100%;
+    border:1px solid #ddd;
+    border-radius:4px;
+}
+.lr-form-file-queue {
+    position:relative;
+}
+.lr-form-file-queue {
+    position:relative;
+}
+.lr-form-file-queue-item {
+    position:relative;
+    width:100%;
+    height:50px;
+    border-bottom:1px solid #ddd;
+    padding-left:60px;
+
+}
+.lr-file-image {
+    position:absolute;
+    top:5px;
+    left:5px;
+}
+.lr-file-image img {
+    width:40px;
+    height:40px;
+}
+.lr-file-name{
+    line-height:50px;
+
+}
+.lr-msg {
+    position:absolute;
+    top:0;
+    right:5px;
+    font-size: 25px;
+    line-height:50px;
+}
+.lr-msg .fa-check-circle{
+    color: #5cb85c;
+}
+.lr-msg .fa-exclamation-circle {
+    color: #b94a48;
+}
+.lr-msg2 {
+    position:absolute;
+    top:0;
+    right:5px;
+    line-height:50px;
+}
+.lr-msg2 span {
+    color:#333;
+    font-size:14px;
+    margin-right:5px;
+}
+
+.lr-tool-bar {
+    position:absolute;
+    top:0;
+    right:35px;
+    font-size: 25px;
+    line-height:50px;
+    color:#666;
+    cursor:pointer;
+}
+.lr-tool-bar > i {
+    margin-left:8px;
+}
+
+.lr-tool-bar .fa-minus-circle {
+    color: #b94a48;
+}
+.lr-tool-bar .fa-cloud-download {
+    color: #3498db;
+}
+
+.lr-uploader-progress {
+    position:absolute;
+    bottom:2px;
+    left:60px;
+    height:4px;
+    width:500px;
+    width:calc(100% - 90px);
+}
+.lr-uploader-progress-bar {
+    position:relative;
+    height:100%;
+    background-color:#039cfd;
+    border-radius:4px;
+}
+
+
+.lr-form-file-queue-bg {
+    position:absolute;
+    top:50%;
+    left:50%;
+    width:300px;
+    height:30px;
+    line-height:30px;
+    
+    margin:-15px 0 0 -150px;
+}
+.lr-form-file-queue-bg h1 {
+    color: #666;
+    font-size: 20px;
+    font-family: Microsoft Yahei;
+    padding-bottom: 2px;
+    margin: 0;
+}
+#lr_down_file_btn {
+    position:absolute;
+    right:5px;
+    background:#fff;
+    border:1px solid #ddd;
+    color:#333;
+}
+#lr_down_file_btn:hover {
+     color:#337ab7;
+}
+/*对百度插件的样式重写*/
+.webuploader-container {
+    position:absolute;
+}
+.webuploader-pick {
+    padding:8px 15px;
+    background-color:#039cfd;
+}
+.webuploader-pick-hover {
+    background-color:#027dcb;
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js

@@ -0,0 +1,242 @@
+/*
+ * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：陈彬彬
+ * 日 期：2017.04.11
+ * 描 述：导入Excel	
+ */
+var id = request('id');
+
+var keyVaule = '';
+
+var bootstrap = function ($, learun) {
+    "use strict";
+
+    var page1 = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#lr_add_format').on('click', function () {
+                currentColRow = null;
+                learun.layerForm({
+                    id: 'FormatForm',
+                    title: '添加',
+                    url: top.$.rootUrl + '/LR_SystemModule/CodeRule/FormatForm',
+                    width: 450,
+                    height: 310,
+                    callBack: function (id) {
+                        return top[id].acceptClick(function (data) {
+                            $('#gridtable').jfGridSet('addRow', { row: data });
+                        });
+                    }
+                });
+            });
+            $('#lr_edit_format').on('click', function () {
+                currentColRow = $('#gridtable').jfGridGet('rowdata');
+                var _id = currentColRow ? currentColRow.itemTypeName : '';
+                if (learun.checkrow(_id)) {
+                    learun.layerForm({
+                        id: 'FormatForm',
+                        title: '修改',
+                        url: top.$.rootUrl + '/LR_SystemModule/CodeRule/FormatForm',
+                        width: 450,
+                        height: 310,
+                        callBack: function (id) {
+                            return top[id].acceptClick(function (data) {
+                                $('#gridtable').jfGridSet('updateRow', { row: data });
+                            });
+                        }
+                    });
+                }
+
+            });
+            $('#lr_delete_format').on('click', function () {
+                currentColRow = null;
+                var row = $('#gridtable').jfGridGet('rowdata');
+                var _id = row ? row.itemTypeName : '';
+                if (learun.checkrow(_id)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res, index) {
+                        if (res) {
+                            $('#gridtable').jfGridSet('removeRow');
+                            top.layer.close(index); //再执行关闭  
+                        }
+                    });
+                }
+            });
+
+            $('#gridtable').jfGrid({
+                headData: [
+                    { label: "前缀", name: "itemTypeName", width: 120, align: "left" },
+                    { label: "格式", name: "formatStr", width: 120, align: "left" },
+                    { label: "步长", name: "stepValue", width: 100, align: "left" },
+                    { label: "初始值", name: "initValue", width: 120, align: "left" },
+                    { label: "说明", name: "description", width: 180, align: "left" }
+                ]
+            });
+
+            /*检测重复项*/
+            $('#F_EnCode').on('blur', function () {
+                $.lrExistField(keyValue, 'F_EnCode', top.$.rootUrl + '/LR_SystemModule/CodeRule/ExistEnCode');
+            });
+            $('#F_FullName').on('blur', function () {
+                $.lrExistField(keyValue, 'F_FullName', top.$.rootUrl + '/LR_SystemModule/CodeRule/ExistFullName');
+            });
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                keyValue = selectedRow.F_RuleId;
+                $('#form').lrSetFormData(selectedRow);
+                var formatdata = JSON.parse(selectedRow.F_RuleFormatJson);
+                $('#gridtable').jfGridSet('refreshdata', formatdata);
+            }
+        }
+    };
+
+    var fileInfo = {};
+
+    // 触发合并文件碎片
+    var mergeFileChunks = function (file) {
+
+         
+        var param = {};
+        param['__RequestVerificationToken'] = $.lrToken;
+        param['fileId'] = fileInfo[file.id].fileGuid;
+        param['chunks'] = fileInfo[file.id].chunks;
+        param['ext'] = file.ext;
+        param['templateId'] = id;
+        learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/ExcelImport/EmpInfoImport", param, function (res) {
+            var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+            $fileItem.find('.lr-uploader-progress').remove();
+            if (res.code == learun.httpCode.success) {
+                if (res.data.Success != '0') {
+                    learun.alert.success('导入成功' + res.data.Success + '条');
+                }
+                // 文件保存成功后
+                $fileItem.append('<div class="lr-msg2"><span>' + res.data.Success + '</span><span>/</span><span style="color:#b94a48;" >' + res.data.Fail + '</span></div>');
+                // 如果有失败
+                if (res.data.Fail != '0')
+                {
+                    learun.download({ url: top.$.rootUrl + '/LR_SystemModule/ExcelImport/DownImportErrorFile', param: { fileId: fileInfo[file.id].fileGuid, fileName: fileInfo[file.id].name, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+                }
+            }
+            else {
+                $fileItem.append('<div class="lr-msg"><i class="fa fa-exclamation-circle"></i></div>');
+            }
+        });
+    }
+    // 触发清楚文件碎片
+    var reomveFileChunks = function (file) {
+        var param = {};
+        param['__RequestVerificationToken'] = $.lrToken;
+        param['fileGuid'] = fileInfo[file.id].fileGuid;
+        param['chunks'] = fileInfo[file.id].chunks;
+        learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/Annexes/MergeAnnexesFile", param, function (res) { });
+        var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+        $fileItem.find('.lr-uploader-progress').remove();
+        $fileItem.append('<div class="lr-msg"><i class="fa fa-exclamation-circle"></i></div>');
+    }
+
+    var page = {
+        uploader: null,
+        init: function () {
+            /*模板下载*/
+            $('#lr_down_file_btn').on('click', function () {
+                learun.download({ url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/DownTemplate', param: { keyValue: id, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+            });
+
+
+            if (!WebUploader.Uploader.support()) {
+                alert('Web Uploader 不支持您的浏览器！如果你使用的是IE浏览器，请尝试升级 flash 播放器');
+                throw new Error('WebUploader does not support the browser you are using.');
+            }
+
+            page.uploader = WebUploader.create({
+                auto: true,
+                swf: top.$.rootUrl + '/Content/webuploader/Uploader.swf',
+                // 文件接收服务端。
+                server: top.$.rootUrl + "/LR_SystemModule/Annexes/UploadAnnexesFileChunk",
+                // 选择文件的按钮。可选。
+                // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+                pick: '#lr_add_file_btn',
+                dnd: '#lr_form_file_queue',
+                paste: 'document.body',
+                disableGlobalDnd: true,
+                accept: {
+                    extensions: "xls,xlsx"
+                },
+                multiple: true,
+                // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
+                resize: false,
+                // 文件分片上传
+                chunked: true,
+                chunkRetry: 3,
+                prepareNextFile: true,
+                chunkSize: '1048576',
+                // 上传参数
+                formData: {
+                    __RequestVerificationToken: $.lrToken
+                }
+            });
+            page.uploader.on('fileQueued', page.fileQueued);
+            page.uploader.on('uploadStart', page.uploadStart);
+            page.uploader.on('uploadBeforeSend', page.uploadBeforeSend);
+            page.uploader.on('uploadProgress', page.uploadProgress);
+            page.uploader.on('uploadSuccess', page.uploadSuccess);
+            page.uploader.on('uploadError', page.uploadError);
+            page.uploader.on('uploadComplete', page.uploadComplete);
+            page.uploader.on('error', page.error);
+
+            $('#lr_form_file_queue').lrscroll();
+
+        },
+        fileQueued: function (file) {// 文件加载到队列
+            fileInfo[file.id] = { name: file.name };
+            $('#lr_form_file_queue .lr-form-file-queue-bg').hide();
+            // 添加一条文件记录
+            var $item = $('<div class="lr-form-file-queue-item" id="lr_filequeue_' + file.id + '" ></div>');
+            $item.append('<div class="lr-file-image"><img src="' + top.$.rootUrl + '/Content/images/filetype/' + file.ext + '.png"></div>');
+            $item.append('<span class="lr-file-name">' + file.name + '(' + learun.countFileSize(file.size) + ')</span>');
+
+            $('#lr_form_file_queue_list').append($item);
+        },
+        uploadStart: function (file) {
+            var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+            $fileItem.append('<div class="lr-uploader-progress"><div class="lr-uploader-progress-bar" style="width:0%;"></div></div>');
+        },
+        uploadBeforeSend: function (object, data, headers) {
+            data.chunk = data.chunk || 0;
+            data.chunks = data.chunks || 1;
+            fileInfo[data.id].fileGuid = fileInfo[data.id].fileGuid || WebUploader.Base.guid();
+            data.fileGuid = fileInfo[data.id].fileGuid;
+            fileInfo[data.id].chunks = data.chunks;
+        },
+        uploadProgress: function (file, percentage) {
+            var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+            $fileItem.find('.lr-uploader-progress-bar').css('width', (percentage * 100 + '%'));
+        },
+        uploadSuccess: function (file, res) {
+            if (res.code == 200) {// 上传成功
+                mergeFileChunks(file);
+            }
+            else {// 上传失败
+                reomveFileChunks(file);
+            }
+        },
+        uploadError: function (file, code) {
+            reomveFileChunks(file);
+        },
+        uploadComplete: function (file) {
+        },
+        error: function (type) {
+            switch (type) {
+                case 'Q_TYPE_DENIED':
+                    learun.alert.error('当前文件类型不允许上传');
+                    break;
+            };
+        }
+    };
+    page.init();
+
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -77,7 +77,10 @@
                         <a id="lr_editDept" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改部门、系部</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
-                </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="no">
+                        <a id="lr_import" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;导入</a>
+                        </div>
+                    </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>
         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -113,6 +113,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //导入
+            $('#lr_import').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '导入',
+                    url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/ImportForm',
+                    width: 400,
+                    height: 300,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            })
             //查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('EmpId');

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs

@@ -256,6 +256,36 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 return Fail("导入数据失败!");
             }
         }
+        /// <summary>
+        /// 金隅教师信息导入
+        /// </summary>
+        /// <param name="templateId">模板Id</param>
+        /// <param name="fileId">文件主键</param>
+        /// <param name="chunks">分片数</param>
+        /// <param name="ext">文件扩展名</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult EmpInfoImport(string fileId, int chunks,string ext)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "."+ ext, chunks, userInfo);
+            if (!string.IsNullOrEmpty(path))
+            {
+                DataTable dt = ExcelHelper.ExcelImport(path);
+                string res = excelImportIBLL.EmpInfoImport(dt,fileId);
+                var data = new
+                {
+                    Success = res.Split('|')[0],
+                    Fail = res.Split('|')[1]
+                };
+                return JsonResult(data);
+            }
+            else
+            {
+                return Fail("导入数据失败!");
+            }
+        }
 
         /// <summary>
         /// 下载文件(导入文件未被导入的数据)

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs

@@ -118,7 +118,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetAcademicYear()
         {
-            var data = WebHelper.GenerateNearByAcademic();
+            var data = WebHelper.GenerateNearByAcademicTwo();
             return Success(data);
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js

@@ -27,7 +27,7 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">上传者</div>
                                     <input id="MPUploader" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js

@@ -33,10 +33,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js

@@ -42,10 +42,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="MPDepartment"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js

@@ -33,10 +33,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
 
             $('#MPDepartment').lrselect({
                 type: 'tree',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js

@@ -27,7 +27,7 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 }
             });
 
-            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })            $('#MPFile').lrUploader();
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' });            $('#MPFile').lrUploader();
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">上传者</div>
                                     <input id="MPUploader" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js

@@ -29,10 +29,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js

@@ -38,10 +38,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="MPDepartment"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js

@@ -29,10 +29,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPDepartment').lrselect({
                 type: 'tree',
                 // 展开最大高度

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js

@@ -27,7 +27,7 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 }
             });
 
-            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' })            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
+            $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' });            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPFile').lrUploader();
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">上传者</div>
                                     <input id="MPUploader" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js

@@ -29,10 +29,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js

@@ -38,10 +38,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml

@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MPMonth"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="MPDepartment"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js

@@ -29,10 +29,11 @@ var bootstrap = function ($, learun) {
             $('#MPSemester').lrselect({
                 placeholder: "请选择学期",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
                 value: 'value',
                 text: 'text'
             });
+            $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPDepartment').lrselect({
                 type: 'tree',
                 // 展开最大高度

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.js

@@ -82,18 +82,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            $('#lr_import').on('click',function() {
-                learun.layerForm({
-                    id: 'form',
-                    title: '导入',
-                    url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/ImportForm',
-                    width: 400,
-                    height: 300,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
+            $('#lr_import').on('click',
+                function() {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '导入',
+                        url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/ImportForm',
+                        width: 400,
+                        height: 300,
+                        callBack: function(id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
                 });
-            })
             //查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('USId');

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -903,6 +903,8 @@
     <Content Include="Areas\EducationalAdministration\Views\EADateArrange\InitByConditionForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\FormModify.js" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\FormEdit.js" />
+    <Content Include="Areas\EducationalAdministration\Views\EmpInfo\ImportForm.css" />
+    <Content Include="Areas\EducationalAdministration\Views\EmpInfo\ImportForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\IndexOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\Print.css" />
     <Content Include="Areas\EducationalAdministration\Views\EvaCodeOfContuct\Form.js" />
@@ -6839,6 +6841,7 @@
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Form.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\EmpInfo\ImportForm.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml

@@ -34,6 +34,7 @@
     <script src="~/Content/laydate/laydate.js"></script>
     @*<script src="~/Content/datepicker/WdatePicker.js"></script>*@
     <script src="~/Content/ueditor/ueditor.config.js"></script>
+    <script src="~/Content/jquery/plugin/jqprint/jQuery.print.js"></script>
     <script src="~/Content/ueditor/ueditor.all.min.js"></script>
     <script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceBLL.cs

@@ -330,6 +330,21 @@ namespace Learun.Application.Base.SystemModule
             }
         }
 
+        public string GetKeyByValue(string code, string key, string keyText, string value)
+        {
+            string strWhere = " " + key + " =@" + key;
+            string queryJson = "{" + key + ":\"" + keyText + "\"}";
+            DataTable sourceDt = GetDataTable(code, strWhere, queryJson);
+            if (sourceDt.Rows.Count > 0)
+            {
+                return sourceDt.Rows[0][value].ToString();
+            }
+            else
+            {
+                return "";
+            }
+        }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceIBLL.cs

@@ -83,6 +83,9 @@ namespace Learun.Application.Base.SystemModule
         /// <param name="code">数据源编码</param>
         /// <returns></returns>
         List<string> GetDataColName(string code);
+
+        string GetKeyByValue(string code, string key, string keyText, string value);
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs

@@ -33,8 +33,9 @@ namespace Learun.Application.Excel
         private StuEnrollIBLL stuEnrollIBLL = new StuEnrollBLL();
         private DataSourceIBLL dataSourceIBLL = new DataSourceBLL();
         private Sal_UserSalaryIBLL sal_UserSalaryIBLL = new Sal_UserSalaryBLL();
-        private Sal_UserSalaryItemIBLL sal_UserSalaryItemIBLL=new Sal_UserSalaryItemBLL();
+        private Sal_UserSalaryItemIBLL sal_UserSalaryItemIBLL = new Sal_UserSalaryItemBLL();
         private UserIBLL userIBLL = new UserBLL();
+        private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
 
         #region  缓存定义
         private ICache cache = CacheFactory.CaChe();
@@ -724,12 +725,12 @@ namespace Learun.Application.Excel
                     {
                         var stiValue = Convert.ToDecimal(dr[templateItem.STIName].ToString());
                         //工资详细添加
-                        Sal_UserSalaryItemEntity sal_UserSalaryItemEntity=new Sal_UserSalaryItemEntity
+                        Sal_UserSalaryItemEntity sal_UserSalaryItemEntity = new Sal_UserSalaryItemEntity
                         {
                             USIId = Guid.NewGuid().ToString(),
-                            USId=sal_UserSalaryEntity.USId,
-                            STIId=templateItem.STIId,
-                            STIValue = Convert.ToDecimal(stiValue) 
+                            USId = sal_UserSalaryEntity.USId,
+                            STIId = templateItem.STIId,
+                            STIValue = Convert.ToDecimal(stiValue)
                         };
                         sal_UserSalaryItemIBLL.SaveEntity("", sal_UserSalaryItemEntity);
 
@@ -757,7 +758,7 @@ namespace Learun.Application.Excel
 
                     sal_UserSalaryEntity.STAll = stall;
                     sal_UserSalaryEntity.STActual = stactual;
-                    sal_UserSalaryIBLL.SaveEntity("",sal_UserSalaryEntity);
+                    sal_UserSalaryIBLL.SaveEntity("", sal_UserSalaryEntity);
                     snum++;
                 }
                 catch (Exception e)
@@ -770,6 +771,108 @@ namespace Learun.Application.Excel
 
 
 
+            }
+            // 写入缓存如果有未导入的数据
+            if (failDt.Rows.Count > 0)
+            {
+                string errordt = failDt.ToJson();
+
+                cache.Write<string>(cacheKey + fileId, errordt, CacheId.excel);
+            }
+
+            return snum + "|" + fnum;
+        }
+        /// <summary>
+        /// 教师信息导入
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <param name="fileId"></param>
+        /// <returns></returns>
+        public string EmpInfoImport(DataTable dt, string fileId)
+        {
+            int snum = 0;
+            int fnum = 0;
+            // 创建一个datatable容器用于保存导入失败的数据
+            DataTable failDt = new DataTable();
+            dt.Columns.Add("导入错误", typeof(string));
+            foreach (DataColumn dc in dt.Columns)
+            {
+                failDt.Columns.Add(dc.ColumnName, dc.DataType);
+            }
+            // 数据字典数据
+            Dictionary<string, List<DataItemDetailEntity>> dataItemMap = new Dictionary<string, List<DataItemDetailEntity>>();
+
+            foreach (DataRow dr in dt.Rows)
+            {
+                try
+                {
+                    var empinfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(dr["工号"].ToString());
+                    if (empinfoEntity != null && empinfoEntity.EmpName == dr["姓名"].ToString())
+                    {
+                        empinfoEntity.IdentityCardNo = dr["身份证号"].ToString();
+                        empinfoEntity.Birthday = Convert.ToDateTime(dr["出生日期"].ToString());
+                        empinfoEntity.NationalityNo = dataSourceIBLL.GetKeyByValue("BCdNationality", "nationality", dr["民族"].ToString(), "nationalityno");
+                        empinfoEntity.LocusOfResidence = dr["籍贯"].ToString();
+                        empinfoEntity.PartyFaceNo = dataSourceIBLL.GetKeyByValue("BCdPartyFace", "partyface", dr["政治面貌"].ToString(), "partyfaceno");
+                        empinfoEntity.JoinPartyTime = dr["入党（团）时间"].ToString();
+                        empinfoEntity.mobile = dr["联系电话"].ToString();
+                        empinfoEntity.EMail = dr["电子邮箱"].ToString();
+                        empinfoEntity.Linkman = dr["联系人"].ToString();
+                        empinfoEntity.PhoneOfLinkman = dr["联系人电话"].ToString();
+                        empinfoEntity.Homeaddress = dr["家庭住址"].ToString();
+                        empinfoEntity.EmpSortNo = FindDataItemValue(dataItemIBLL.GetDetailList("jsgw"), dr["岗位类别"].ToString(), "岗位类别", false);
+                        empinfoEntity.TitleOfTechPostNo = dr["岗位名称"].ToString();
+                        empinfoEntity.PositionLevel = FindDataItemValue(dataItemIBLL.GetDetailList("PositionLevel"), dr["现聘工资级别"].ToString(), "现聘工资级别", false);
+                        empinfoEntity.InSchoolDate = Convert.ToDateTime(dr["聘任时间"].ToString());
+                        empinfoEntity.CompilationCategory = FindDataItemValue(dataItemIBLL.GetDetailList("CompilationCategory"), dr["编制类别"].ToString(), "编制类别", false);
+                        empinfoEntity.AddWorkDate = Convert.ToDateTime(dr["参加工作时间"].ToString());
+                        empinfoEntity.AddWorkOffset = dr["工龄偏移量（月）"].ToString();
+                        empinfoEntity.AddWorkHours = dr["工龄（减去偏移量）"].ToString();
+                        empinfoEntity.GroupDate = Convert.ToDateTime(dr["进入集团时间"].ToString());
+                        empinfoEntity.GroupOffset = dr["集团龄偏移量（月）"].ToString();
+                        empinfoEntity.GroupHours = dr["集团龄（减去偏移量）"].ToString();
+                        empinfoEntity.EducationalDate = Convert.ToDateTime(dr["进入教育系统时间"].ToString());
+                        empinfoEntity.EducationalOffset = dr["教龄偏移量（月）"].ToString();
+                        empinfoEntity.EducationalHours = dr["校龄（减去偏移量）"].ToString();
+                        empinfoEntity.SchoolDate = Convert.ToDateTime(dr["来校时间"].ToString());
+                        empinfoEntity.SchoolOffset = dr["校龄偏移量（月）"].ToString();
+                        empinfoEntity.SchoolHours = dr["校龄（减去偏移量）"].ToString();
+                        empinfoEntity.FictitiousRetireTime = Convert.ToDateTime(dr["拟退休时间"].ToString());
+                        empinfoEntity.FormalTime= dr["转正日期"].ToString();
+                        empinfoEntity.CommendationYear = dr["从教三十年表彰年度"].ToString();
+                        empinfoEntity.Remark = dr["备注"].ToString();
+                        empinfoEntity.HighestRecord = dataSourceIBLL.GetKeyByValue("BCdCultureDegree", "culturedegree", dr["最高学历"].ToString(), "culturedegreeno");
+                        empinfoEntity.HighestRecordGetTime = Convert.ToDateTime(dr["最高学历取得时间"].ToString());
+                        empinfoEntity.EducationalSystem = dr["学制（最高学历）"].ToString();
+                        empinfoEntity.DegreeNo = dataSourceIBLL.GetKeyByValue("BCdDegree", "degreename", dr["最高学位"].ToString(), "degreeno");
+                        empinfoEntity.HighestDegreeGetTime = dr["最高学位取得时间"].ToString();
+                        empinfoEntity.JobRank = FindDataItemValue(dataItemIBLL.GetDetailList("TechnicalPost"), dr["专业技术职务等级"].ToString(), "专业技术职务等级", false);
+                        empinfoEntity.JobTitle = dr["专业技术职务名称"].ToString();
+                        empinfoEntity.JobRankGetTime = dr["专业技术职务取得时间"].ToString();
+                        empinfoEntity.WorkLevel = FindDataItemValue(dataItemIBLL.GetDetailList("TechnicalLevelOfWorker"), dr["工人技术等级"].ToString(), "工人技术等级", false);
+                        empinfoEntity.WorkLevelGetTime =dr["工人技术等级取得时间"].ToString();
+                        empInfoIBLL.SaveEntity(empinfoEntity.EmpId,empinfoEntity);
+                        snum++;
+                    }
+                    else
+                    {
+                        dr["导入错误"] = dr["姓名"] + "导入错误";
+                        fnum++;
+                        failDt.Rows.Add(dr.ItemArray);
+                    }
+
+
+                }
+                catch (Exception e)
+                {
+                    dr["导入错误"] = dr["姓名"] + "导入错误";
+                    fnum++;
+                    failDt.Rows.Add(dr.ItemArray);
+                    continue;
+                }
+
+
+
             }
             // 写入缓存如果有未导入的数据
             if (failDt.Rows.Count > 0)
@@ -858,6 +961,9 @@ namespace Learun.Application.Excel
                 }
             }
         }
+
+
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportIBLL.cs

@@ -73,6 +73,7 @@ namespace Learun.Application.Excel
         /// <returns></returns>
         string ImportTable(string templateId, string fileId, DataTable dt);
         string ImportSalaryInfo(DataTable dt, string fileId);
+        string EmpInfoImport(DataTable dt, string fileId);
         /// <summary>
         /// 获取excel导入的错误数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -350,7 +350,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 入党（团）时间
         /// </summary>
         [Column("JOINPARTYTIME")]
-        public DateTime? JoinPartyTime { get; set; }
+        public string JoinPartyTime { get; set; }
 
         /// <summary>
         /// 岗位职级
@@ -446,7 +446,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 转正时间
         /// </summary>
         [Column("FORMALTIME")]
-        public DateTime? FormalTime { get; set; }
+        public string FormalTime { get; set; }
 
         /// <summary>
         /// 从教三十年表彰年度
@@ -470,7 +470,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 最高学位取得时间
         /// </summary>
         [Column("HIGHESTDEGREEGETTIME")]
-        public DateTime? HighestDegreeGetTime { get; set; }
+        public string HighestDegreeGetTime { get; set; }
 
         /// <summary>
         /// 备注
@@ -488,7 +488,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 专业技术职务取得时间
         /// </summary>
         [Column("JOBRANKGETTIME")]
-        public DateTime? JobRankGetTime { get; set; }
+        public string JobRankGetTime { get; set; }
 
         /// <summary>
         /// 专业技术职务名称
@@ -506,7 +506,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 工人技术等级取得时间
         /// </summary>
         [Column("WORKLEVELGETTIME")]
-        public DateTime? WorkLevelGetTime { get; set; }
+        public string WorkLevelGetTime { get; set; }
         /// <summary>
         /// 教育经历提交状态
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs

@@ -110,6 +110,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MPUploader Like @MPUploader ");
                 }
+                if (!queryParam["MPMonth"].IsEmpty())
+                {
+                    dp.Add("MPMonth", "%" + queryParam["MPMonth"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.MPMonth Like @MPMonth ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<MP_ManageMentPlanEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs

@@ -517,6 +517,27 @@ namespace Learun.Util
             }
             return nearbyyear;
         }
+
+
+        /// <summary>
+        /// 返回前五年+后五年的学年yyyy-yyyy
+        /// </summary>
+        /// <returns></returns>
+        public static List<YearGrade> GenerateNearByAcademicTwo()
+        {
+            int forwardfive = DateTime.Now.AddYears(-5).Year;
+            int afterfive = DateTime.Now.AddYears(5).Year;
+            List<YearGrade> nearbyyear = new List<YearGrade>();
+            for (int i = forwardfive; i <= afterfive; i++)
+            {
+                nearbyyear.Add(new YearGrade
+                {
+                    text = string.Format("{0}-{1}", i.ToString(), (i + 1).ToString()),
+                    value = string.Format("{0}-{1}", i.ToString(), (i + 1).ToString())
+                });
+            }
+            return nearbyyear;
+        }
         /// <summary>
         /// 返回学期
         /// </summary>
@@ -535,6 +556,25 @@ namespace Learun.Util
             return nearbyyear;
         }
         /// <summary>
+        /// 返回学期
+        /// </summary>
+        /// <returns></returns>
+        public static List<YearGrade> GenerateNearBySemeterTwo()
+        {
+            List<YearGrade> nearbyyear = new List<YearGrade>();
+                nearbyyear.Add(new YearGrade
+                {
+                    text = "一",
+                    value = "一"
+                });
+                nearbyyear.Add(new YearGrade
+                {
+                    text = "二",
+                    value = "二"
+                });
+            return nearbyyear;
+        }
+        /// <summary>
         /// 返回星期
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -5,16 +5,16 @@ export default {
   "appVersion": "2.0",
   // 是否允许用户注册
   "enableSignUp": true,
-  // 请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择
+  //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择
+  "apiHost": [
+    "https://wx.qjkjedu.com/learun/adms"
+  ],
   // "apiHost": [
-  //   "https://wx.qjkjedu.com/learun/adms"
+  //   "http://192.168.2.202:8083/learun/adms"
   // ],
   // "apiHost": [
-  //   "http://192.168.2.202:8083/learun/adms"
+  //   "http://localhost:8088/learun/adms"
   // ],
-  "apiHost": [
-    "http://localhost:8088/learun/adms"
-  ],
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
     { username: "System", password: "0000" }