From 1c72fa9e85e1197c6b17fa02bafccf5ce5b3ee45 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 7 Jan 2025 16:18:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=9F=B9=E8=AE=AD+=E6=95=99?= =?UTF-8?q?=E7=A7=91=E7=A0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TeacherTrainController.cs | 14 + .../Views/ResearchResult/Index.cshtml | 6 +- .../Views/ResearchResult/Index.js | 587 +++++++++--------- .../Views/TeacherTrain/Index.cshtml | 3 +- .../Views/TeacherTrain/Index.js | 36 +- .../ResearchResult/ResearchResultService.cs | 11 +- .../TeacherTrain/TeacherTrainBLL.cs | 19 + .../TeacherTrain/TeacherTrainIBLL.cs | 3 + .../TeacherTrain/TeacherTrainService.cs | 28 + 9 files changed, 401 insertions(+), 306 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs index bd12c8478..69c3e13eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs @@ -133,6 +133,20 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers teacherTrainIBLL.EnableDisable(keyValue,status); return Success("操作成功！"); } + + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult SubmitForm(string keyValue) + { + teacherTrainIBLL.SubmitEntity(keyValue); + return Success("提交成功！"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.cshtml index da3141af8..a6a6abdbc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.cshtml @@ -50,9 +50,9 @@  查看
- @*  提交*@ -  提交 -  去审 +  提交 +  审核 +  去审
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js index 094143716..d72e08d6b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js @@ -1,292 +1,295 @@ -/* * 版 本 Learun-ADMS V7.0.6 数字化智慧校园 - * Copyright (c) 2013-2020 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2024-12-04 11:37 - * 描 述：教科研成果 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 220, 400); - $('#ResearchType').lrDataItemSelect({ code: 'SRAchievementType' }); - $('#ProductPerson').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); - $('#Rank').lrDataItemSelect({ code: 'Level' }); - $('#Year').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', - value: 'value', - text: 'text' - }); - $('#LV').lrDataItemSelect({ code: 'LV' }); - $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/Form', - width: 600, - height: 620, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - var Status = $('#gridtable').jfGridValue('StatusMark'); - if (Status != 0) { - learun.alert.warning("当前项目已提交,不可编辑！"); - return; - } - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行编辑！"); - return; - } - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/Form?keyValue=' + keyValue, - width: 600, - height: 620, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - var Status = $('#gridtable').jfGridValue('StatusMark'); - if (Status.indexOf('1') != -1) { - learun.alert.warning("选中项包含已提交项,不可删除！"); - return; - } - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //查看 - $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行查看！"); - return; - } - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'FormView', - title: '查看', - url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/FormView?keyValue=' + keyValue, - width: 600, - height: 620, - btn: '', - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - //// 打印 - //$('#lr_print').on('click', function () { - // $('#gridtable').jqprintTable(); - //}); - //  提交 - //$('#lr_submit').on('click', function () { - // var keyValue = $('#gridtable').jfGridValue('ID'); - // if (learun.checkrow(keyValue)) { - // var Status = $('#gridtable').jfGridValue('StatusMark'); - // if (Status != 0) { - // learun.alert.warning("当前项目已提交请勿进行重复提交！"); - // return; - // } - // learun.layerConfirm('是否确认提交该项！', function (res) { - // if (res) { - // learun.postForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/SubmitForm', { keyValue: keyValue }, function () { - // refreshGirdData(); - // }); - // } - // }); - // } - //}); - //提交 - $('#lr_check').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - if (learun.checkrow(keyValue)) { - var StatusMark = $('#gridtable').jfGridValue('StatusMark'); - if (StatusMark.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已提交项目！"); - return; - } - learun.layerConfirm('是否确认提交该项？', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/EnableDisableForm', { keyValue: keyValue, status: "1" }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //去审 - $('#lr_uncheck').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('ID'); - if (learun.checkrow(keyValue)) { - var StatusMark = $('#gridtable').jfGridValue('StatusMark'); - var StatusMarkArr = StatusMark.split(','); - if ($.inArray('0', StatusMarkArr) != -1 ) { - learun.alert.warning("选中记录中未包含提交项！"); - return; - } - learun.layerConfirm('是否确认取消提交该项？', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/EnableDisableForm', { keyValue: keyValue, status: "0" }, function () { - refreshGirdData(); - }); - } - }); - } - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/GetPageList', - headData: [ - { - label: "状态", name: "StatusMark", width: 80, align: "left", - formatter: function (cellvalue, row) { - if (cellvalue == "1") { - return '已提交'; - } else { - return '草稿'; - } - } - }, - { - label: "类别", name: "ResearchType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'SRAchievementType', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { - label: "成果人", name: "ProductPerson", 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: "PublicationName", width: 100, align: "left" }, - { label: "刊号", name: "ISSN", width: 100, align: "left" }, - { - label: "排位", name: "Ranked", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'Ranked', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - - { - label: "所属项目", name: "ActivityItem", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'ActivityItem', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: "成果名称", name: "OutcomeName", width: 100, align: "left" }, - { - label: "级别", name: "Rank", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'Level', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { - label: "等级", name: "LV", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'LV', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: "发证单位(主管单位)", name: "CompetentUnit", width: 100, align: "left" }, - { - label: "年度", name: "Year", width: 50, align: "left", - }, - { - label: "月份", name: "Month", width: 50, align: "left", - }, - { label: "成果编号", name: "ResultNo", width: 100, align: "left" }, - { label: "积分", name: "Points", width: 50, align: "left" }, - { label: "备注", name: "Remark", width: 100, align: "left" }, - //{ label: "附件", name: "Url", width: 100, align: "left" }, - ], - mainId: 'ID', - isPage: true, - sidx: " Createdate ,StatusMark", - sord: 'desc', - isMultiselect: true, - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} +/* * 版 本 Learun-ADMS V7.0.6 数字化智慧校园 + * Copyright (c) 2013-2020 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2024-12-04 11:37 + * 描 述：教科研成果 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#ResearchType').lrDataItemSelect({ code: 'SRAchievementType' }); + $('#ProductPerson').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); + $('#Rank').lrDataItemSelect({ code: 'Level' }); + $('#Year').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', + value: 'value', + text: 'text' + }); + $('#LV').lrDataItemSelect({ code: 'LV' }); + $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/Form', + width: 600, + height: 620, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + var Status = $('#gridtable').jfGridValue('StatusMark'); + if (Status != 0) { + learun.alert.warning("当前项目已提交,不可编辑！"); + return; + } + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行编辑！"); + return; + } + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/Form?keyValue=' + keyValue, + width: 600, + height: 620, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + var Status = $('#gridtable').jfGridValue('StatusMark'); + if (Status.indexOf('1') != -1) { + learun.alert.warning("选中项包含已提交项,不可删除！"); + return; + } + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行查看！"); + return; + } + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'FormView', + title: '查看', + url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/FormView?keyValue=' + keyValue, + width: 600, + height: 620, + btn: '', + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + //// 打印 + //$('#lr_print').on('click', function () { + // $('#gridtable').jqprintTable(); + //}); + //  提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('StatusMark'); + if ($.inArray('1', Status) != -1 || $.inArray('2', Status) != -1) { + learun.alert.warning("选中记录中包含已提交或已通过项目！"); + return; + } + learun.layerConfirm('是否确认提交选中项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/SubmitForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //审核 + $('#lr_check').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var StatusMark = $('#gridtable').jfGridValue('StatusMark'); + if (StatusMark.indexOf('0') != -1) { + learun.alert.warning("选中记录中包含草稿项目！"); + return; + } + learun.layerConfirm('是否确认审核选中项？', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/EnableDisableForm', { keyValue: keyValue, status: "2" }, + function () { + refreshGirdData(); + }); + } + }); + } + }); + //去审 + $('#lr_uncheck').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var StatusMark = $('#gridtable').jfGridValue('StatusMark'); + var StatusMarkArr = StatusMark.split(','); + if ($.inArray('0', StatusMarkArr) != -1) { + learun.alert.warning("选中记录中未包含提交项！"); + return; + } + learun.layerConfirm('是否确认取消选中项？', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/ResearchResult/EnableDisableForm', { keyValue: keyValue, status: "0" }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/ResearchResult/GetPageList', + headData: [ + { + label: "状态", name: "StatusMark", width: 80, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == "1") { + return '审批中'; + } else if (cellvalue == "2") { + return '通过'; + } else { + return '草稿'; + } + } + }, + { + label: "类别", name: "ResearchType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'SRAchievementType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "成果人", name: "ProductPerson", 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: "PublicationName", width: 100, align: "left" }, + { label: "刊号", name: "ISSN", width: 100, align: "left" }, + { + label: "排位", name: "Ranked", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'Ranked', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + { + label: "所属项目", name: "ActivityItem", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ActivityItem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "成果名称", name: "OutcomeName", width: 100, align: "left" }, + { + label: "级别", name: "Rank", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'Level', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "等级", name: "LV", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'LV', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "发证单位(主管单位)", name: "CompetentUnit", width: 100, align: "left" }, + { + label: "年度", name: "Year", width: 50, align: "left", + }, + { + label: "月份", name: "Month", width: 50, align: "left", + }, + { label: "成果编号", name: "ResultNo", width: 100, align: "left" }, + { label: "积分", name: "Points", width: 50, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + //{ label: "附件", name: "Url", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: " Createdate ,StatusMark", + sord: 'desc', + isMultiselect: true, + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.cshtml index 33ced306a..fba488d7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.cshtml @@ -47,7 +47,8 @@  修改  删除  查看 -  提交 +  提交 +  审核  去审 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js index dc4571ba3..d6b0a25f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js @@ -99,18 +99,36 @@ var bootstrap = function ($, learun) { }); } }); - //提交 + //  提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('TTID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('State'); + if ($.inArray('1', Status) != -1 || $.inArray('2', Status) != -1) { + learun.alert.warning("选中记录中包含已提交或已通过项目！"); + return; + } + learun.layerConfirm('是否确认提交选中项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherTrain/SubmitForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //审核 $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('TTID'); if (learun.checkrow(keyValue)) { var State = $('#gridtable').jfGridValue('State'); - if (State.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已提交项目！"); + if (State.indexOf('0') != -1) { + learun.alert.warning("选中记录中包含草稿项目！"); return; } - learun.layerConfirm('是否确认提交该项？', function (res) { + learun.layerConfirm('是否确认审核选中项？', function (res) { if (res) { - learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherTrain/EnableDisableForm', { keyValue: keyValue, status: "1" }, function () { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherTrain/EnableDisableForm', { keyValue: keyValue, status: "2" }, function () { refreshGirdData(); }); } @@ -127,7 +145,7 @@ var bootstrap = function ($, learun) { learun.alert.warning("选中记录中包含提交项目！"); return; } - learun.layerConfirm('是否确认取消提交该项？', function (res) { + learun.layerConfirm('是否确认去审选中项？', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherTrain/EnableDisableForm', { keyValue: keyValue, status: "0"}, function () { refreshGirdData(); @@ -145,8 +163,10 @@ var bootstrap = function ($, learun) { { label: "状态", name: "State", width: 100, align: "left", formatter: function (cellvalue, row) { - if (cellvalue === "1") { - return '已提交'; + if (cellvalue == "1") { + return '审批中'; + } else if (cellvalue == "2") { + return '通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs index 7a73b4246..f60dc985f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs @@ -200,13 +200,20 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 public void SubmitEntity(string keyValue) { + var db = BaseRepository("CollegeMIS").BeginTrans(); try { - var sql = $"update ResearchResult set StatusMark ='1' where id = '{keyValue}'"; - this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + var collection = keyValue.Split(','); + foreach (var item in collection) + { + var sql = $"update ResearchResult set StatusMark ='1' where id = '{item}'"; + db.ExecuteBySql(sql); + } + db.Commit(); } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainBLL.cs index cfb405755..af6c5dcab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainBLL.cs @@ -164,6 +164,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + + public void SubmitEntity(string keyValue) + { + try + { + teacherTrainService.SubmitEntity(keyValue); + } + 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/TeacherTrain/TeacherTrainIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainIBLL.cs index 6935ef664..4a3163e08 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainIBLL.cs @@ -57,6 +57,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// void EnableDisable(string keyValue, string status); + + void SubmitEntity(string keyValue); + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs index 723272390..73644c485 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs @@ -255,6 +255,34 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + public void SubmitEntity(string keyValue) + { + var db = BaseRepository().BeginTrans(); + try + { + var collection = keyValue.Split(','); + foreach (var item in collection) + { + var sql = $"update TeacherTrain set State ='1' where TTID = '{item}'"; + db.ExecuteBySql(sql); + } + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion