diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js index 27f4463d1..184323123 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js @@ -5,6 +5,7 @@ * 描 述：TeachingCompetition */ var refreshGirdData; +var selectedRow; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -70,13 +71,18 @@ var bootstrap = function ($, learun) { }); } }); - // 评价 + // 部门 $('#lr_dept').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow[0].State != 0) { + learun.alert.warning("数据异常！"); + return; + } learun.layerForm({ id: 'form', - title: '评价', + title: '部门审核', url: top.$.rootUrl + '/EducationalAdministration/TeachingCompetition/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=1', width: 600, height: 600, @@ -90,9 +96,13 @@ var bootstrap = function ($, learun) { $('#lr_school').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (selectedRow[0].State != 1) { + learun.alert.warning("数据异常！"); + return; + } learun.layerForm({ id: 'form', - title: '部门', + title: '学校审核', url: top.$.rootUrl + '/EducationalAdministration/TeachingCompetition/FormDeptSchool?keyValue=' + keyValue +'&DeptSchool=2', width: 600, height: 600, @@ -106,6 +116,10 @@ var bootstrap = function ($, learun) { $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (selectedRow[0].State != 2) { + learun.alert.warning("请等待审核"); + return; + } learun.layerForm({ id: 'form', title: '评价', @@ -258,7 +272,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: true, - isMultiselect: true, + isMultiselect: false, sidx: "CreateTime desc" }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs index d6fe424f5..29c649956 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRPaperController.cs @@ -46,6 +46,16 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { return View(); } + /// + /// 部门学校审核界面 + /// + /// + [HttpGet] + public ActionResult FormDeptSchool() + { + return View(); + } + #endregion #region 获取数据 @@ -116,6 +126,14 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success("保存成功！"); } + [HttpPost] + [AjaxOnly] + public ActionResult DeptOrSchoolForm(string keyValue, string DeptSchool) + { + sRPaperIBLL.DeptOrSchoolForm(keyValue, DeptSchool); + return Success("操作成功！"); + } + [HttpPost] [AjaxOnly] public ActionResult CheckForm(string keyValue, string strEntity) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs index efdc197f3..794fd0d9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRProjectController.cs @@ -42,6 +42,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { return View(); } + /// + /// 部门学校审核界面 + /// + /// + [HttpGet] + public ActionResult FormDeptSchool() + { + return View(); + } #endregion #region 获取数据 @@ -112,6 +121,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success("保存成功！"); } + [HttpPost] + [AjaxOnly] + public ActionResult DeptOrSchoolForm(string keyValue, string DeptSchool) + { + sRProjectIBLL.DeptOrSchoolForm(keyValue, DeptSchool); + return Success("操作成功！"); + } [HttpPost] [AjaxOnly] public ActionResult CheckForm(string keyValue, string strEntity) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs index f5b691096..ccea1c654 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs @@ -42,6 +42,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { return View(); } + /// + /// 部门学校审核界面 + /// + /// + [HttpGet] + public ActionResult FormDeptSchool() + { + return View(); + } #endregion #region 获取数据 @@ -112,6 +121,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success("保存成功！"); } + [HttpPost] + [AjaxOnly] + public ActionResult DeptOrSchoolForm(string keyValue, string DeptSchool) + { + sRWorkIBLL.DeptOrSchoolForm(keyValue, DeptSchool); + return Success("操作成功！"); + } [HttpPost] [AjaxOnly] public ActionResult CheckForm(string keyValue, string strEntity) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.cshtml new file mode 100644 index 000000000..bf7ce761e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.cshtml @@ -0,0 +1,43 @@ +@{ + ViewBag.Title = "TeachingCompetition"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
部门*
+
+
+
+
名称
+
+
+
+
论文论著题目
+ +
+
+
发表刊物
+ +
+
+
发表时间*
+ +
+
+
级别
+
+
+
+
期刊
+ +
+
+
附件
+
+
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.js new file mode 100644 index 000000000..ef983d0f6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/FormDeptSchool.js @@ -0,0 +1,48 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-06-12 11:42 + * 描 述：TeachingCompetition + */ +var acceptClick; +var keyValue = request('keyValue'); +var DeptSchool = request('DeptSchool'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#DepartmentId').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); + $('#Rank').lrDataItemSelect({ code: 'Level' }); + $('#Path').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/SRPaper/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/SRPaper/DeptOrSchoolForm', { keyValue: keyValue, DeptSchool, DeptSchool }, function () { + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.cshtml index fe812edac..b8dbf0ada 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.cshtml @@ -30,10 +30,12 @@
-
+
 新增  编辑  删除 +  部门 +  学校  评价
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.js index c63d72c89..cc4f350ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRPaper/Index.js @@ -5,6 +5,7 @@ * 描 述：科技论文 */ var refreshGirdData; +var selectedRow; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -24,6 +25,7 @@ var bootstrap = function ($, learun) { $('#Grade').lrDataItemSelect({ code: 'EncouragementDegree' }); // 新增 $('#lr_add').on('click', function () { + selectedRow = null; learun.layerForm({ id: 'form', title: '新增', @@ -39,6 +41,10 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } learun.layerForm({ id: 'form', title: '编辑', @@ -55,6 +61,10 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/SRPaper/DeleteForm', { keyValue: keyValue }, function () { @@ -67,7 +77,12 @@ var bootstrap = function ($, learun) { // 评价 $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow[0].State != 2) { + learun.alert.warning("请等待审核"); + return; + } learun.layerForm({ id: 'form', title: '评价', @@ -80,6 +95,58 @@ var bootstrap = function ($, learun) { }); } }); + // 部门 + $('#lr_dept').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } + if (selectedRow[0].State !=0) { + learun.alert.warning("数据异常！"); + return; + } + learun.layerForm({ + id: 'form', + title: '部门审核', + url: top.$.rootUrl + '/PersonnelManagement/SRPaper/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=1', + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 学校 + $('#lr_school').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } + + if (selectedRow[0].State != 1) { + learun.alert.warning("数据异常！"); + return; + } + learun.layerForm({ + id: 'form', + title: '学校审核', + url: top.$.rootUrl + '/PersonnelManagement/SRPaper/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=2', + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -147,6 +214,33 @@ var bootstrap = function ($, learun) { }); } }, + //{ label: "State", name: "State", ishide:true}, + { + label: "部门审核人", name: "DeptUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "学校审核人", name: "SchoolUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, //{ // label: "审批用户", name: "AuditUser", width: 100, align: "left", // formatterAsync: function (callback, value, row, op, $cell) { @@ -170,7 +264,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: true, - isMultiselect: true, + isMultiselect: false, sidx: "CreateTime desc" }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.cshtml new file mode 100644 index 000000000..6a523d93b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.cshtml @@ -0,0 +1,47 @@ +@{ + ViewBag.Title = "TeachingCompetition"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
部门*
+
+
+
+
主持人*
+
+
+
+
组员
+
+
+
+
题目
+ +
+
+
课题编号
+ +
+
+
立项时间*
+ +
+
+
结题时间*
+ +
+
+
成果形式
+ +
+
+
附件
+
+
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.js new file mode 100644 index 000000000..933f08998 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/FormDeptSchool.js @@ -0,0 +1,48 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-06-12 11:42 + * 描 述：TeachingCompetition + */ +var acceptClick; +var keyValue = request('keyValue'); +var DeptSchool = request('DeptSchool'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#DepartmentId').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#Compere').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); + $('#Participant').lrUserSelect(1); + $('#Path').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/SRProject/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/SRProject/DeptOrSchoolForm', { keyValue: keyValue, DeptSchool, DeptSchool }, function () { + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.cshtml index 6674aaf3c..422f31e55 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.cshtml @@ -31,10 +31,12 @@
-
+
 新增  编辑  删除 +  部门 +  学校  评价
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js index a9a66cee7..3da47cc48 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js @@ -5,6 +5,7 @@ * 描 述：科技项目 */ var refreshGirdData; +var selectedRow; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -38,6 +39,7 @@ var bootstrap = function ($, learun) { // 编辑 $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (keyValue.indexOf(',') != -1) { learun.alert.warning("只能选择一条记录进行编辑！"); @@ -59,6 +61,10 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/SRProject/DeleteForm', { keyValue: keyValue }, function () { @@ -71,7 +77,12 @@ var bootstrap = function ($, learun) { // 评价 $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow[0].State != 2) { + learun.alert.warning("请等待审核"); + return; + } learun.layerForm({ id: 'form', title: '评价', @@ -84,6 +95,56 @@ var bootstrap = function ($, learun) { }); } }); + // 部门 + $('#lr_dept').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } + if (selectedRow[0].State != 0) { + learun.alert.warning("数据异常！"); + return; + } + learun.layerForm({ + id: 'form', + title: '部门审核', + url: top.$.rootUrl + '/PersonnelManagement/SRProject/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=1', + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 学校 + $('#lr_school').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } + if (selectedRow[0].State != 1) { + learun.alert.warning("数据异常！"); + return; + } + learun.layerForm({ + id: 'form', + title: '学校审核', + url: top.$.rootUrl + '/PersonnelManagement/SRProject/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=2', + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -174,6 +235,32 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "部门审核人", name: "DeptUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "学校审核人", name: "SchoolUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, //{ // label: "审批部门", name: "AuditDepartment", width: 100, align: "left", // formatterAsync: function (callback, value, row, op, $cell) { @@ -210,7 +297,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: true, - isMultiselect: true, + isMultiselect: false, sidx: "CreateTime desc" }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.cshtml new file mode 100644 index 000000000..e4cfa3957 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.cshtml @@ -0,0 +1,43 @@ +@{ + ViewBag.Title = "TeachingCompetition"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
部门*
+
+
+
+
名称
+
+
+
+
论文论著题目
+ +
+
+
发表刊物
+ +
+
+
发表时间*
+ +
+
+
级别
+
+
+
+
著作职称
+
+
+
+
附件
+
+
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.js new file mode 100644 index 000000000..3bd18f006 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/FormDeptSchool.js @@ -0,0 +1,49 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-06-12 11:42 + * 描 述：TeachingCompetition + */ +var acceptClick; +var keyValue = request('keyValue'); +var DeptSchool = request('DeptSchool'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#DepartmentId').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); + $('#TitleWorks').lrDataItemSelect({ code: 'TitleWorks' }); + $('#Rank').lrDataItemSelect({ code: 'Level' }); + $('#Path').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/SRWork/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/SRWork/DeptOrSchoolForm', { keyValue: keyValue, DeptSchool, DeptSchool }, function () { + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml index 034d965b4..767c4495e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml @@ -30,10 +30,12 @@
-
+
 新增  编辑  删除 +  部门 +  学校  评价
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js index d74fcca6c..81dee1923 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js @@ -5,6 +5,7 @@ * 描 述：科技著作 */ var refreshGirdData; +var selectedRow; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -38,6 +39,7 @@ var bootstrap = function ($, learun) { // 编辑 $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (keyValue.indexOf(',') != -1) { learun.alert.warning("只能选择一条记录进行编辑！"); @@ -59,6 +61,10 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/SRWork/DeleteForm', { keyValue: keyValue }, function () { @@ -71,7 +77,12 @@ var bootstrap = function ($, learun) { // 评价 $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow[0].State != 2) { + learun.alert.warning("请等待审核"); + return; + } learun.layerForm({ id: 'form', title: '评价', @@ -84,6 +95,56 @@ var bootstrap = function ($, learun) { }); } }); + // 部门 + $('#lr_dept').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } + if (selectedRow[0].State != 0) { + learun.alert.warning("数据异常！"); + return; + } + learun.layerForm({ + id: 'form', + title: '部门审核', + url: top.$.rootUrl + '/PersonnelManagement/SRWork/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=1', + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 学校 + $('#lr_school').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录！"); + return; + } + if (selectedRow[0].State != 1) { + learun.alert.warning("数据异常！"); + return; + } + learun.layerForm({ + id: 'form', + title: '学校审核', + url: top.$.rootUrl + '/PersonnelManagement/SRWork/FormDeptSchool?keyValue=' + keyValue + '&DeptSchool=2', + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -162,6 +223,32 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "部门审核人", name: "DeptUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "学校审核人", name: "SchoolUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, //{ // label: "审批用户", name: "AuditUser", width: 100, align: "left", // formatterAsync: function (callback, value, row, op, $cell) { @@ -185,7 +272,7 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: true, - isMultiselect: true, + isMultiselect: false, sidx: "CreateTime desc" }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 54782d9fc..9ae9f9ef1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1872,8 +1872,11 @@ + + + @@ -8159,6 +8162,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index d3f4005f6..7f72c39e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -74,7 +74,7 @@ - + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 7882b9183..3992e0aaa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -75,7 +75,7 @@ - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionService.cs index 58f5f59a2..67f044c4e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionService.cs @@ -188,6 +188,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration model.EvaluateTeacher = entity.EvaluateTeacher; model.EvaluateTime = DateTime.Now; model.EvaluateRemark = entity.EvaluateRemark; + model.State = 3; db.Update(model); } db.Commit(); @@ -216,11 +217,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { if (DeptSchool == "1") { - this.BaseRepository("CollegeMIS").ExecuteBySql(" update TeachingCompetition set DeptUser='" + LoginUserInfo.Get().userId + "',DeptTime='" + DateTime.Now + "',State=2 where id= '" + keyValue + "'"); + this.BaseRepository("CollegeMIS").ExecuteBySql(" update TeachingCompetition set DeptUser='" + LoginUserInfo.Get().userId + "',DeptTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); } else { - this.BaseRepository("CollegeMIS").ExecuteBySql(" update TeachingCompetition set SchoolUser='" + LoginUserInfo.Get().userId + "',SchoolTime='" + DateTime.Now + "',State=2 where id= '" + keyValue + "'"); + this.BaseRepository("CollegeMIS").ExecuteBySql(" update TeachingCompetition set SchoolUser='" + LoginUserInfo.Get().userId + "',SchoolTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); } } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperBLL.cs index 4b54391e2..d2ba87f83 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperBLL.cs @@ -136,6 +136,24 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + public void DeptOrSchoolForm(string keyValue, string DeptSchool) + { + try + { + sRPaperService.DeptOrSchoolForm(keyValue, DeptSchool); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperEntity.cs index bc2b4a3be..209284d07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperEntity.cs @@ -74,6 +74,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement this.ID = Guid.NewGuid().ToString(); this.CreateUser = LoginUserInfo.Get().userId; this.CreateTime = DateTime.Now; + this.State = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperIBLL.cs index ff8e687c3..e1c4c398e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperIBLL.cs @@ -46,6 +46,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement void CheckEntity(string keyValue, SRPaperEntity entity); + void DeptOrSchoolForm(string keyValue, string DeptSchool); + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperService.cs index f452554f2..bded6c3f7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRPaper/SRPaperService.cs @@ -170,6 +170,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement model.AuditUser = entity.AuditUser; model.AuditTime = DateTime.Now; model.AuditRemark = entity.AuditRemark; + model.State = 3; db.Update(model); } db.Commit(); @@ -187,6 +188,36 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void DeptOrSchoolForm(string keyValue, string DeptSchool) + { + try + { + if (DeptSchool == "1") + { + this.BaseRepository("CollegeMIS").ExecuteBySql(" update SRPaper set DeptUser='" + LoginUserInfo.Get().userId + "',DeptTime='" + DateTime.Now + "',State="+ DeptSchool + " where id= '" + keyValue + "'"); + } + else + { + this.BaseRepository("CollegeMIS").ExecuteBySql(" update SRPaper set SchoolUser='" + LoginUserInfo.Get().userId + "',SchoolTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectBLL.cs index eb158d637..39f757ab2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectBLL.cs @@ -136,6 +136,24 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + public void DeptOrSchoolForm(string keyValue, string DeptSchool) + { + try + { + sRProjectService.DeptOrSchoolForm(keyValue, DeptSchool); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs index f54ce11d4..e882ae189 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs @@ -94,6 +94,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement this.ID = Guid.NewGuid().ToString(); this.CreateUser = LoginUserInfo.Get().userId; this.CreateTime = DateTime.Now; + this.State = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectIBLL.cs index 43cf30cdb..b00f7328d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectIBLL.cs @@ -44,6 +44,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// void SaveEntity(string keyValue, SRProjectEntity entity); void CheckEntity(string keyValue, SRProjectEntity entity); + void DeptOrSchoolForm(string keyValue, string DeptSchool); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectService.cs index 3ec40d4ac..4e06fef22 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectService.cs @@ -177,6 +177,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement model.AuditTime = DateTime.Now; model.AuditDepartment = LoginUserInfo.Get().departmentId; model.AuditRemark = entity.AuditRemark; + model.State = 3; db.Update(model); } db.Commit(); @@ -194,6 +195,36 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void DeptOrSchoolForm(string keyValue, string DeptSchool) + { + try + { + if (DeptSchool == "1") + { + this.BaseRepository("CollegeMIS").ExecuteBySql(" update SRProject set DeptUser='" + LoginUserInfo.Get().userId + "',DeptTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); + } + else + { + this.BaseRepository("CollegeMIS").ExecuteBySql(" update SRProject set SchoolUser='" + LoginUserInfo.Get().userId + "',SchoolTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs index 545987148..8632dc25e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs @@ -135,6 +135,24 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + public void DeptOrSchoolForm(string keyValue, string DeptSchool) + { + try + { + sRWorkService.DeptOrSchoolForm(keyValue, DeptSchool); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs index 5fade47c7..28b118715 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs @@ -60,8 +60,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement public DateTime? SchoolTime { get; set; } [Column("SCHOOLUSER")] public string SchoolUser { get; set; } - [Column("STATUS")] - public int? Status { get; set; } + [Column("STATE")] + public int? State { get; set; } #endregion #region 扩展操作 @@ -73,6 +73,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement this.ID = Guid.NewGuid().ToString(); this.CreateUser = LoginUserInfo.Get().userId; this.CreateTime = DateTime.Now; + this.State = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs index 87cf79a5a..99eb86b54 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs @@ -43,9 +43,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// void SaveEntity(string keyValue, SRWorkEntity entity); - void CheckEntity(string keyValue, SRWorkEntity entity); - + void DeptOrSchoolForm(string keyValue, string DeptSchool); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs index 62814200e..e249b7465 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs @@ -172,6 +172,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement model.AuditUser = entity.AuditUser; model.AuditTime = DateTime.Now; model.AuditRemark = entity.AuditRemark; + model.State = 3; db.Update(model); } db.Commit(); @@ -189,6 +190,36 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void DeptOrSchoolForm(string keyValue, string DeptSchool) + { + try + { + if (DeptSchool == "1") + { + this.BaseRepository("CollegeMIS").ExecuteBySql(" update SRWork set DeptUser='" + LoginUserInfo.Get().userId + "',DeptTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); + } + else + { + this.BaseRepository("CollegeMIS").ExecuteBySql(" update SRWork set SchoolUser='" + LoginUserInfo.Get().userId + "',SchoolTime='" + DateTime.Now + "',State=" + DeptSchool + " where id= '" + keyValue + "'"); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion }