From 6a2e201101db92d9ec65cb364d9f7376a41edbac Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 22 Sep 2020 09:17:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=AD=E8=81=8C=E6=8B=9B=E7=94=9F?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E4=BF=A1=E6=81=AF=E3=80=81=E6=8A=A5=E5=88=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=81=E9=80=80=E5=AD=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AP_OnlineUserInfoController.cs | 31 +- .../AP_OnlineUserInfo/DropOutIndex.cshtml | 59 ++++ .../Views/AP_OnlineUserInfo/DropOutIndex.js | 328 ++++++++++++++++++ .../AP_OnlineUserInfo/PaymentIndex.cshtml | 66 ++++ .../Views/AP_OnlineUserInfo/PaymentIndex.js | 324 +++++++++++++++++ .../AP_OnlineUserInfo/RegistrateIndex.cshtml | 3 - .../AP_OnlineUserInfo/RegistrateIndex.js | 96 ++--- .../AP_OnlineUserInfo/ReportIndex.cshtml | 62 ++++ .../Views/AP_OnlineUserInfo/ReportIndex.js | 326 +++++++++++++++++ .../Learun.Application.Web.csproj | 6 + .../AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs | 6 +- .../AP_OnlineUserInfoIBLL.cs | 2 +- .../AP_OnlineUserInfoService.cs | 6 +- 13 files changed, 1231 insertions(+), 84 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs index fc20a5e30..de80592a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs @@ -83,6 +83,33 @@ namespace Learun.Application.Web.Areas.AdmissionsPlatform.Controllers { return View(); } + /// + /// 主页面【缴费信息】 + /// + /// + [HttpGet] + public ActionResult PaymentIndex() + { + return View(); + } + /// + /// 主页面【报到信息】 + /// + /// + [HttpGet] + public ActionResult ReportIndex() + { + return View(); + } + /// + /// 主页面【退学信息】 + /// + /// + [HttpGet] + public ActionResult DropOutIndex() + { + return View(); + } #endregion #region 获取数据 @@ -261,9 +288,9 @@ namespace Learun.Application.Web.Areas.AdmissionsPlatform.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DoDropOut(string keyValue) + public ActionResult DoDropOut(string keyValue, string status) { - onlineUserInfoIBLL.DoDropOut(keyValue); + onlineUserInfoIBLL.DoDropOut(keyValue, status); return Success("操作成功！"); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml new file mode 100644 index 000000000..96ef9982d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml @@ -0,0 +1,59 @@ +@{ + ViewBag.Title = "退学信息"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
手机号
+ +
+
+
性别
+
+
+
+
专业
+
+
+
+
报名方式
+
+
+
+
推荐老师
+
+
+
+
审核状态
+
+
+
+
+
+
+
+
+ +
+
+  退学 +  取消退学 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js new file mode 100644 index 000000000..0f30d8369 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js @@ -0,0 +1,328 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-17 15:45 + * 描 述：退学信息 + */ +var selectedRow; +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); + }, 250, 400); + $("#SexId").lrDataItemSelect({ code: 'usersex' }); + $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#UserTeacherId').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' }); + $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //退学 + $('#lr_Drop').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var IsDropOut = $('#gridtable').jfGridValue('IsDropOut'); + if (IsDropOut.indexOf('1') != -1) { + learun.alert.warning("选中记录中包含已退学项目！"); + return; + } + learun.layerConfirm('是否确认退学该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue, status: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //取消退学 + $('#lr_DropCancel').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var IsDropOut = $('#gridtable').jfGridValue('IsDropOut'); + if (IsDropOut.indexOf('0') != -1) { + learun.alert.warning("选中记录中包含未退学项目！"); + return; + } + learun.layerConfirm('是否确认取消退学该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue, status: '0' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate', + headData: [ + { + label: '审核状态', name: 'AppStatus', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AdmissionsAppStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '创建时间', name: 'CreateDate', width: 130, align: "left" }, + { label: '姓名', name: 'RealName', width: 100, align: "left" }, + { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, + { + label: '是否退学', name: 'IsDropOut', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; + } + }, + { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, + { + label: '性别', name: 'SexId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, + { + label: '民族', name: 'Nation', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { + label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + key: value, + keyId: 'partyfaceno', + callback: function (_data) { + callback(_data['partyface']); + } + }); + } + }, + { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, + { + label: '户口性质', name: 'OriginId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ResidenceNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, + { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, + { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, + { + label: '学习形式', name: 'YearFormId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '招生季度', name: 'QuarterId', width: 100, align: "left" }, + { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, + { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, + { + label: '文化程度', name: 'CultureId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + key: value, + keyId: 'culturedegreeno', + callback: function (_data) { + callback(_data['culturedegree']); + } + }); + } + }, + { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, + { + label: '学制', name: 'LearnLength', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, + { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, + { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, + { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, + { + label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否低保', name: 'IsBasicId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IncomeSource', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '报考校区', name: 'SchoolId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: '报考专业', name: 'MajorId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: '推荐老师', name: 'UserTeacherId', 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: 'PaymentQuota', width: 100, align: "left" }, + { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" }, + { + label: '报名方式', name: 'EnrollMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + ], + mainId: 'Id', + isPage: true, + isMultiselect: true, + sord: 'desc', + sidx: 'CreateDate' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml new file mode 100644 index 000000000..dcd9965b0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml @@ -0,0 +1,66 @@ +@{ + ViewBag.Title = "缴费信息"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
手机号
+ +
+
+
性别
+
+
+
+
专业
+
+
+
+
是否缴费
+
+
+
+
缴费方式
+
+
+
+
报名方式
+
+
+
+
推荐老师
+
+
+
+
审核状态
+
+
+
+
+
+
+
+
+ +
+
+  缴费 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js new file mode 100644 index 000000000..326a7851a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js @@ -0,0 +1,324 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-17 15:45 + * 描 述：缴费信息 + */ +var selectedRow; +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); + }, 250, 400); + $("#SexId").lrDataItemSelect({ code: 'usersex' }); + $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#UserTeacherId').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $("#IsPaymentId").lrDataItemSelect({ code: 'YesOrNoInt' }); + $("#PaymentMode").lrDataItemSelect({ code: 'PaymentMode' }); + $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' }); + $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //缴费 + $('#lr_Pay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'PaymentForm', + title: '缴费', + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/PaymentForm?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate', + headData: [ + { + label: '审核状态', name: 'AppStatus', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AdmissionsAppStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '创建时间', name: 'CreateDate', width: 130, align: "left" }, + { label: '姓名', name: 'RealName', width: 100, align: "left" }, + { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, + { + label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; + } + }, + { label: '缴费时间', name: 'PaymentDate', width: 100, align: "left" }, + { + label: '缴费方式', name: 'PaymentMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PaymentMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, + { + label: '性别', name: 'SexId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, + { + label: '民族', name: 'Nation', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { + label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + key: value, + keyId: 'partyfaceno', + callback: function (_data) { + callback(_data['partyface']); + } + }); + } + }, + { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, + { + label: '户口性质', name: 'OriginId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ResidenceNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, + { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, + { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, + { + label: '学习形式', name: 'YearFormId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '招生季度', name: 'QuarterId', width: 100, align: "left" }, + { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, + { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, + { + label: '文化程度', name: 'CultureId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + key: value, + keyId: 'culturedegreeno', + callback: function (_data) { + callback(_data['culturedegree']); + } + }); + } + }, + { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, + { + label: '学制', name: 'LearnLength', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, + { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, + { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, + { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, + { + label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否低保', name: 'IsBasicId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IncomeSource', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '报考校区', name: 'SchoolId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: '报考专业', name: 'MajorId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: '推荐老师', name: 'UserTeacherId', 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: 'PaymentQuota', width: 100, align: "left" }, + { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" }, + { + label: '报名方式', name: 'EnrollMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + ], + mainId: 'Id', + isPage: true, + isMultiselect: true, + sord: 'desc', + sidx: 'CreateDate' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml index e5bb66218..7068648e1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml @@ -65,9 +65,6 @@  审核通过  审核不通过  关联教师 -  缴费 -  报到 -  退学 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js index a7182aea8..bf4f13678 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js @@ -142,58 +142,6 @@ var bootstrap = function ($, learun) { }); } }); - //缴费 - $('#lr_Pay').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'PaymentForm', - title: '缴费', - url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/PaymentForm?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - //报到 - $('#lr_Report').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'ReportForm', - title: '报到', - url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/ReportForm?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - //退学 - $('#lr_Drop').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var IsDropOut = $('#gridtable').jfGridValue('IsDropOut'); - if (IsDropOut.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已退学项目！"); - return; - } - learun.layerConfirm('是否确认退学该项！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); }, initGird: function () { @@ -207,7 +155,16 @@ var bootstrap = function ($, learun) { key: value, code: 'AdmissionsAppStatus', callback: function (_data) { - callback(_data.text); + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } } }); } @@ -405,15 +362,8 @@ var bootstrap = function ($, learun) { }, { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" }, { - label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'YesOrNoInt', - callback: function (_data) { - callback(_data.text); - } - }); + label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; } }, { label: '缴费时间', name: 'PaymentDate', width: 100, align: "left" }, @@ -436,7 +386,16 @@ var bootstrap = function ($, learun) { key: value, code: 'IsReport', callback: function (_data) { - callback(_data.text); + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常报到") { + callback('' + _data.text + ''); + } else if (_data.text == "异常报到") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } } }); } @@ -455,15 +414,8 @@ var bootstrap = function ($, learun) { } }, { - label: '是否退学', name: 'IsDropOut', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'YesOrNoInt', - callback: function (_data) { - callback(_data.text); - } - }); + label: '是否退学', name: 'IsDropOut', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; } }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml new file mode 100644 index 000000000..0a164733f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml @@ -0,0 +1,62 @@ +@{ + ViewBag.Title = "报到信息"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
手机号
+ +
+
+
性别
+
+
+
+
专业
+
+
+
+
是否报到
+
+
+
+
报名方式
+
+
+
+
推荐老师
+
+
+
+
审核状态
+
+
+
+
+
+
+
+
+ +
+
+  报到 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js new file mode 100644 index 000000000..b1831fcba --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js @@ -0,0 +1,326 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-17 15:45 + * 描 述：报到信息 + */ +var selectedRow; +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); + }, 250, 400); + $("#SexId").lrDataItemSelect({ code: 'usersex' }); + $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#UserTeacherId').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $("#IsReportId").lrDataItemSelect({ code: 'IsReport' }); + $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' }); + $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //报到 + $('#lr_Report').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'ReportForm', + title: '报到', + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/ReportForm?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate', + headData: [ + { + label: '审核状态', name: 'AppStatus', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AdmissionsAppStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '创建时间', name: 'CreateDate', width: 130, align: "left" }, + { label: '姓名', name: 'RealName', width: 100, align: "left" }, + { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, + { + label: '是否报到', name: 'IsReportId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IsReport', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常报到") { + callback('' + _data.text + ''); + } else if (_data.text == "异常报到") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, + { + label: '性别', name: 'SexId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, + { + label: '民族', name: 'Nation', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { + label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + key: value, + keyId: 'partyfaceno', + callback: function (_data) { + callback(_data['partyface']); + } + }); + } + }, + { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, + { + label: '户口性质', name: 'OriginId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ResidenceNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, + { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, + { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, + { + label: '学习形式', name: 'YearFormId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '招生季度', name: 'QuarterId', width: 100, align: "left" }, + { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, + { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, + { + label: '文化程度', name: 'CultureId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + key: value, + keyId: 'culturedegreeno', + callback: function (_data) { + callback(_data['culturedegree']); + } + }); + } + }, + { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, + { + label: '学制', name: 'LearnLength', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, + { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, + { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, + { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, + { + label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否低保', name: 'IsBasicId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IncomeSource', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '报考校区', name: 'SchoolId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: '报考专业', name: 'MajorId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: '推荐老师', name: 'UserTeacherId', 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: 'PaymentQuota', width: 100, align: "left" }, + { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" }, + { + label: '报名方式', name: 'EnrollMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + ], + mainId: 'Id', + isPage: true, + isMultiselect: true, + sord: 'desc', + sidx: 'CreateDate' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} 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 3af8213ac..d02d1d59e 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 @@ -789,6 +789,9 @@ + + + @@ -6794,6 +6797,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs index 6dc8920e8..00eb5111a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs @@ -379,11 +379,11 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform /// 主键 /// /// - public void DoDropOut(string keyValue) + public void DoDropOut(string keyValue, string status) { try { - onlineUserInfoService.DoDropOut(keyValue); + onlineUserInfoService.DoDropOut(keyValue, status); } catch (Exception ex) { @@ -478,7 +478,7 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform { try { - onlineUserInfoService.SaveReselectMajor(userId, majorNo); + onlineUserInfoService.SaveReselectMajor(userId, majorNo); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs index 2e2507a87..befc3a845 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs @@ -113,7 +113,7 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform /// 主键 /// /// - void DoDropOut(string keyValue); + void DoDropOut(string keyValue, string status); /// /// 关联教师 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs index af4cb68b3..2681215eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs @@ -627,7 +627,7 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform /// 主键 /// /// - public void DoDropOut(string keyValue) + public void DoDropOut(string keyValue, string status) { var db = this.BaseRepository("CollegeMIS").BeginTrans(); try @@ -636,13 +636,13 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform { if (keyValue.IndexOf(",") == -1) { - db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='1' where UserId='" + keyValue + "' "); + db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='" + status + "' where UserId='" + keyValue + "' "); } else { foreach (var item in keyValue.Split(',')) { - db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='1' where UserId='" + item + "' "); + db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='" + status + "' where UserId='" + item + "' "); } } } From 432970ba01caf8473d8614643d0a2f23dc2d1162 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 22 Sep 2020 09:31:58 +0800 Subject: [PATCH 2/6] 1 --- .../Views/OnlineStudentInfo/Form.cshtml | 187 --------- .../Views/OnlineStudentInfo/Form.js | 38 -- .../Views/OnlineStudentInfo/Index.cshtml | 39 -- .../Views/OnlineStudentInfo/Index.js | 134 ------- .../Views/OnlineUserInfo/Form.cshtml | 127 ------- .../Views/OnlineUserInfo/Form.js | 38 -- .../Views/OnlineUserInfo/Index.cshtml | 39 -- .../Views/OnlineUserInfo/Index.js | 119 ------ .../OnlineUserInfo/RegistrateIndex.cshtml | 36 -- .../Views/OnlineUserInfo/RegistrateIndex.js | 174 --------- .../Learun.Application.Web.csproj | 6 + .../OnlineStudentInfo/OnlineStudentInfoBLL.cs | 171 --------- .../OnlineStudentInfoEntity.cs | 314 --------------- .../OnlineStudentInfoIBLL.cs | 60 --- .../OnlineStudentInfoService.cs | 249 ------------ .../OnlineUserInfo/OnlineUserInfoBLL.cs | 236 ------------ .../OnlineUserInfo/OnlineUserInfoEntity.cs | 358 ------------------ .../OnlineUserInfo/OnlineUserInfoIBLL.cs | 76 ---- .../OnlineUserInfo/OnlineUserInfoService.cs | 334 ---------------- 19 files changed, 6 insertions(+), 2729 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoEntity.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoIBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoService.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoEntity.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoIBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.cshtml deleted file mode 100644 index f3ce50eec..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.cshtml +++ /dev/null @@ -1,187 +0,0 @@ -@{ - ViewBag.Title = "招生学生信息"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
学生ID*
- -
-
-
人员ID*
- -
-
-
学员编号*
- -
-
-
报考类别（字典）*
- -
-
-
考生类别（字典）*
- -
-
-
考生情况（字典）*
- -
-
-
家庭出生(字典):农民、工人、干部*
- -
-
-
本人成分（字典）*
- -
-
-
文化程度（字典）*
- -
-
-
婚否（字典）*
- -
-
-
属何种照顾对象*
- -
-
-
爱好特长*
- -
-
-
是否城镇户口*
- -
-
-
现学习或工作单位*
- -
-
-
任何职务*
- -
-
-
工种（字典）*
- -
-
-
证书编号*
- -
-
-
何时何地受过何种奖励或处分*
- -
-
-
招生季度（字典）*
- -
-
-
学习形式（字典）:全日制*
- -
-
-
毕业学校*
- -
-
-
班级*
- -
-
-
银行卡号*
- -
-
-
学制（字典）*
- -
-
-
家庭联系人*
- -
-
-
家庭联系电话*
- -
-
-
家庭年总收入*
- -
-
-
家庭人均收入*
- -
-
-
是否十万以下民族（字典）:是、否*
- -
-
-
是否家庭困难（字典）*
- -
-
-
是否低保（字典）*
- -
-
-
收入来源（字典）:务农、工人、职员、教师*
- -
-
-
备注*
- -
-
-
报考校区（字典）*
- -
-
-
关联老师ID*
- -
-
-
是否缴费（字典）*
- -
-
-
缴费额度*
- -
-
-
缴费时间*
- -
-
-
缴费方式（字典）:1现金交费、0网上交费*
- -
-
-
是否报到（字典）:1正常报到，0未报到，2异常报到*
- -
-
-
报名时间*
- -
-
-
报名方式（字典）:1现场报名、0网上报名*
- -
-
-
创建时间*
- -
-
-
身体状况:问卷调查*
- -
-
-
异常报到原因*
- -
-
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js deleted file mode 100644 index 05cd056b4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Form.js +++ /dev/null @@ -1,38 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2020-04-17 15:56 - * 描 述：招生学生信息 - */ -var acceptClick; -var keyValue = request('keyValue'); -var bootstrap = function ($, learun) { - "use strict"; - var selectedRow =learun.frameTab.currentIframe().selectedRow; - var page = { - init: function () { - page.initData(); - }, - bind: function () { - }, - initData: function () { - if (!!selectedRow) { - $('#form').lrSetFormData(selectedRow); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - $.lrSaveForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.cshtml deleted file mode 100644 index d88afc474..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.cshtml +++ /dev/null @@ -1,39 +0,0 @@ -@{ - ViewBag.Title = "招生学生信息"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
树形目录
-
-
-
-
-
-
标题
-
-
-
- -
-
-  查询 -
-
-
-
- -
-
-  新增 -  编辑 -  删除 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js deleted file mode 100644 index 2590f701e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineStudentInfo/Index.js +++ /dev/null @@ -1,134 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2020-04-17 15:56 - * 描 述：招生学生信息 - */ -var selectedRow; -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - selectedRow = null; - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/Form', - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/Form?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/DeleteForm', { keyValue: keyValue}, function () { - }); - } - }); - } - }); - }, - initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineStudentInfo/GetPageList', - headData: [ - { label: '学生ID', name: 'Id', width: 200, align: "left" }, - { label: '人员ID', name: 'UserId', width: 200, align: "left" }, - { label: '学员编号', name: 'StudentNumber', width: 200, align: "left" }, - { label: '报考类别（字典）', name: 'ExamineTypeId', width: 200, align: "left" }, - { label: '考生类别（字典）', name: 'ExamineeTypeId', width: 200, align: "left" }, - { label: '考生情况（字典）', name: 'ExamineeConditionId', width: 200, align: "left" }, - { label: '家庭出生(字典):农民、工人、干部', name: 'FamilyBirthId', width: 200, align: "left" }, - { label: '本人成分（字典）', name: 'OneselfComponent', width: 200, align: "left" }, - { label: '文化程度（字典）', name: 'CultureId', width: 200, align: "left" }, - { label: '婚否（字典）', name: 'MarriageId', width: 200, align: "left" }, - { label: '属何种照顾对象', name: 'WhichCareObject', width: 200, align: "left" }, - { label: '爱好特长', name: 'Hobbies', width: 200, align: "left" }, - { label: '是否城镇户口', name: 'IsTownId', width: 200, align: "left" }, - { label: '现学习或工作单位', name: 'WorkUnit', width: 200, align: "left" }, - { label: '任何职务', name: 'PostDuties', width: 200, align: "left" }, - { label: '工种（字典）', name: 'WorkTypeId', width: 200, align: "left" }, - { label: '证书编号', name: 'CertificateNumber', width: 200, align: "left" }, - { label: '何时何地受过何种奖励或处分', name: 'RewardOrPunish', width: 200, align: "left" }, - { label: '招生季度（字典）', name: 'QuarterId', width: 200, align: "left" }, - { label: '学习形式（字典）:全日制', name: 'YearFormId', width: 200, align: "left" }, - { label: '毕业学校', name: 'GraduateSchool', width: 200, align: "left" }, - { label: '班级', name: 'Class', width: 200, align: "left" }, - { label: '银行卡号', name: 'BankNumber', width: 200, align: "left" }, - { label: '学制（字典）', name: 'LearnLength', width: 200, align: "left" }, - { label: '家庭联系人', name: 'FamilyLinkman', width: 200, align: "left" }, - { label: '家庭联系电话', name: 'FamilyPhone', width: 200, align: "left" }, - { label: '家庭年总收入', name: 'FamilyIncome', width: 200, align: "left" }, - { label: '家庭人均收入', name: 'FamilyFenIncome', width: 200, align: "left" }, - { label: '是否十万以下民族（字典）:是、否', name: 'IsTenId', width: 200, align: "left" }, - { label: '是否家庭困难（字典）', name: 'IsHardId', width: 200, align: "left" }, - { label: '是否低保（字典）', name: 'IsBasicId', width: 200, align: "left" }, - { label: '收入来源（字典）:务农、工人、职员、教师', name: 'IncomeSourceId', width: 200, align: "left" }, - { label: '备注', name: 'Remarks', width: 200, align: "left" }, - { label: '报考校区（字典）', name: 'SchoolId', width: 200, align: "left" }, - { label: '关联老师ID', name: 'UserTeacherId', width: 200, align: "left" }, - { label: '是否缴费（字典）', name: 'IsPaymentId', width: 200, align: "left" }, - { label: '缴费额度', name: 'PaymentQuota', width: 200, align: "left" }, - { label: '缴费时间', name: 'PaymentDate', width: 200, align: "left" }, - { label: '缴费方式（字典）:1现金交费、0网上交费', name: 'PaymentMode', width: 200, align: "left" }, - { label: '是否报到（字典）:1正常报到，0未报到，2异常报到', name: 'IsReportId', width: 200, align: "left" }, - { label: '报名时间', name: 'EnrollDate', width: 200, align: "left" }, - { label: '报名方式（字典）:1现场报名、0网上报名', name: 'EnrollMode', width: 200, align: "left" }, - { label: '创建时间', name: 'CreateDate', width: 200, align: "left" }, - { label: '身体状况:问卷调查', name: 'BodyRemarks', width: 200, align: "left" }, - { label: '异常报到原因', name: 'ReportReason', width: 200, align: "left" }, - ], - mainId:'Id', - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - page.search(); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.cshtml deleted file mode 100644 index f041f09a4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.cshtml +++ /dev/null @@ -1,127 +0,0 @@ -@{ - ViewBag.Title = "招生人员信息"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
人员ID*
- -
-
-
手机号码*
- -
-
-
密码*
- -
-
-
人员类型（字典）（1学生、2老师、3下乡老师）*
- -
-
-
姓名*
- -
-
-
性别(字典)*
- -
-
-
年龄*
- -
-
-
民族*
- -
-
-
出生日期*
- -
-
-
身份证号*
- -
-
-
联系电话*
- -
-
-
头像*
- -
-
-
邮箱*
- -
-
-
省份*
- -
-
-
市*
- -
-
-
县市、区*
- -
-
-
政治面貌（字典）*
- -
-
-
邮政编码*
- -
-
-
籍贯*
- -
-
-
户口性质（字典）*
- -
-
-
现户籍所在地*
- -
-
-
详细地址*
- -
-
-
在籍年份*
- -
-
-
状态（字典）（启用、锁定）*
- -
-
-
创建时间*
- -
-
-
排序串*
- -
-
-
微信号*
- -
-
-
审核状态1通过，2未审核，3未通过*
- -
-
-
校区ID*
- -
-
-
数据来源（0、电脑1、安卓2、学生扫老师）*
- -
-
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js deleted file mode 100644 index 7c3f6f8d1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Form.js +++ /dev/null @@ -1,38 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2020-04-17 15:45 - * 描 述：招生人员信息 - */ -var acceptClick; -var keyValue = request('keyValue'); -var bootstrap = function ($, learun) { - "use strict"; - var selectedRow =learun.frameTab.currentIframe().selectedRow; - var page = { - init: function () { - page.initData(); - }, - bind: function () { - }, - initData: function () { - if (!!selectedRow) { - $('#form').lrSetFormData(selectedRow); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - $.lrSaveForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.cshtml deleted file mode 100644 index 902f07be4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.cshtml +++ /dev/null @@ -1,39 +0,0 @@ -@{ - ViewBag.Title = "招生人员信息"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
树形目录
-
-
-
-
-
-
标题
-
-
-
- -
-
-  查询 -
-
-
-
- -
-
-  新增 -  编辑 -  删除 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js deleted file mode 100644 index 45c74aea3..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/Index.js +++ /dev/null @@ -1,119 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2020-04-17 15:45 - * 描 述：招生人员信息 - */ -var selectedRow; -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - selectedRow = null; - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form', - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/DeleteForm', { keyValue: keyValue}, function () { - }); - } - }); - } - }); - }, - initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/GetPageList', - headData: [ - { label: '人员ID', name: 'Id', width: 200, align: "left" }, - { label: '手机号码', name: 'Mobile', width: 200, align: "left" }, - { label: '密码', name: 'Password', width: 200, align: "left" }, - { label: '人员类型（字典）（1学生、2老师、3下乡老师）', name: 'TypeId', width: 200, align: "left" }, - { label: '姓名', name: 'RealName', width: 200, align: "left" }, - { label: '性别(字典)', name: 'SexId', width: 200, align: "left" }, - { label: '年龄', name: 'Age', width: 200, align: "left" }, - { label: '民族', name: 'Nation', width: 200, align: "left" }, - { label: '出生日期', name: 'BirthDate', width: 200, align: "left" }, - { label: '身份证号', name: 'CertNum', width: 200, align: "left" }, - { label: '联系电话', name: 'Phone', width: 200, align: "left" }, - { label: '头像', name: 'PhotoUrl', width: 200, align: "left" }, - { label: '邮箱', name: 'MailBox', width: 200, align: "left" }, - { label: '省份', name: 'Province', width: 200, align: "left" }, - { label: '市', name: 'City', width: 200, align: "left" }, - { label: '县市、区', name: 'Country', width: 200, align: "left" }, - { label: '政治面貌（字典）', name: 'PoliticsFace', width: 200, align: "left" }, - { label: '邮政编码', name: 'ZipCode', width: 200, align: "left" }, - { label: '籍贯', name: 'Origin', width: 200, align: "left" }, - { label: '户口性质（字典）', name: 'OriginId', width: 200, align: "left" }, - { label: '现户籍所在地', name: 'OriginAddress', width: 200, align: "left" }, - { label: '详细地址', name: 'DetailedAddress', width: 200, align: "left" }, - { label: '在籍年份', name: 'SchoolDate', width: 200, align: "left" }, - { label: '状态（字典）（启用、锁定）', name: 'StatusId', width: 200, align: "left" }, - { label: '创建时间', name: 'CreateDate', width: 200, align: "left" }, - { label: '排序串', name: 'LayOrder', width: 200, align: "left" }, - { label: '微信号', name: 'WXNo', width: 200, align: "left" }, - { label: '审核状态1通过，2未审核，3未通过', name: 'AppStatus', width: 200, align: "left" }, - { label: '校区ID', name: 'CampusId', width: 200, align: "left" }, - { label: '数据来源（0、电脑1、安卓2、学生扫老师）', name: 'DataSource', width: 200, align: "left" }, - ], - mainId:'Id', - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - page.search(); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.cshtml deleted file mode 100644 index 68d0e18a7..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.cshtml +++ /dev/null @@ -1,36 +0,0 @@ -@{ - ViewBag.Title = "报名信息"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
- -
-
-  查询 -
-
-
-
- -
-
- @* 新增*@ -  编辑 -  删除 -  审核通过 -  审核不通过 -  关联教师 -  缴费 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.js deleted file mode 100644 index 33c6e4e88..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/OnlineUserInfo/RegistrateIndex.js +++ /dev/null @@ -1,174 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2020-04-17 15:45 - * 描 述：报名信息 - */ -var selectedRow; -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - selectedRow = null; - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form', - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/Form?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/DeleteForm', { keyValue: keyValue }, function () { - }); - } - }); - } - }); - }, - initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/AdmissionsPlatform/OnlineUserInfo/GetPageListOfRegistrate', - headData: [ - { - label: '审核状态', name: 'AppStatus', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'AdmissionsAppStatus', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: '创建时间', name: 'CreateDate', width: 100, align: "left" }, - { label: '姓名', name: 'RealName', width: 100, align: "left" }, - { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, - { - label: '性别', name: 'SexId', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'usersexbit', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, - { label: '民族', name: 'Nation', width: 100, align: "left" }, - { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, - { label: '政治面貌（字典）', name: 'PoliticsFace', width: 100, align: "left" }, - { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, - { label: '户口性质（字典）', name: 'OriginId', width: 100, align: "left" }, - { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, - { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, - { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, - //专业级别？ - { label: '学习形式（字典）:全日制', name: 'YearFormId', width: 100, align: "left" }, - { label: '招生季度（字典）', name: 'QuarterId', width: 100, align: "left" }, - { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, - { label: '班级', name: 'Class', width: 100, align: "left" }, - { label: '工种（字典）', name: 'WorkTypeId', width: 100, align: "left" }, - { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, - { label: '文化程度（字典）', name: 'CultureId', width: 100, align: "left" }, - { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, - { label: '学制（字典）', name: 'LearnLength', width: 100, align: "left" }, - { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, - { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, - { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, - { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, - { label: '是否十万以下民族（字典）:是、否', name: 'IsTenId', width: 100, align: "left" }, - { label: '是否家庭困难（字典）', name: 'IsHardId', width: 100, align: "left" }, - { label: '是否低保（字典）', name: 'IsBasicId', width: 100, align: "left" }, - { label: '收入来源（字典）:务农、工人、职员、教师', name: 'IncomeSourceId', width: 100, align: "left" }, - { - label: '报考校区', name: 'SchoolId', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', - key: value, - keyId: 'f_companyid', - callback: function (_data) { - callback(_data['f_fullname']); - } - }); - } - }, - { - label: '报考专业', name: 'MajorId', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', - key: value, - keyId: 'majorno', - callback: function (_data) { - callback(_data['majorname']); - } - }); - } - }, - { label: '关联老师ID', name: 'UserTeacherId', width: 100, align: "left" }, - { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" }, - - ], - mainId: 'Id', - isPage: true, - sord: 'desc', - sidx: 'CreateDate' - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - page.search(); - }; - page.init(); -} 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 5ddbcdbe1..a8c78b33a 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 @@ -788,11 +788,14 @@ + + + @@ -6796,6 +6799,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoBLL.cs deleted file mode 100644 index 5b093db21..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoBLL.cs +++ /dev/null @@ -1,171 +0,0 @@ -using Learun.Util; -using System; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:56 - /// 描 述：招生学生信息 - /// - public class OnlineStudentInfoBLL : OnlineStudentInfoIBLL - { - private OnlineStudentInfoService onlineStudentInfoService = new OnlineStudentInfoService(); - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - public IEnumerable GetList(string queryJson) - { - try - { - return onlineStudentInfoService.GetList(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - return onlineStudentInfoService.GetPageList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineStudentInfoEntity GetEntity(string keyValue) - { - try - { - return onlineStudentInfoService.GetEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineStudentInfoEntity GetEntityByUserId(string userId) - { - try - { - return onlineStudentInfoService.GetEntityByUserId(userId); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - public void DeleteEntity(string keyValue) - { - try - { - onlineStudentInfoService.DeleteEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveEntity(string keyValue, OnlineStudentInfoEntity entity) - { - try - { - onlineStudentInfoService.SaveEntity(keyValue, entity); - } - 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/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoEntity.cs deleted file mode 100644 index 5f0e0c3f1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoEntity.cs +++ /dev/null @@ -1,314 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform - -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:56 - /// 描 述：招生学生信息 - /// - public class OnlineStudentInfoEntity - { - #region 实体成员 - /// - /// 学生ID - /// - /// - [Column("ID")] - public string Id { get; set; } - /// - /// 人员ID - /// - /// - [Column("USERID")] - public string UserId { get; set; } - /// - /// 学员编号 - /// - /// - [Column("STUDENTNUMBER")] - public string StudentNumber { get; set; } - /// - /// 报考类别（字典） - /// - /// - [Column("EXAMINETYPEID")] - public string ExamineTypeId { get; set; } - /// - /// 考生类别（字典） - /// - /// - [Column("EXAMINEETYPEID")] - public string ExamineeTypeId { get; set; } - /// - /// 考生情况（字典） - /// - /// - [Column("EXAMINEECONDITIONID")] - public string ExamineeConditionId { get; set; } - /// - /// 家庭出生(字典):农民、工人、干部 - /// - /// - [Column("FAMILYBIRTHID")] - public string FamilyBirthId { get; set; } - /// - /// 本人成分（字典） - /// - /// - [Column("ONESELFCOMPONENT")] - public string OneselfComponent { get; set; } - /// - /// 文化程度（字典） - /// - /// - [Column("CULTUREID")] - public string CultureId { get; set; } - /// - /// 婚否（字典） - /// - /// - [Column("MARRIAGEID")] - public string MarriageId { get; set; } - /// - /// 属何种照顾对象 - /// - /// - [Column("WHICHCAREOBJECT")] - public string WhichCareObject { get; set; } - /// - /// 爱好特长 - /// - /// - [Column("HOBBIES")] - public string Hobbies { get; set; } - /// - /// 是否城镇户口 - /// - /// - [Column("ISTOWNID")] - public string IsTownId { get; set; } - /// - /// 现学习或工作单位 - /// - /// - [Column("WORKUNIT")] - public string WorkUnit { get; set; } - /// - /// 任何职务 - /// - /// - [Column("POSTDUTIES")] - public string PostDuties { get; set; } - /// - /// 工种（字典） - /// - /// - [Column("WORKTYPEID")] - public string WorkTypeId { get; set; } - /// - /// 证书编号 - /// - /// - [Column("CERTIFICATENUMBER")] - public string CertificateNumber { get; set; } - /// - /// 何时何地受过何种奖励或处分 - /// - /// - [Column("REWARDORPUNISH")] - public string RewardOrPunish { get; set; } - /// - /// 招生季度（字典） - /// - /// - [Column("QUARTERID")] - public string QuarterId { get; set; } - /// - /// 学习形式（字典）:全日制 - /// - /// - [Column("YEARFORMID")] - public string YearFormId { get; set; } - /// - /// 毕业学校 - /// - /// - [Column("GRADUATESCHOOL")] - public string GraduateSchool { get; set; } - /// - /// 班级 - /// - /// - [Column("CLASS")] - public string Class { get; set; } - /// - /// 银行卡号 - /// - /// - [Column("BANKNUMBER")] - public string BankNumber { get; set; } - /// - /// 学制（字典） - /// - /// - [Column("LEARNLENGTH")] - public string LearnLength { get; set; } - /// - /// 家庭联系人 - /// - /// - [Column("FAMILYLINKMAN")] - public string FamilyLinkman { get; set; } - /// - /// 家庭联系电话 - /// - /// - [Column("FAMILYPHONE")] - public string FamilyPhone { get; set; } - /// - /// 家庭年总收入 - /// - /// - [Column("FAMILYINCOME")] - public decimal? FamilyIncome { get; set; } - /// - /// 家庭人均收入 - /// - /// - [Column("FAMILYFENINCOME")] - public decimal? FamilyFenIncome { get; set; } - /// - /// 是否十万以下民族（字典）:是、否 - /// - /// - [Column("ISTENID")] - public string IsTenId { get; set; } - /// - /// 是否家庭困难（字典） - /// - /// - [Column("ISHARDID")] - public string IsHardId { get; set; } - /// - /// 是否低保（字典） - /// - /// - [Column("ISBASICID")] - public string IsBasicId { get; set; } - /// - /// 收入来源（字典）:务农、工人、职员、教师 - /// - /// - [Column("INCOMESOURCEID")] - public string IncomeSourceId { get; set; } - /// - /// 备注 - /// - /// - [Column("REMARKS")] - public string Remarks { get; set; } - /// - /// 报考校区（字典） - /// - /// - [Column("SCHOOLID")] - public string SchoolId { get; set; } - /// - /// 报考专业 - /// - /// - [Column("MAJORID")] - public string MajorId { get; set; } - /// - /// 关联老师ID - /// - /// - [Column("USERTEACHERID")] - public string UserTeacherId { get; set; } - /// - /// 是否缴费（字典） - /// - /// - [Column("ISPAYMENTID")] - public string IsPaymentId { get; set; } - /// - /// 缴费额度 - /// - /// - [Column("PAYMENTQUOTA")] - public decimal? PaymentQuota { get; set; } - /// - /// 缴费时间 - /// - /// - [Column("PAYMENTDATE")] - public DateTime? PaymentDate { get; set; } - /// - /// 缴费方式（字典）:1现金交费、0网上交费 - /// - /// - [Column("PAYMENTMODE")] - public string PaymentMode { get; set; } - /// - /// 是否报到（字典）:1正常报到，0未报到，2异常报到 - /// - /// - [Column("ISREPORTID")] - public string IsReportId { get; set; } - /// - /// 报名时间 - /// - /// - [Column("ENROLLDATE")] - public DateTime? EnrollDate { get; set; } - /// - /// 报名方式（字典）:1现场报名、0网上报名 - /// - /// - [Column("ENROLLMODE")] - public string EnrollMode { get; set; } - /// - /// 创建时间 - /// - /// - [Column("CREATEDATE")] - public DateTime? CreateDate { get; set; } - /// - /// 身体状况:问卷调查 - /// - /// - [Column("BODYREMARKS")] - public string BodyRemarks { get; set; } - /// - /// 异常报到原因 - /// - /// - [Column("REPORTREASON")] - public string ReportReason { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.Id = Guid.NewGuid().ToString(); - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.Id = keyValue; - } - #endregion - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoIBLL.cs deleted file mode 100644 index 0e8a844d0..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoIBLL.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Learun.Util; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:56 - /// 描 述：招生学生信息 - /// - public interface OnlineStudentInfoIBLL - { - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - IEnumerable GetList(string queryJson); - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - IEnumerable GetPageList(Pagination pagination, string queryJson); - /// - /// 获取实体数据 - /// 主键 - /// - /// - OnlineStudentInfoEntity GetEntity(string keyValue); - /// - /// 获取实体数据 - /// 主键 - /// - /// - OnlineStudentInfoEntity GetEntityByUserId(string userId); - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - void DeleteEntity(string keyValue); - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - void SaveEntity(string keyValue, OnlineStudentInfoEntity entity); - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoService.cs deleted file mode 100644 index d2dae73c0..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineStudentInfo/OnlineStudentInfoService.cs +++ /dev/null @@ -1,249 +0,0 @@ -using Dapper; -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; - -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:56 - /// 描 述：招生学生信息 - /// - public class OnlineStudentInfoService : RepositoryFactory - { - #region 构造函数和属性 - - private string fieldSql; - public OnlineStudentInfoService() - { - fieldSql = @" - t.Id, - t.UserId, - t.StudentNumber, - t.ExamineTypeId, - t.ExamineeTypeId, - t.ExamineeConditionId, - t.FamilyBirthId, - t.OneselfComponent, - t.CultureId, - t.MarriageId, - t.WhichCareObject, - t.Hobbies, - t.IsTownId, - t.WorkUnit, - t.PostDuties, - t.WorkTypeId, - t.CertificateNumber, - t.RewardOrPunish, - t.QuarterId, - t.YearFormId, - t.GraduateSchool, - t.Class, - t.BankNumber, - t.LearnLength, - t.FamilyLinkman, - t.FamilyPhone, - t.FamilyIncome, - t.FamilyFenIncome, - t.IsTenId, - t.IsHardId, - t.IsBasicId, - t.IncomeSourceId, - t.Remarks, - t.SchoolId, - t.UserTeacherId, - t.IsPaymentId, - t.PaymentQuota, - t.PaymentDate, - t.PaymentMode, - t.IsReportId, - t.EnrollDate, - t.EnrollMode, - t.CreateDate, - t.BodyRemarks, - t.ReportReason - "; - } - #endregion - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - public IEnumerable GetList(string queryJson) - { - try - { - //参考写法 - //var queryParam = queryJson.ToJObject(); - // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(fieldSql); - strSql.Append(" FROM OnlineStudentInfo t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(fieldSql); - strSql.Append(" FROM OnlineStudentInfo t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineStudentInfoEntity GetEntity(string keyValue) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineStudentInfoEntity GetEntityByUserId(string userId) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.UserId == userId); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveEntity(string keyValue, OnlineStudentInfoEntity entity) - { - try - { - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); - } - else - { - entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); - } - } - 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/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoBLL.cs deleted file mode 100644 index 896ea4a18..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoBLL.cs +++ /dev/null @@ -1,236 +0,0 @@ -using Learun.Util; -using System; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:45 - /// 描 述：招生人员信息 - /// - public class OnlineUserInfoBLL : OnlineUserInfoIBLL - { - private OnlineUserInfoService onlineUserInfoService = new OnlineUserInfoService(); - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - public IEnumerable GetList(string queryJson) - { - try - { - return onlineUserInfoService.GetList(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - public IEnumerable GetAllList() - { - try - { - return onlineUserInfoService.GetAllList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - return onlineUserInfoService.GetPageList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineUserInfoEntity GetEntity(string keyValue) - { - try - { - return onlineUserInfoService.GetEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - public IEnumerable GetPageListOfRegistrate(Pagination pagination, string queryJson) - { - try - { - return onlineUserInfoService.GetPageListOfRegistrate(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineUserInfoEntity GetEntityByMobile(string mobile) - { - try - { - return onlineUserInfoService.GetEntityByMobile(mobile); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - public void DeleteEntity(string keyValue) - { - try - { - onlineUserInfoService.DeleteEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveEntity(string keyValue, OnlineUserInfoEntity entity) - { - try - { - onlineUserInfoService.SaveEntity(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveOnlineRegistrate(OnlineUserInfoEntity entity) - { - try - { - onlineUserInfoService.SaveOnlineRegistrate(entity); - } - 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/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoEntity.cs deleted file mode 100644 index f67dbda95..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoEntity.cs +++ /dev/null @@ -1,358 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform - -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:45 - /// 描 述：招生人员信息 - /// - public class OnlineUserInfoEntity - { - #region 实体成员 - /// - /// 人员ID - /// - /// - [Column("ID")] - public string Id { get; set; } - /// - /// 手机号码 - /// - /// - [Column("MOBILE")] - public string Mobile { get; set; } - /// - /// 密码 - /// - /// - [Column("PASSWORD")] - public string Password { get; set; } - /// - /// 人员类型（字典）（1学生、2老师、3下乡老师） - /// - /// - [Column("TYPEID")] - public string TypeId { get; set; } - /// - /// 姓名 - /// - /// - [Column("REALNAME")] - public string RealName { get; set; } - /// - /// 性别(字典) - /// - /// - [Column("SEXID")] - public string SexId { get; set; } - /// - /// 年龄 - /// - /// - [Column("AGE")] - public int? Age { get; set; } - /// - /// 民族 - /// - /// - [Column("NATION")] - public string Nation { get; set; } - /// - /// 出生日期 - /// - /// - [Column("BIRTHDATE")] - public DateTime? BirthDate { get; set; } - /// - /// 身份证号 - /// - /// - [Column("CERTNUM")] - public string CertNum { get; set; } - /// - /// 联系电话 - /// - /// - [Column("PHONE")] - public string Phone { get; set; } - /// - /// 头像 - /// - /// - [Column("PHOTOURL")] - public string PhotoUrl { get; set; } - /// - /// 邮箱 - /// - /// - [Column("MAILBOX")] - public string MailBox { get; set; } - /// - /// 省份 - /// - /// - [Column("PROVINCE")] - public string Province { get; set; } - /// - /// 市 - /// - /// - [Column("CITY")] - public string City { get; set; } - /// - /// 县市、区 - /// - /// - [Column("COUNTRY")] - public string Country { get; set; } - /// - /// 政治面貌（字典） - /// - /// - [Column("POLITICSFACE")] - public string PoliticsFace { get; set; } - /// - /// 邮政编码 - /// - /// - [Column("ZIPCODE")] - public string ZipCode { get; set; } - /// - /// 籍贯 - /// - /// - [Column("ORIGIN")] - public string Origin { get; set; } - /// - /// 户口性质（字典） - /// - /// - [Column("ORIGINID")] - public string OriginId { get; set; } - /// - /// 现户籍所在地 - /// - /// - [Column("ORIGINADDRESS")] - public string OriginAddress { get; set; } - /// - /// 详细地址 - /// - /// - [Column("DETAILEDADDRESS")] - public string DetailedAddress { get; set; } - /// - /// 在籍年份 - /// - /// - [Column("SCHOOLDATE")] - public DateTime? SchoolDate { get; set; } - /// - /// 状态（字典）（启用、锁定） - /// - /// - [Column("STATUSID")] - public string StatusId { get; set; } - /// - /// 创建时间 - /// - /// - [Column("CREATEDATE")] - public DateTime? CreateDate { get; set; } - /// - /// 排序串 - /// - /// - [Column("LAYORDER")] - public string LayOrder { get; set; } - /// - /// 微信号 - /// - /// - [Column("WXNO")] - public string WXNo { get; set; } - /// - /// 审核状态0未审核，1通过，2未通过 - /// - /// - [Column("APPSTATUS")] - public string AppStatus { get; set; } - /// - /// 校区ID - /// - /// - [Column("CAMPUSID")] - public string CampusId { get; set; } - /// - /// 数据来源（0、电脑1、安卓2、学生扫老师） - /// - /// - [Column("DATASOURCE")] - public string DataSource { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.Id = Guid.NewGuid().ToString(); - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.Id = keyValue; - } - #endregion - #region 扩展数据 - /// - /// 文化程度（字典） - /// - /// - [NotMapped] - public string CultureId { get; set; } - /// - /// 爱好特长 - /// - /// - [NotMapped] - public string Hobbies { get; set; } - /// - /// 工种（字典） - /// - /// - [NotMapped] - public string WorkTypeId { get; set; } - /// - /// 招生季度（字典） - /// - /// - [NotMapped] - public string QuarterId { get; set; } - /// - /// 学习形式（字典）:全日制 - /// - /// - [NotMapped] - public string YearFormId { get; set; } - /// - /// 毕业学校 - /// - /// - [NotMapped] - public string GraduateSchool { get; set; } - /// - /// 班级 - /// - /// - [NotMapped] - public string Class { get; set; } - /// - /// 银行卡号 - /// - /// - [NotMapped] - public string BankNumber { get; set; } - /// - /// 学制（字典） - /// - /// - [NotMapped] - public string LearnLength { get; set; } - /// - /// 家庭联系人 - /// - /// - [NotMapped] - public string FamilyLinkman { get; set; } - /// - /// 家庭联系电话 - /// - /// - [NotMapped] - public string FamilyPhone { get; set; } - /// - /// 家庭年总收入 - /// - /// - [NotMapped] - public decimal? FamilyIncome { get; set; } - /// - /// 家庭人均收入 - /// - /// - [NotMapped] - public decimal? FamilyFenIncome { get; set; } - /// - /// 是否十万以下民族（字典）:是、否 - /// - /// - [NotMapped] - public string IsTenId { get; set; } - /// - /// 是否家庭困难（字典） - /// - /// - [NotMapped] - public string IsHardId { get; set; } - /// - /// 是否低保（字典） - /// - /// - [NotMapped] - public string IsBasicId { get; set; } - /// - /// 收入来源（字典）:务农、工人、职员、教师 - /// - /// - [NotMapped] - public string IncomeSourceId { get; set; } - /// - /// 关联老师ID - /// - /// - [NotMapped] - public string UserTeacherId { get; set; } - /// - /// 缴费额度 - /// - /// - [NotMapped] - public decimal? PaymentQuota { get; set; } - /// - /// 报考校区（字典） - /// - /// - [NotMapped] - public string SchoolId { get; set; } - /// - /// 报考专业 - /// - /// - [NotMapped] - public string MajorId { get; set; } - /// - /// 报考校区名称 - /// - /// - [NotMapped] - public string SchoolName { get; set; } - /// - /// 报考专业名称 - /// - /// - [NotMapped] - public string MajorName { get; set; } - #endregion - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoIBLL.cs deleted file mode 100644 index ae5e49dbc..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoIBLL.cs +++ /dev/null @@ -1,76 +0,0 @@ -using Learun.Util; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:45 - /// 描 述：招生人员信息 - /// - public interface OnlineUserInfoIBLL - { - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - IEnumerable GetList(string queryJson); - IEnumerable GetAllList(); - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - IEnumerable GetPageList(Pagination pagination, string queryJson); - /// - /// 获取实体数据 - /// 主键 - /// - /// - OnlineUserInfoEntity GetEntity(string keyValue); - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - IEnumerable GetPageListOfRegistrate(Pagination pagination, string queryJson); - - /// - /// 获取实体数据 - /// 主键 - /// - /// - OnlineUserInfoEntity GetEntityByMobile(string mobile); - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - void DeleteEntity(string keyValue); - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - void SaveEntity(string keyValue, OnlineUserInfoEntity entity); - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - void SaveOnlineRegistrate(OnlineUserInfoEntity entity); - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoService.cs deleted file mode 100644 index f7822c314..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/OnlineUserInfo/OnlineUserInfoService.cs +++ /dev/null @@ -1,334 +0,0 @@ -using Dapper; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; - -namespace Learun.Application.TwoDevelopment.AdmissionsPlatform -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2020-04-17 15:45 - /// 描 述：招生人员信息 - /// - public class OnlineUserInfoService : RepositoryFactory - { - #region 构造函数和属性 - - private string fieldSql; - public OnlineUserInfoService() - { - fieldSql = @" - t.Id, - t.Mobile, - t.Password, - t.TypeId, - t.RealName, - t.SexId, - t.Age, - t.Nation, - t.BirthDate, - t.CertNum, - t.Phone, - t.PhotoUrl, - t.MailBox, - t.Province, - t.City, - t.Country, - t.PoliticsFace, - t.ZipCode, - t.Origin, - t.OriginId, - t.OriginAddress, - t.DetailedAddress, - t.SchoolDate, - t.StatusId, - t.CreateDate, - t.LayOrder, - t.WXNo, - t.AppStatus, - t.CampusId, - t.DataSource - "; - } - #endregion - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - public IEnumerable GetList(string queryJson) - { - try - { - //参考写法 - //var queryParam = queryJson.ToJObject(); - // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(fieldSql); - strSql.Append(" FROM OnlineUserInfo t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - public IEnumerable GetAllList() - { - try - { - return this.BaseRepository("CollegeMIS").FindList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(fieldSql); - strSql.Append(" FROM OnlineUserInfo t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineUserInfoEntity GetEntity(string keyValue) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - public IEnumerable GetPageListOfRegistrate(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT t.*,s.CultureId,s.Hobbies,s.WorkTypeId,s.QuarterId,s.YearFormId,s.GraduateSchool,s.Class,s.BankNumber,s.LearnLength,s.FamilyLinkman,s.FamilyPhone,s.FamilyIncome,s.FamilyFenIncome,s.IsTenId,s.IsHardId,s.IsBasicId,s.IncomeSourceId,s.UserTeacherId,s.PaymentQuota,s.SchoolId,s.MajorId "); - strSql.Append(" FROM OnlineUserInfo t "); - strSql.Append(" left join OnlineStudentInfo s on t.Id=s.UserId "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取实体数据 - /// 主键 - /// - /// - public OnlineUserInfoEntity GetEntityByMobile(string mobile) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.Mobile == mobile); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveEntity(string keyValue, OnlineUserInfoEntity entity) - { - try - { - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); - } - else - { - entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveOnlineRegistrate(OnlineUserInfoEntity entity) - { - var db = this.BaseRepository("CollegeMIS").BeginTrans(); - try - { - if (entity != null) - { - var now = DateTime.Now; - //招生人员信息表 - entity.Id = Guid.NewGuid().ToString(); - entity.Password = "123456"; - entity.TypeId = "1"; - entity.CreateDate = now; - entity.AppStatus = "0"; - entity.CampusId = db.FindEntity(x => x.MajorNo == entity.MajorId)?.F_SchoolId; - entity.DataSource = "0"; - db.Insert(entity); - //招生学生信息表 - var onlineStudentInfo = new OnlineStudentInfoEntity() - { - Id = Guid.NewGuid().ToString(), - UserId = entity.Id, - SchoolId = entity.CampusId, - MajorId = entity.MajorId, - EnrollDate = now, - EnrollMode = "0", - CreateDate = now, - }; - db.Insert(onlineStudentInfo); - } - - db.Commit(); - } - catch (Exception ex) - { - db.Rollback(); - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - - #endregion - - } -} From fc34574e5b6c969c4908f6161ed30c8cf006e437 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 22 Sep 2020 10:02:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A6=96=E9=A1=B5=EF=BC=8C=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E7=99=BB=E5=BD=95=E5=90=8E=E4=B8=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../www/config/config.js | 16 ++++++++-------- .../www/pages/workspace/workspace.html | 11 +++++------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js index 1a239a386..bbf9d244a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js @@ -1,15 +1,15 @@ -//var config = { -// webapi: 'http://localhost:8088/', -// web: "http://localhost:8087/"//web地址，用于配置logo -//}; +var config = { + webapi: 'http://localhost:8088/', + web: "http://localhost:8087/"//web地址，用于配置logo +}; //var config = { // webapi: 'http://112.230.201.53:31173/', // web:"http://112.230.201.53/:8081/"//web地址，用于配置logo //}; -var config = { - webapi: 'http://localhost:31173/', - web: "http://localhost:20472/"//web地址，用于配置logo -}; +//var config = { +// webapi: 'http://localhost:31173/', +// web: "http://localhost:20472/"//web地址，用于配置logo +//}; //var config = { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html index 78bd7d467..eaa8a1390 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html @@ -46,7 +46,6 @@ $desktop.append(_html); learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) { - console.log(data); if (data) { var $list = $('[data-desktop="' + data.Id + '"]'); //待办 @@ -202,11 +201,11 @@ var $desktop = $('#lr_desktop_msg_content'); $desktop.html(''); var logininfo = learun.storage.get('userinfo'); - //if (logininfo.baseinfo.Description != "学生") { - // target(data.target || [], $desktop); - // chart(data.chart || [], $desktop); - //} - list(data.list || [], $desktop); + if (logininfo.baseinfo.Description != "学生") { + //target(data.target || [], $desktop); + //chart(data.chart || [], $desktop); + list(data.list || [], $desktop); + } if (self) { self.refresh(true); From f284727d8ebfeea53ed9212a797222eebf7a02b6 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Tue, 22 Sep 2020 11:44:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1=E3=80=81=E6=B5=81=E7=A8=8B=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=B8=AD=E4=B8=8D=E5=90=8C=E6=84=8F=E5=90=8E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=BB=88=E6=AD=A2=EF=BC=8C=E7=8A=B6=E6=80=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E2=80=9C=E4=B8=AD=E6=AD=A2=E2=80=9D=202?= =?UTF-8?q?=E3=80=81=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E5=8A=A0=E7=AD=BE=E5=90=8E=E5=8A=A0=E7=AD=BE?= =?UTF-8?q?=E4=BA=BA=E5=A6=82=E6=B2=A1=E6=9C=89=E5=81=9A=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C=EF=BC=8C=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=92=A4=E9=94=80=E5=AE=A1=E6=A0=B8=203=E3=80=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E6=92=A4=E9=94=80=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=8C=89=E9=94=AE=E5=9C=A8=E5=90=8E=E9=9D=A2=E7=9A=84=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E4=BD=9C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Sys_ReceiveFileController.cs | 25 + .../Controllers/Sys_SendFileController.cs | 82 ++-- .../Views/Sys_ReceiveFile/Index.cshtml | 1 + .../Views/Sys_ReceiveFile/Index.js | 40 ++ .../SpecifyReceiverForm.cshtml | 11 + .../Sys_ReceiveFile/SpecifyReceiverForm.js | 54 +++ .../Views/Sys_SendFile/Form.cshtml | 24 +- .../Views/Sys_SendFile/Form.js | 194 +------- .../Views/Sys_SendFile/FormView.cshtml | 20 +- .../Views/Sys_SendFile/FormView.js | 32 +- .../Views/Sys_SendFile/Index.cshtml | 2 + .../Views/Sys_SendFile/Index.js | 86 +++- .../Views/Sys_SendFile/IssueForm.cshtml | 11 + .../Views/Sys_SendFile/IssueForm.js | 96 ++++ .../Views/Sys_SendFile/ReadList.cshtml | 1 + .../Views/Sys_SendFile/ReadList.js | 68 +++ .../Views/NWFProcess/Index.cshtml | 2 +- .../LR_NewWorkFlow/Views/NWFProcess/Index.js | 11 +- .../Views/User/SelectForm.js | 26 +- .../Views/ADR_Record/Report - 副本.mrt | 447 ++++++++++++++++++ .../plugin/formselect/lr-formselect.js | 5 + .../LR_Content/plugin/select/lr-select.js | 38 ++ .../Views/LR_Content/script/lr-clientdata.js | 15 +- .../Sys_ReceiveFile/Sys_IssueEntity.cs | 22 + .../Sys_ReceiveFile/Sys_ReceiveFileBLL.cs | 19 + .../Sys_ReceiveFile/Sys_ReceiveFileEntity.cs | 10 + .../Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs | 1 + .../Sys_ReceiveFile/Sys_ReceiveFileService.cs | 148 +++++- .../Sys_SendFile/Sys_SendFileBLL.cs | 19 + .../Sys_SendFile/Sys_SendFileEntity.cs | 11 +- .../Sys_SendFile/Sys_SendFileIBLL.cs | 1 + .../Sys_SendFile/Sys_SendFileService.cs | 190 ++------ .../Learun.Application.TwoDevelopment.csproj | 1 + .../Process/NWFProcessBLL.cs | 12 +- .../Process/NWFProcessEntity.cs | 13 +- .../Process/NWFProcessSerivce.cs | 16 +- .../Learun.Workflow.Engine/NWFEngine.cs | 155 +++--- .../Learun.Workflow.Engine/NWFIEngine.cs | 4 +- .../LearunApp-2.2.0/config.js | 2 +- .../LearunApp-2.2.0/pages/login.vue | 8 +- 40 files changed, 1409 insertions(+), 514 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Report - 副本.mrt create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_IssueEntity.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs index b316f1970..5c4796165 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs @@ -44,6 +44,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } /// + /// 指定接收人表单页 + /// + /// + [HttpGet] + public ActionResult SpecifyReceiverForm() + { + return View(); + } + /// /// 主页面【党政公文查阅】 /// /// @@ -211,6 +220,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_ReceiveFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult Issue(string strEntity) + { + Sys_IssueEntity entity = strEntity.ToObject(); + sys_ReceiveFileIBLL.Issue(entity); + return Success("保存成功！"); + } /// /// 查看实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs index 57bae9ebb..18a363eee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs @@ -30,12 +30,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } [HttpGet] public ActionResult IndexDocument() { - return View(); + return View(); + } + + /// + /// 公文下发表单页 + /// + /// + [HttpGet] + public ActionResult IssueForm() + { + return View(); } /// /// 主页面【党政公文下发】 @@ -49,7 +59,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormDocument() { - return View(); + return View(); } /// /// 表单页 @@ -58,7 +68,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } /// /// 表单页【党政公文下发】 @@ -73,13 +83,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormView() { - return View(); + return View(); } [HttpGet] public ActionResult FormDocumentView() { - return View(); + return View(); } /// /// 【党政公文下发】 @@ -93,7 +103,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult ReadList() { - return View(); + return View(); } [HttpGet] @@ -124,7 +134,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetPageList(string pagination, string queryJson) { Pagination paginationobj = pagination.ToObject(); - var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m=>m.STypeId==1); + var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1); var jsonData = new { rows = data, @@ -172,9 +182,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Sys_SendFileData = sys_SendFileIBLL.GetSys_SendFileEntity( keyValue ); + var Sys_SendFileData = sys_SendFileIBLL.GetSys_SendFileEntity(keyValue); Sys_SendFileData.Contents = HttpUtility.HtmlDecode(Sys_SendFileData.Contents); - var jsonData = new { + var jsonData = new + { Sys_SendFile = Sys_SendFileData, }; return Success(jsonData); @@ -199,8 +210,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormDataByProcessId(string processId) { - var Sys_SendFileData = sys_SendFileIBLL.GetEntityByProcessId( processId ); - var jsonData = new { + var Sys_SendFileData = sys_SendFileIBLL.GetEntityByProcessId(processId); + var jsonData = new + { Sys_SendFile = Sys_SendFileData, }; return Success(jsonData); @@ -233,12 +245,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Sys_SendFileEntity entity = strEntity.ToObject(); - entity.DelFlag = false; - entity.SendFlag = 0; - entity.SenderId = LoginUserInfo.Get().userId; - entity.Sender = LoginUserInfo.Get().realName; - entity.STypeId = 1; - sys_SendFileIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + entity.STypeId = 1; + } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } @@ -249,12 +260,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult SaveFormDocument(string keyValue, string strEntity) { Sys_SendFileEntity entity = strEntity.ToObject(); - entity.DelFlag = false; - entity.SendFlag = 0; - entity.SenderId = LoginUserInfo.Get().userId; - entity.Sender = LoginUserInfo.Get().realName; - entity.STypeId = 2; - sys_SendFileIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + entity.STypeId = 2; + } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } @@ -265,11 +275,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult SaveFormParty(string keyValue, string strEntity) { Sys_SendFileEntity entity = strEntity.ToObject(); - entity.DelFlag = false; - entity.SendFlag = 0; - entity.SenderId = LoginUserInfo.Get().userId; - entity.Sender = LoginUserInfo.Get().realName; - entity.STypeId = 3; + if (string.IsNullOrEmpty(keyValue)) + { + entity.STypeId = 3; + } sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } @@ -291,9 +300,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { string guid = Guid.NewGuid().ToString(); sys_SendFileIBLL.ChangeStatusById(keyValue, 2, guid); - sys_SendFileIBLL.ChangeStatusByProcessId(guid,2); + sys_SendFileIBLL.ChangeStatusByProcessId(guid, 2); return Success("操作成功！"); } + /// + /// 结束下发 + /// + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult OverIssue(string keyValue) + { + string guid = Guid.NewGuid().ToString(); + sys_SendFileIBLL.OverIssue(keyValue); + return Success("下发成功！"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.cshtml index aae1d0c75..e301eccc8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.cshtml @@ -27,6 +27,7 @@
 查阅 +  指定接收人  删除
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js index 9b69ce514..369dd4cdc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js @@ -79,6 +79,22 @@ var bootstrap = function ($, learun) { }); } }); + // 指定接收人 + $('#lr_SpecifyReceiver').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('RFileId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formSys_ReceiveFile', + title: '指定接收人', + url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SpecifyReceiverForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); // 删除 $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('RFileId'); @@ -152,6 +168,30 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync: + function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', + { + key: value, + callback: function (_data) { + if (_data.length > 0) { + var text = ''; + $.each(_data, + function (i, item) { + if (item) { + text += item.name + ','; + } + }); + text = text.substring(0, text.lastIndexOf(',')); + callback(text); + } else { + callback(_data.name); + } + } + }); + } + }, { label: "状态", name: "ReadFlag", width: 100, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.cshtml new file mode 100644 index 000000000..d656e62b9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.cshtml @@ -0,0 +1,11 @@ +@{ + ViewBag.Title = "公文收发"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
发送人
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js new file mode 100644 index 000000000..d71673043 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/SpecifyReceiverForm.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-11 10:08 + * 描 述：公文收发 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#SpecifyReceiver').lrUserSelect({ type: '1' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/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]); + $('#Contents').html(data[id].Contents); + } + } + $("#lrUploader_uploadBtn_Url").hide(); + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml index 13f1a5593..b266ec6c7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.cshtml @@ -7,26 +7,14 @@
主题*
-
-
接收对象*
-
+ @*
+
已接收人*
+
-
接收人*
-
-
-
-
接收部门*
-
-
-
-
接收岗位*
-
-
-
-
接收校区*
-
-
+
未接收人*
+
+
*@
文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js index 87802f8ab..1985e9447 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js @@ -26,70 +26,8 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#CompanyId').lrCompanySelect({ type: 'multiple' }); - $('#DeptId').lrDepartmentSelect({ type: 'treemultiple' }); - $('#PostId').lrPostSelect({ type: 'treemultiple' }); - $('#ReceiverUserId').lrUserSelect({ type: '1' }); - $('#SendType').lrDataItemSelect({ - code: 'FileSendType', select: function (item) { - if (item != null && item != undefined) { - if (item.id === 1 || item.id === "1") { - $("#CompanyIddiv").show(); - $("#CompanyId").attr("isvalid", "yes"); - $("#CompanyId").attr("checkexpession", "NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - } else if (item.id === 2 || item.id === "2") { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").show(); - $("#DeptId").attr("isvalid", "yes"); - $("#DeptId").attr("checkexpession", "NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - } else if (item.id === 3 || item.id === "3") { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").show(); - $("#PostId").attr("isvalid", "yes"); - $("#PostId").attr("checkexpession", "NotNull"); - } else { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").show(); - $("#ReceiverUserId").attr("isvalid", "yes"); - $("#ReceiverUserId").attr("checkexpession", "NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - } - } - } - }); - $('#SendType').lrselectSet("1"); + //$('#ReceiverId').lrUserSelect({ type: '1' }); + //$('#NoReceiver').lrUserSelect({ type: '1' }); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; @@ -103,63 +41,6 @@ var bootstrap = function ($, learun) { } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); - if (data[id].SendType === 1 || data[id].SendType == "1") { - $("#CompanyIddiv").show(); - $("#CompanyId").attr("isvalid", "yes"); - $("#CompanyId").attr("checkexpession", "NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - $("#CompanyId").lrselectSet(data[id].ReceiverId); - } else if (data[id].SendType === 2 || data[id].SendType == "2") { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").show(); - $("#DeptId").attr("isvalid", "yes"); - $("#DeptId").attr("checkexpession", "NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - $("#DeptId").lrselectSet(data[id].ReceiverId); - } else if (data[id].SendType === 3 || data[id].SendType === "3") { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").show(); - $("#PostId").attr("isvalid", "yes"); - $("#PostId").attr("checkexpession", "NotNull"); - $("#PostId").lrselectSet(data[id].ReceiverId); - } else { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").show(); - $("#ReceiverUserId").attr("isvalid", "yes"); - $("#ReceiverUserId").attr("checkexpession", "NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId); - } } } @@ -180,63 +61,6 @@ var bootstrap = function ($, learun) { keyValue = data[id].SFileId; } $('[data-table="' + id + '"]').lrSetFormData(data[id]); - if (data[id].SendType === 1 || data[id].SendType == "1") { - $("#CompanyIddiv").show(); - $("#CompanyId").attr("isvalid", "yes"); - $("#CompanyId").attr("checkexpession", "NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - $("#CompanyId").lrselectSet(data[id].ReceiverId); - } else if (data[id].SendType === 2 || data[id].SendType == "2") { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").show(); - $("#DeptId").attr("isvalid", "yes"); - $("#DeptId").attr("checkexpession", "NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - $("#DeptId").lrselectSet(data[id].ReceiverId); - } else if (data[id].SendType === 3 || data[id].SendType === "3") { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").hide(); - $("#ReceiverUserId").removeAttr("isvalid"); - $("#ReceiverUserId").removeAttr("NotNull"); - $("#PostIddiv").show(); - $("#PostId").attr("isvalid", "yes"); - $("#PostId").attr("checkexpession", "NotNull"); - $("#PostId").lrselectSet(data[id].ReceiverId); - } else { - $("#CompanyIddiv").hide(); - $("#CompanyId").removeAttr("isvalid"); - $("#CompanyId").removeAttr("NotNull"); - $("#DeptIddiv").hide(); - $("#DeptId").removeAttr("isvalid"); - $("#DeptId").removeAttr("NotNull"); - $("#ReceiverIddiv").show(); - $("#ReceiverUserId").attr("isvalid", "yes"); - $("#ReceiverUserId").attr("checkexpession", "NotNull"); - $("#PostIddiv").hide(); - $("#PostId").removeAttr("isvalid"); - $("#PostId").removeAttr("NotNull"); - $("#ReceiverUserId").lrformselectSet(data[id].ReceiverId); - } } } }); @@ -252,20 +76,6 @@ var bootstrap = function ($, learun) { // 保存数据 save = function (processId, callBack, i) { var formData = $('body').lrGetFormData(); - var sendtype = $('#SendType').lrselectGet(); - if (sendtype == "1") { - formData.ReceiverId = $("#CompanyId").lrselectGet(); - formData.Receiver = $("#CompanyId").find(".lr-select-placeholder").text(); - } else if (sendtype == "2") { - formData.ReceiverId = $("#DeptId").lrselectGet(); - formData.Receiver = $("#DeptId").find(".lr-select-placeholder").text(); - } else if (sendtype == "3") { - formData.ReceiverId = $("#PostId").lrselectGet(); - formData.Receiver = $("#PostId").find(".lr-select-placeholder").text(); - } else { - formData.ReceiverId = $("#ReceiverUserId").lrformselectGet(); - formData.Receiver = $("#ReceiverUserId").find("span").text(); - } if (!!processId) { formData.SProcessId = processId; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml index ca4b9104c..26af0a108 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml @@ -3,23 +3,19 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
主题*
- +
-
-
接收对象*
-
+
+
指定接收人*
+
-
-
接收人*
- -
-
+
文件
-
+
-
+
正文
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js index ea89c279c..4e116d05f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js @@ -27,9 +27,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#SendType').lrDataItemSelect({ - code: 'FileSendType' - }); + $('#SpecifyReceiver').lrUserSelect({ type: '1' }); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; @@ -44,7 +42,7 @@ var bootstrap = function ($, learun) { else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); $("#lrUploader_uploadBtn_Url").hide(); - // $('#Contents').html(data[id].Contents); + // $('#Contents').html(data[id].Contents); } } }); @@ -52,7 +50,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId,param,callback) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -70,7 +68,7 @@ var bootstrap = function ($, learun) { } }); } - callback && callback(); + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -81,13 +79,21 @@ var bootstrap = function ($, learun) { }; // 保存数据 save = function (processId, callBack, i) { - var formData = {}; - var res = {}; - res.code = 200; - if (!!processId) { - formData.SProcessId = processId; - } - callBack(res, i); + + var formData = $('body').lrGetFormData(); + var postData = { + strEntity: JSON.stringify(formData) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(res, i); + } + }); + + + + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml index 820e37035..18adff4de 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml @@ -30,6 +30,8 @@
  提交   查看 +  下发审批指定接收人 +  结束下发   查阅情况
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index eb523302a..2a3ddd474 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -138,6 +138,52 @@ var bootstrap = function ($, learun) { }); } }); + + // 下发审批指定接收人 + $('#lr_IssueSpecifyReceiver').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '下发审批指定接收人', + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&specifyReceiver=' + specifyReceiver, + width: 800, + height: 200, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + }); + // 结束 + $('#lr_OverIssue').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + if (learun.checkrow(keyValue)) { + var SendFlag = $('#gridtable').jfGridValue('SendFlag'); + if (SendFlag !== 2) { + learun.alert.warning("当前公文未审批通过，请耐心等待审批！"); + return; + } + learun.layerConfirm('是否结束下发！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -146,19 +192,31 @@ var bootstrap = function ($, learun) { headData: [ { label: "主题", name: "Title", width: 300, align: "left" }, { - label: "接收对象", name: "SendType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'FileSendType', - callback: function (_data) { - callback(_data.text); - } - }); - } + label: "已接收", name: "Receiver", width: 300, align: "left" }, { - label: "接收人", name: "Receiver", width: 300, align: "left" + label: "审批指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync: + function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', + { + key: value, + callback: function (_data) { + if (_data.length > 0) { + var text = ''; + $.each(_data, + function (i, item) { + if (item) { + text += item.name + ','; + } + }); + text = text.substring(0, text.lastIndexOf(',')); + callback(text); + } else { + callback(_data.name); + } + } + }); + } }, { label: "下发人", name: "Sender", width: 100, align: "left" @@ -172,7 +230,11 @@ var bootstrap = function ($, learun) { if (cellvalue === 1) { return '审批中'; } else if (cellvalue === 2) { - return '已下发'; + return '审批通过'; + } else if (cellvalue === 3) { + return '审批失败'; + } else if (cellvalue === 4) { + return '下发完毕'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml new file mode 100644 index 000000000..4354f033a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml @@ -0,0 +1,11 @@ +@{ + ViewBag.Title = "公文发送"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
接收人*
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js new file mode 100644 index 000000000..885d83209 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js @@ -0,0 +1,96 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-11 10:31 + * 描 述：公文发送 + */ +var acceptClick; +var keyValue = request('keyValue'); +var rFileId = request('rFileId'); +var specifyReceiver = request('specifyReceiver'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; +var bootstrap = function ($, learun) { + "use strict"; + // 设置权限 + setAuthorize = function (data) { + }; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#SpecifyReceiver').lrUserSelect({ type: '1' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + if (rFileId) { + $('#SpecifyReceiver').lrformselectSet(specifyReceiver); + } else { + + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + + } + } + + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + if (id == 'Sys_SendFile') { + keyValue = data[id].SFileId; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + // 验证数据是否填写完整 + validForm = function () { + if (!$('#form').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = $('body').lrGetFormData(); + formData.RFileId = rFileId; + formData.SFileId = keyValue; + var postData = { + strEntity: JSON.stringify(formData) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Issue', postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(res, formData, i); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml index 8442521e0..7321389a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml @@ -17,6 +17,7 @@
+  下发
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js index da100e6ee..4f2f9e528 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js @@ -24,6 +24,40 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + + $('#lr_Issue').on('click', + function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + var rFileId = $('#gridtable').jfGridValue('RFileId'); + var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver'); + if (learun.checkrow(rFileId)) { + var SendStatus = $('#gridtable').jfGridValue('SendStatus'); + if (SendStatus) { + learun.alert.warning("已下发！"); + return; + } + learun.layerForm({ + id: 'formIssue', + title: '下发', + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&rFileId=' + rFileId + '&specifyReceiver=' + specifyReceiver, + width: 500, + height: 500, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + + }); }, // 初始化列表 initGird: function () { @@ -36,6 +70,30 @@ var bootstrap = function ($, learun) { { label: "查阅时间", name: "ReadTime", width: 150, align: "left" }, + { + label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync: + function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', + { + key: value, + callback: function (_data) { + if (_data.length > 0) { + var text = ''; + $.each(_data, + function (i, item) { + if (item) { + text += item.name + ','; + } + }); + text = text.substring(0, text.lastIndexOf(',')); + callback(text); + } else { + callback(_data.name); + } + } + }); + } + }, { label: "状态", name: "ReadFlag", width: 100, align: "left", formatter: function (cellvalue, row) { @@ -45,6 +103,16 @@ var bootstrap = function ($, learun) { return '未读'; } } + }, + { + label: "下发状态", name: "SendStatus", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue === true) { + return '已下发'; + } else { + return '未下发'; + } + } } ], mainId: 'RFileId', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.cshtml index d9c93f669..03657cc84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.cshtml @@ -9,7 +9,7 @@
  • 待办任务
  • 已办任务
    • -
  • 我的流程
    • +
  • 我的流程
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js index 555b364ec..1d42e49d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js @@ -252,7 +252,7 @@ var bootstrap = function ($, learun) { } - if (categoryId == '3' && row.F_TaskType == 1 && row.F_IsFinished == 0) {// 已完成任务，添加一个撤销按钮 + if (categoryId == '3' && row.F_TaskType == 1 && row.F_IsFinished == 0 && !row.NextNodeIsAudited) {// 已完成任务，添加一个撤销按钮 cellvalue = '撤销审核' + cellvalue; $cell.on('click', '.revoke2', function () {// 删除 @@ -324,12 +324,17 @@ var bootstrap = function ($, learun) { return "运行中"; } else if (cellvalue == 2) { return "草稿"; - } else { + } + else { return "作废"; } } else { - return "结束"; + if (cellvalue == 4) { + return "终止"; + } else { + return "结束"; + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/SelectForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/SelectForm.js index 268ba71f2..6a8274788 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/SelectForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/SelectForm.js @@ -7,6 +7,9 @@ */ var dfopid = request('dfopid'); var selectValue = request('selectValue'); +if (selectValue == "null") { + selectValue = null; +} var acceptClick; var bootstrap = function ($, learun) { @@ -45,7 +48,7 @@ var bootstrap = function ($, learun) { $warp.append($cardbox); learun.clientdata.getAsync('department', { key: item.F_DepartmentId, - callback: function (_data,op) { + callback: function (_data, op) { $warp.find('[data-id="' + op.key + '"]').text(_data.name); } }); @@ -82,8 +85,7 @@ var bootstrap = function ($, learun) { $('#user_list').find('[data-value="' + userid + '"]').removeClass('active'); } }); - if (!!selectValue) - { + if (!!selectValue) { learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetEntityListByUserIds', { keyValue: selectValue }, function (data) { if (!!data) { $.each(data, function (id, item) { @@ -100,13 +102,13 @@ var bootstrap = function ($, learun) { $warp.append($(_html)); learun.clientdata.getAsync('department', { key: item.F_DepartmentId, - callback: function (_data,op) { + callback: function (_data, op) { $warp.find('[data-id="' + op.key + '"]').text(_data.name); } }); learun.clientdata.getAsync('company', { key: item.F_CompanyId, - callback: function (_data,op) { + callback: function (_data, op) { $warp.find('[data-id="' + op.key + '"]').text(_data.name); } }); @@ -114,7 +116,7 @@ var bootstrap = function ($, learun) { } }); } - + }; function addUser(useritem) { var $warp = $('#selected_user_list'); @@ -126,13 +128,13 @@ var bootstrap = function ($, learun) { $warp.append(_html); learun.clientdata.getAsync('department', { key: useritem.F_DepartmentId, - callback: function (_data,op) { + callback: function (_data, op) { $warp.find('[data-id="' + op.key + '"]').text(_data.name); } }); learun.clientdata.getAsync('company', { key: useritem.F_CompanyId, - callback: function (_data,op) { + callback: function (_data, op) { $warp.find('[data-id="' + op.key + '"]').text(_data.name); } }); @@ -172,7 +174,7 @@ var bootstrap = function ($, learun) { $('#department_tree').lrtreeSet('refresh', { url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', // 访问数据接口参数 - param: { companyId: companyId}, + param: { companyId: companyId }, }); }); @@ -198,7 +200,7 @@ var bootstrap = function ($, learun) { } } }) - + // 滚动条 $('#user_list_warp').lrscroll(); @@ -229,7 +231,9 @@ var bootstrap = function ($, learun) { if (postitem.text != "") { postitem.text += ","; } - postitem.text += userlistselectedobj[userlistselected[i]].F_RealName; + if (userlistselected[i] != 'null') { + postitem.text += userlistselectedobj[userlistselected[i]].F_RealName; + } } callBack(postitem, dfopid); return true; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Report - 副本.mrt b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Report - 副本.mrt new file mode 100644 index 000000000..ed5818d4b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Report - 副本.mrt @@ -0,0 +1,447 @@ + + + + + + + <数据源1 Ref="2" type="DataTableSource" isKey="true"> + 数据源1 + + UserName,System.String + Department,System.String + ADType,System.String + ADTime,System.DateTime + ClockTime,System.DateTime + ClockStatus,System.String + ClockPlace,System.String + + + 7291a4d177ac43eeba3521446487f520 + 数据源1 + ADR_Record + + + + + + + ,Monday,Monday,Monday,System.String,,True,False,False,False + + + EngineV2 + + 60b550cbd9f1400a90a18ac579ad7cd0 + + + + None;Black;2;Solid;False;4;Black + Transparent + + + All;Black;1;Solid;False;4;Black + Transparent + 0,0.4,19,2 + + + Black + Transparent + 2.8,0,2.2,2 + + Shape3 + + + + + + Transparent + 3.8,0.2,1,1 + + Arial,10 + 0,0,0,0 + Text4 + + + 日 期 + Black + ,,,,,Angle=-50 + Expression + + + Transparent + 1.8,0.2,2.2,1 + + Arial,10 + 0,0,0,0 + Text3 + + + 打卡结果 + Black + ,,,,,Angle=-30 + Expression + + + Transparent + 0.6,1.55,1.6,0.4 + + Arial,10 + 0,0,0,0 + Text1 + + + 人 员 + Black + Expression + + + Black + EmptyBrush + 0.2,0,4.8,2 + + Shape2 + + + + + + Black + Transparent + 2.2,1,2.8,1 + + Shape1 + + + + + + Transparent + 0.56,0.07,1.2,0.8 + + Arial,10 + 0,0,0,0 + Text2 + + + 考勤类型 + Black + ,,,,,Angle=-28 + Expression + + + 5,0,0,0 + + StartPointPrimitive1 + + + 6f1bc255e6204946825c21d6e7a14efa + + + 5,2,0,0 + + EndPointPrimitive1 + + + 6f1bc255e6204946825c21d6e7a14efa + + + 17,0,0,0 + + StartPointPrimitive8 + + + ef3e0b0ec7af4e37bfe8a43076b7cd30 + + + 19,2,0,0 + + EndPointPrimitive8 + + + ef3e0b0ec7af4e37bfe8a43076b7cd30 + + + 15,0,0,0 + + StartPointPrimitive7 + + + 2d746f4748134ce0a58f133581ce35de + + + 17,2,0,0 + + EndPointPrimitive7 + + + 2d746f4748134ce0a58f133581ce35de + + + 13,0,0,0 + + StartPointPrimitive6 + + + 3ea18cee2e5845f2bffa9729b80e5f29 + + + 15,2,0,0 + + EndPointPrimitive6 + + + 3ea18cee2e5845f2bffa9729b80e5f29 + + + 11,0,0,0 + + StartPointPrimitive5 + + + d1cab23d65cb4cbf87889dc2f5fb4900 + + + 13,2,0,0 + + EndPointPrimitive5 + + + d1cab23d65cb4cbf87889dc2f5fb4900 + + + 9,0,0,0 + + StartPointPrimitive4 + + + 82a36abe322c4390958d192e59591218 + + + 11,2,0,0 + + EndPointPrimitive4 + + + 82a36abe322c4390958d192e59591218 + + + 7,0,0,0 + + StartPointPrimitive3 + + + 3b9fa7de8f11436484b1a16553af09c9 + + + 9,2,0,0 + + EndPointPrimitive3 + + + 3b9fa7de8f11436484b1a16553af09c9 + + + 5,0,0,0 + + StartPointPrimitive2 + + + 85559f8f8dd547cf9f94f6bcba15184e + + + 7,2,0,0 + + EndPointPrimitive2 + + + 85559f8f8dd547cf9f94f6bcba15184e + + + + PageHeaderBand1 + + + + + Transparent + + 0,3.2,19,0.8 + + + Transparent + 0,0,1.6,0.6 + + Arial,8 + 0,0,0,0 + Text5 + + + {数据源1.UserName} + Black + + + Transparent + 1.8,0,1.6,0.6 + + Arial,8 + 0,0,0,0 + Text6 + + + {数据源1.Department} + Black + + + Transparent + 3.6,0,1.6,0.6 + + Arial,8 + 0,0,0,0 + Text7 + + + {数据源1.ADType} + Black + + + + + 数据源1 + + DataBand1 + + + + + + 5,0.4,0.0254,2 + Black + + + Black + + 6f1bc255e6204946825c21d6e7a14efa + VerticalLinePrimitive1 + + + + Black + + + + 17,0.4,2,2 + Black + + ef3e0b0ec7af4e37bfe8a43076b7cd30 + RectanglePrimitive7 + + + + + 15,0.4,2,2 + Black + + 2d746f4748134ce0a58f133581ce35de + RectanglePrimitive6 + + + + + 13,0.4,2,2 + Black + + 3ea18cee2e5845f2bffa9729b80e5f29 + RectanglePrimitive5 + + + + + 11,0.4,2,2 + Black + + d1cab23d65cb4cbf87889dc2f5fb4900 + RectanglePrimitive4 + + + + + 9,0.4,2,2 + Black + + 82a36abe322c4390958d192e59591218 + RectanglePrimitive3 + + + + + 7,0.4,2,2 + Black + + 3b9fa7de8f11436484b1a16553af09c9 + RectanglePrimitive2 + + + + + 5,0.4,2,2 + Black + + 85559f8f8dd547cf9f94f6bcba15184e + RectanglePrimitive1 + + + + + + 403b1f2049dd4a979599f69c93987a2d + 1,1,1,1 + Page1 + 29.7 + 21 + A4 + + + + + System.Dll + System.Drawing.Dll + System.Windows.Forms.Dll + System.Data.Dll + System.Xml.Dll + Stimulsoft.Controls.Dll + Stimulsoft.Base.Dll + Stimulsoft.Report.Dll + + Report + 9/16/2020 12:03:28 PM + 9/15/2020 2:53:21 PM + D:\gitLocalRepositories\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Areas\LogisticsManagement\Views\ADR_Record\Report.mrt + 2f0af1b2cf104a0dbe8b6b7c1a035f6a + Report + Centimeters + 2020.2.1.0 + + CSharp + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/formselect/lr-formselect.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/formselect/lr-formselect.js index 9d40deced..0d00f5b28 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/formselect/lr-formselect.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/formselect/lr-formselect.js @@ -120,6 +120,11 @@ var dfop = $self[0]._lrformselect.dfop; return dfop._itemValue ? dfop._itemValue.value : ""; }; + $.fn.lrformselectGetText = function () { + var $self = $(this); + var dfop = $self[0]._lrformselect.dfop; + return dfop._itemValue ? dfop._itemValue.text : ""; + }; $.fn.lrformselectSet = function (value) { var $self = $(this); var dfop = $self[0]._lrformselect.dfop; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/select/lr-select.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/select/lr-select.js index 0c1b172f5..e7bd48037 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/select/lr-select.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/select/lr-select.js @@ -610,6 +610,44 @@ } return value; }; + $.fn.lrselectGetText = function () { + var $this = $(this); + if ($this.length == 0) { + return $this; + } + var dfop = $this[0]._lrselect.dfop; + var value = ''; + switch (dfop.type) { + case 'default': + if (dfop.data[dfop._index]) { + value = dfop.data[dfop._index][dfop.text]; + } + break; + case 'tree': + if (dfop.currtentItem) { + value = dfop.currtentItem[dfop.text]; + } + break; + case 'treemultiple': + if (dfop.currtentItems) { + for (var i = 0, l = dfop.currtentItems.length; i < l; i++) { + if (value != "") { + value += ","; + } + value += dfop.currtentItems[i][dfop.text]; + } + } + break; + case 'gird': + break; + case 'multiple': + dfop.multipleValue = dfop.multipleValue || []; + return String(dfop.multipleValue); + default: + break; + } + return value; + }; $.fn.lrselectSet = function (value) { // 设置数据的值 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js index 14619056e..dd05d41fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js @@ -297,7 +297,20 @@ } else { var data = storage.get("userData").data || {}; - op.callback(data[op.key] || {}, op); + var keys = op.key.split(','); + var array=new Array(); + if (keys.length > 0) { + $.each(keys, + function (i, item) { + + array.push(data[item]); + }) + op.callback(array || {}, op); + + } else { + + op.callback(data[op.key] || {}, op); + } } }, getAll: function (op) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_IssueEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_IssueEntity.cs new file mode 100644 index 000000000..c15ec3e75 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_IssueEntity.cs @@ -0,0 +1,22 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2019-04-11 10:08 + /// 描 述：公文收发 + /// + public class Sys_IssueEntity + { + + public string RFileId { get; set; } + public string SFileId { get; set; } + public string SpecifyReceiver { get; set; } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs index 5deeb5a8e..d38abd850 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs @@ -239,6 +239,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public void Issue(Sys_IssueEntity entity) + { + try + { + sys_ReceiveFileService.Issue(entity); + } + 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/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs index 42a88760b..fc1bd46af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs @@ -45,6 +45,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("RECEIVER")] public string Receiver { get; set; } /// + /// 指定接收人 + /// + [Column("SPECIFYRECEIVER")] + public string SpecifyReceiver { get; set; } + /// + /// 指定接收人的下发状态 + /// + [Column("SENDSTATUS")] + public bool? SendStatus { get; set; } + /// /// 标题 /// [Column("TITLE")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs index e57d6efe1..d06af81ca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs @@ -77,5 +77,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #endregion + void Issue(Sys_IssueEntity entity); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs index 01260b1d2..5c934a264 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs @@ -3,8 +3,16 @@ using Learun.DataBase.Repository; using Learun.Util; using System; using System.Collections.Generic; +using System.Configuration; using System.Data; +using System.Linq; using System.Text; +using System.Threading.Tasks; +using System.Web; +using Learun.Application.Organization; +using Learun.Application.TwoDevelopment.LR_Desktop; +using Microsoft.AspNet.SignalR.Client; +using Newtonsoft.Json; namespace Learun.Application.TwoDevelopment.EducationalAdministration { @@ -226,7 +234,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var oldentity = GetSys_ReceiveFileEntity(keyValue); oldentity.RUrl = entity.RUrl; oldentity.ReplyFlag = true; - oldentity.ReplyTime=DateTime.Now; + oldentity.ReplyTime = DateTime.Now; + oldentity.SpecifyReceiver = entity.SpecifyReceiver; this.BaseRepository().Update(oldentity); } else @@ -330,5 +339,142 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #endregion + public void Issue(Sys_IssueEntity entity) + { + var db = this.BaseRepository().BeginTrans(); + try + { + //从‘查阅情况’ 列表中跳转 将发送情况改变 + if (!string.IsNullOrEmpty(entity.RFileId)) + { + var rEntity = db.FindEntity(a => a.RFileId == entity.RFileId); + rEntity.SendStatus = true; + db.Update(rEntity); + } + var Sys_SendFile = db.FindEntity(a => a.SFileId == entity.SFileId); + var teacherlist = db.FindList(a => entity.SpecifyReceiver.Contains(a.F_UserId)).ToList(); + + foreach (var tEntity in teacherlist) + { + Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity(); + receiveFile.Create(); + receiveFile.SFileId = Sys_SendFile.SFileId; + receiveFile.SenderId = Sys_SendFile.SenderId; + receiveFile.Sender = Sys_SendFile.Sender; + receiveFile.ReceiverId = tEntity.F_UserId; + receiveFile.Receiver = tEntity.F_RealName; + receiveFile.Title = Sys_SendFile.Title; + receiveFile.Contents = Sys_SendFile.Contents; + receiveFile.Url = Sys_SendFile.Url; + receiveFile.ReadFlag = false; + receiveFile.SendTime = DateTime.Now; + receiveFile.SendType = Sys_SendFile.SendType; + receiveFile.DelFlag = false; + receiveFile.STypeId = Sys_SendFile.STypeId; + receiveFile.ReplyFlag = false; + receiveFile.SLastDate = Sys_SendFile.SLastDate; + receiveFile.RUrl = Guid.NewGuid().ToString(); + db.Insert(receiveFile); + } + Sys_SendFile.SendTime = DateTime.Now; + var listReceive = Sys_SendFile.ReceiverId?.Split(',').ToList(); + if (listReceive == null) + { + listReceive = new List(); + } + foreach (var item in teacherlist) + { + if (listReceive?.Contains(item.F_Account) != true) + { + listReceive.Add(item.F_Account); + Sys_SendFile.Receiver += "," + item.F_RealName; + } + + } + + + Sys_SendFile.Receiver = Sys_SendFile.Receiver.TrimStart(','); + StringBuilder stringBuilder = new StringBuilder(); + foreach (var item in listReceive) + { + stringBuilder.Append(item + ","); + } + + Sys_SendFile.ReceiverId = stringBuilder.ToString().TrimEnd(','); + db.Update(Sys_SendFile); + db.Commit(); + //微信推送 + try + { + PushWeixin(teacherlist, Sys_SendFile.Title); + } + catch (Exception e) + { + } + //飞星推送 + Task.Run(async () => + { + using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"])) + { + var hubProxy = hubConnection.CreateHubProxy("SignalRHub"); + await hubConnection.Start(); + await hubProxy.Invoke("PushAnnouncement", Sys_SendFile.SenderId, Sys_SendFile.Title, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)).Substring(0, 20), "sendfile", string.Join(",", teacherlist.Select(m => m.F_UserId)), ""); + } + }); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + public void PushWeixin(List needpostuserlist, string title) + { + var WeChatConfigentity = BaseRepository().FindEntity(m => m.IsEnable == true); + string appid = WeChatConfigentity.APPId; + string secret = WeChatConfigentity.secret; + var wechatemplete = BaseRepository() + .FindEntity(m => m.WeID == WeChatConfigentity.ID && m.TCode == "task"); + string weixintaskurl = wechatemplete.TUrl; + string weixintasktempid = wechatemplete.TempId; + var responsejson = Util.HttpMethods.HttpGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret); + foreach (UserEntity userinfo in needpostuserlist) + { + if (userinfo != null && !string.IsNullOrEmpty(userinfo.OpenIdForWeixin)) + { + //执行推送任务 + if (!string.IsNullOrEmpty(appid) && !string.IsNullOrEmpty(secret) && !string.IsNullOrEmpty(weixintaskurl) && !string.IsNullOrEmpty(weixintasktempid)) + { + if (!string.IsNullOrEmpty(responsejson)) + { + var weixintokenobj = JsonConvert.DeserializeObject(responsejson); + if (string.IsNullOrEmpty(weixintokenobj.errcode)) + { + string access_token = weixintokenobj.access_token; + string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," + + "\"template_id\":\"" + weixintasktempid + "\"," + + "\"url\":\"" + weixintaskurl + "\"," + + "\"data\":{" + + "\"first\": {\"value\":\"您有新的公文需要查阅\",\"color\":\"#173177\"}," + + "\"keyword1\":{\"value\":\"公文下发\",\"color\":\"#173177\"}," + + "\"keyword2\": {\"value\":\"" + title + "\",\"color\":\"#173177\"}," + + "\"keyword3\": {\"value\":\"待查阅\",\"color\":\"#173177\"}," + + "\"keyword4\": {\"value\":\"您有新的公文需要查阅【" + title + "】\",\"color\":\"#173177\"}" + + "}" + + "}"; + string pushresult = Util.HttpMethods.HttpPost("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, jsondata); + } + } + } + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileBLL.cs index 6b8908b2f..02ca52e88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileBLL.cs @@ -204,6 +204,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public void OverIssue(string keyValue) + { + try + { + sys_SendFileService.OverIssue(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/EducationalAdministration/Sys_SendFile/Sys_SendFileEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileEntity.cs index baabffeca..9401719a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2019-04-11 10:31 /// 描 述：公文发送 ///
- public class Sys_SendFileEntity + public class Sys_SendFileEntity { #region 实体成员 /// @@ -35,6 +35,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("RECEIVERID")] public string ReceiverId { get; set; } /// + /// 流程审批指定接收人 + /// + [Column("SPECIFYRECEIVER")] + public string SpecifyReceiver { get; set; } + /// /// Receiver /// [Column("RECEIVER")] @@ -88,6 +93,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void Create() { this.SFileId = Guid.NewGuid().ToString(); + this.DelFlag = false; + this.SendFlag = 0; + this.SenderId = LoginUserInfo.Get().userId; + this.Sender = LoginUserInfo.Get().realName; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileIBLL.cs index 3cf2d69fd..4d6e3d7ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileIBLL.cs @@ -58,5 +58,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #endregion + void OverIssue(string keyValue); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs index 29f8d2ff4..078ed25fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs @@ -228,163 +228,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void ChangeStatusByProcessId(string processId, int status) { - if (status == 2) + var db = BaseRepository().BeginTrans(); + try { - var db = BaseRepository().BeginTrans(); - try + var Sys_SendFile = db.FindEntity(m => m.SProcessId == processId); + Sys_SendFile.SendFlag = status; + if (status == 2) { - var needpostuserlist = new List(); - var Sys_SendFile = db.FindEntity(m => m.SProcessId == processId); - if (Sys_SendFile.SendType == "1") - { - var teacherlist = db.FindList(m => - m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师" && - m.F_CompanyId == Sys_SendFile.ReceiverId); - needpostuserlist = teacherlist.ToList(); - foreach (var tEntity in teacherlist) - { - Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity(); - receiveFile.Create(); - receiveFile.SFileId = Sys_SendFile.SFileId; - receiveFile.SenderId = Sys_SendFile.SenderId; - receiveFile.Sender = Sys_SendFile.Sender; - receiveFile.ReceiverId = tEntity.F_UserId; - receiveFile.Receiver = tEntity.F_RealName; - receiveFile.Title = Sys_SendFile.Title; - receiveFile.Contents = Sys_SendFile.Contents; - receiveFile.Url = Sys_SendFile.Url; - receiveFile.ReadFlag = false; - receiveFile.SendTime = DateTime.Now; - receiveFile.SendType = Sys_SendFile.SendType; - receiveFile.DelFlag = false; - receiveFile.STypeId = Sys_SendFile.STypeId; - receiveFile.ReplyFlag = false; - receiveFile.SLastDate = Sys_SendFile.SLastDate; - receiveFile.RUrl = Guid.NewGuid().ToString(); - db.Insert(receiveFile); - } - } - else if (Sys_SendFile.SendType == "2") - { - var teacherlist = db.FindList(m => - m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师" && - Sys_SendFile.ReceiverId.Contains(m.F_DepartmentId)); - needpostuserlist = teacherlist.ToList(); - foreach (var tEntity in teacherlist) - { - Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity(); - receiveFile.Create(); - receiveFile.SFileId = Sys_SendFile.SFileId; - receiveFile.SenderId = Sys_SendFile.SenderId; - receiveFile.Sender = Sys_SendFile.Sender; - receiveFile.ReceiverId = tEntity.F_UserId; - receiveFile.Receiver = tEntity.F_RealName; - receiveFile.Title = Sys_SendFile.Title; - receiveFile.Contents = Sys_SendFile.Contents; - receiveFile.Url = Sys_SendFile.Url; - receiveFile.ReadFlag = false; - receiveFile.SendTime = DateTime.Now; - receiveFile.SendType = Sys_SendFile.SendType; - receiveFile.DelFlag = false; - receiveFile.STypeId = Sys_SendFile.STypeId; - receiveFile.ReplyFlag = false; - receiveFile.SLastDate = Sys_SendFile.SLastDate; - receiveFile.RUrl = Guid.NewGuid().ToString(); - db.Insert(receiveFile); - } - } - else if (Sys_SendFile.SendType == "3") - { - List ppostid = Sys_SendFile.ReceiverId.Split(',').ToList(); - for (int i = 0; i < ppostid.Count; i++) - { - ppostid[i] = "'" + ppostid[i] + "'"; - } - - var teacherlist = db.FindList( - @"select distinct a.* from [dbo].[LR_Base_User] a left join [dbo].[LR_Base_UserRelation] b -on a.F_UserId=b.F_UserId where b.F_ObjectId in(" + string.Join(",", ppostid) + - ") and a.F_DeleteMark<>1 and a.F_EnabledMark=1 and a.F_Description='教师'"); - needpostuserlist = teacherlist.ToList(); - foreach (var tEntity in teacherlist) - { - Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity(); - receiveFile.Create(); - receiveFile.SFileId = Sys_SendFile.SFileId; - receiveFile.SenderId = Sys_SendFile.SenderId; - receiveFile.Sender = Sys_SendFile.Sender; - receiveFile.ReceiverId = tEntity.F_UserId; - receiveFile.Receiver = tEntity.F_RealName; - receiveFile.Title = Sys_SendFile.Title; - receiveFile.Contents = Sys_SendFile.Contents; - receiveFile.Url = Sys_SendFile.Url; - receiveFile.ReadFlag = false; - receiveFile.SendTime = DateTime.Now; - receiveFile.SendType = Sys_SendFile.SendType; - receiveFile.DelFlag = false; - receiveFile.STypeId = Sys_SendFile.STypeId; - receiveFile.ReplyFlag = false; - receiveFile.SLastDate = Sys_SendFile.SLastDate; - receiveFile.RUrl = Guid.NewGuid().ToString(); - db.Insert(receiveFile); - } - } - else - { - var teacherlist = db.FindList(m => - m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师" && - Sys_SendFile.ReceiverId.Contains(m.F_UserId)); - needpostuserlist = teacherlist.ToList(); - foreach (var tEntity in teacherlist) - { - Sys_ReceiveFileEntity receiveFile = new Sys_ReceiveFileEntity(); - receiveFile.Create(); - receiveFile.SFileId = Sys_SendFile.SFileId; - receiveFile.SenderId = Sys_SendFile.SenderId; - receiveFile.Sender = Sys_SendFile.Sender; - receiveFile.ReceiverId = tEntity.F_UserId; - receiveFile.Receiver = tEntity.F_RealName; - receiveFile.Title = Sys_SendFile.Title; - receiveFile.Contents = Sys_SendFile.Contents; - receiveFile.Url = Sys_SendFile.Url; - receiveFile.ReadFlag = false; - receiveFile.SendTime = DateTime.Now; - receiveFile.SendType = Sys_SendFile.SendType; - receiveFile.DelFlag = false; - receiveFile.STypeId = Sys_SendFile.STypeId; - receiveFile.ReplyFlag = false; - receiveFile.SLastDate = Sys_SendFile.SLastDate; - receiveFile.RUrl = Guid.NewGuid().ToString(); - db.Insert(receiveFile); - } - } - Sys_SendFile.SendFlag = 2; Sys_SendFile.SendTime = DateTime.Now; - db.Update(Sys_SendFile); - db.Commit(); - //微信推送 - try - { - PushWeixin(needpostuserlist, Sys_SendFile.Title); - } - catch (Exception e) - { - } - //飞星推送 - Task.Run(async () => - { - using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"])) - { - var hubProxy = hubConnection.CreateHubProxy("SignalRHub"); - await hubConnection.Start(); - await hubProxy.Invoke("PushAnnouncement", Sys_SendFile.SenderId, Sys_SendFile.Title, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Sys_SendFile.Contents)).Substring(0, 20), "sendfile", string.Join(",", needpostuserlist.Select(m => m.F_UserId)), ""); - } - }); - } - catch (Exception ex) - { - db.Rollback(); } + db.Update(Sys_SendFile); + db.Commit(); + + } + catch (Exception ex) + { + db.Rollback(); } } @@ -429,6 +288,31 @@ on a.F_UserId=b.F_UserId where b.F_ObjectId in(" + string.Join(",", ppostid) + } } } + + public void OverIssue(string keyValue) + { + try + { + var entity = this.BaseRepository().FindEntity(a => a.SFileId == keyValue); + if (null != entity) + { + entity.SendFlag = 4; + } + + this.BaseRepository().Update(entity); + } + 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/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index b85fbd25a..026c69eba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -196,6 +196,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs index 98bd2013f..a6f232671 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs @@ -2013,6 +2013,9 @@ namespace Learun.Application.WorkFlow NWFEngineParamConfig nWFEngineParamConfig = nWFIEngine.GetConfig(); nWFEngineParamConfig.Auditers = auditors; + //overFW 任一审核者不同意 即流程任务结束 + bool overFW = false; + // 获取任务实体 var taskEntiy = nWFTaskIBLL.GetEntity(taskId); if (taskEntiy == null) @@ -2181,6 +2184,7 @@ namespace Learun.Application.WorkFlow else if (operationCode == "disagree") { nWFTaskRelationEntity.F_Result = 2; + overFW = true; } else { @@ -2190,7 +2194,7 @@ namespace Learun.Application.WorkFlow // 获取下一节点信息 List lineList = new List(); - List list = nWFIEngine.GetNextTaskNode(nodeInfo, operationCode, false, lineList); + List list = nWFIEngine.GetNextTaskNode(nodeInfo, operationCode, false, lineList, overFW); // 会签处理 int state = 0; @@ -2221,6 +2225,12 @@ namespace Learun.Application.WorkFlow nWFProcessEntity.F_IsFinished = 1; } + // 如果任一审核者不同意，即流程结束（终止） + if (overFW) + { + nWFProcessEntity.F_EnabledMark = 4;//终止 + } + List pLineList = new List(); List pTaskList = new List(); List pTaskMsgList = new List(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs index c204dcd3c..122e727ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs @@ -50,7 +50,7 @@ namespace Learun.Application.WorkFlow [Column("F_LEVEL")] public int? F_Level { get; set; } /// - /// 流程进程有效标志 1正常2草稿3作废 + /// 流程进程有效标志 1正常2草稿3作废4终止 /// /// [Column("F_ENABLEDMARK")] @@ -157,6 +157,17 @@ namespace Learun.Application.WorkFlow [NotMapped] public int? F_TaskType { get; set; } + /// + /// 当前任务NodeID + /// + [NotMapped] + public string F_NodeId { get; set; } + + /// + /// 下一任务节点是否审核 + /// + [NotMapped] + public bool? NextNodeIsAudited { get; set; } /// /// 是否被催办 1 被催办了 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs index 8fcc14178..6fbead2d5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs @@ -537,7 +537,8 @@ namespace Learun.Application.WorkFlow p.F_ParentProcessId, p.F_CreateUserId, p.F_CreateUserName, - p.F_IsStart + p.F_IsStart, + t.F_NodeId FROM LR_NWF_Task t LEFT JOIN LR_NWF_TaskRelation r on r.F_TaskId = t.F_Id @@ -567,7 +568,18 @@ namespace Learun.Application.WorkFlow strSql.Append(" AND p.F_SchemeCode = @schemeCode "); } - return this.BaseRepository().FindList(strSql.ToString(), new { userInfo.userId, startTime, endTime, keyword, schemeCode }, pagination); + var data = this.BaseRepository().FindList(strSql.ToString(), new { userInfo.userId, startTime, endTime, keyword, schemeCode }, pagination); + foreach (var item in data) + { + var nextNode = this.BaseRepository().FindEntity(a => + a.F_ProcessId == item.F_Id && a.F_PrevNodeId == item.F_NodeId); + if (null != nextNode) + { + item.NextNodeIsAudited = true; + } + } + + return data; } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs index 256153e04..c360041bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFEngine.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; namespace Learun.Workflow.Engine { @@ -32,6 +33,11 @@ namespace Learun.Workflow.Engine { startNode = node; } + + if (node.type == "endround") + { + endNode = node; + } } } #endregion @@ -41,6 +47,7 @@ namespace Learun.Workflow.Engine private NWFScheme wfScheme = null; private Dictionary nodesMap = null; private NWFNodeInfo startNode = null; + private NWFNodeInfo endNode = null; #endregion #region 私有方法 @@ -49,7 +56,8 @@ namespace Learun.Workflow.Engine /// /// 节点信息 /// - private bool CalcCondition(NWFNodeInfo node) { + private bool CalcCondition(NWFNodeInfo node) + { bool res = true; if (node.conditions.Count > 0) { @@ -63,7 +71,8 @@ namespace Learun.Workflow.Engine if (dataTable.Rows.Count > 0) { string value = dataTable.Rows[0][0].ToString(); - if (string.IsNullOrEmpty(value)) { + if (string.IsNullOrEmpty(value)) + { return false; } @@ -131,11 +140,13 @@ namespace Learun.Workflow.Engine break; } } - else { + else + { res = false; } } - if (!res) { + if (!res) + { break; } } @@ -151,7 +162,8 @@ namespace Learun.Workflow.Engine conditionSql = conditionSql.Replace("{companyId}", "@companyId"); conditionSql = conditionSql.Replace("{departmentId}", "@departmentId"); - var param = new { + var param = new + { processId = config.ParamConfig.ProcessId, userId = config.ParamConfig.CreateUser.Id, userAccount = config.ParamConfig.CreateUser.Account, @@ -234,7 +246,8 @@ namespace Learun.Workflow.Engine /// 获取流程模板 /// /// - public string GetScheme() { + public string GetScheme() + { return config.ParamConfig.Scheme; } /// @@ -264,10 +277,11 @@ namespace Learun.Workflow.Engine { return nodesMap[nodeId]; } - else { + else + { return null; } - + } /// /// 获取下一节点 @@ -275,60 +289,82 @@ namespace Learun.Workflow.Engine /// 当前节点Id /// 节点操作码 agree 同意 disagree 不同意 lrtimeout 超时 /// 节点信息列表 - public List GetNextNodes(string nodeId, string code, List lineList) + public List GetNextNodes(string nodeId, string code, List lineList, bool overFW = false) { + + List nextNodes = new List(); // 找到与当前节点相连的线条 - foreach (var line in wfScheme.lines) + NWFLineInfo line = null; + //如果lastNode 不为空，直接执行最后一条线的绑定方法 并终止任务 + if (overFW) { - if (line.from == nodeId) + line = wfScheme.lines.Last(); + } + else + { + line = wfScheme.lines.FirstOrDefault(a => a.from == nodeId); + } + + + bool isOk = false; + if (string.IsNullOrEmpty(line.strategy) || line.strategy == "1") + { + isOk = true; + } + else + { + var codeList = line.agreeList.Split(','); + foreach (string _code in codeList) { - bool isOk = false; - if (string.IsNullOrEmpty(line.strategy) || line.strategy == "1") + if (_code == code) { isOk = true; + break; } - else { - var codeList = line.agreeList.Split(','); - foreach (string _code in codeList) { - if (_code == code) { - isOk = true; - break; - } - } + } + } + if (isOk) + { + if (nodesMap.ContainsKey(line.to)) + { + //如果lastNode 不为空，直接执行最后一条线的绑定方法 并终止任务 + if (overFW) + { + nextNodes.Add(endNode); } - if (isOk) + else { - if (nodesMap.ContainsKey(line.to)) - { - nextNodes.Add(nodesMap[line.to]); + nextNodes.Add(nodesMap[line.to]); + } - switch (line.operationType) {// 绑定的操作类型 - case "sql": // sql 语句 - if (!string.IsNullOrEmpty(line.dbId) && !string.IsNullOrEmpty(line.strSql)) - { - lineList.Add(line); - } - break; - case "interface": // interface 接口 - if (!string.IsNullOrEmpty(line.strInterface)) - { - lineList.Add(line); - } - break; - case "ioc": // 依赖注入 - if (!string.IsNullOrEmpty(line.iocName)) - { - lineList.Add(line); - } - break; + switch (line.operationType) + {// 绑定的操作类型 + case "sql": // sql 语句 + if (!string.IsNullOrEmpty(line.dbId) && !string.IsNullOrEmpty(line.strSql)) + { + lineList.Add(line); } - - } + break; + case "interface": // interface 接口 + if (!string.IsNullOrEmpty(line.strInterface)) + { + lineList.Add(line); + } + break; + case "ioc": // 依赖注入 + if (!string.IsNullOrEmpty(line.iocName)) + { + lineList.Add(line); + } + break; } + } } + return nextNodes; + } /// /// 获取上一节点列表 @@ -392,7 +428,8 @@ namespace Learun.Workflow.Engine /// 获取配置参数信息 /// /// - public NWFEngineParamConfig GetConfig() { + public NWFEngineParamConfig GetConfig() + { return config.ParamConfig; } /// @@ -403,9 +440,12 @@ namespace Learun.Workflow.Engine /// 是否获取下一节点审核人 /// 经过的线段需要执行操作的 /// - public List GetNextTaskNode(NWFNodeInfo beginNode,string code,bool isGetAuditors, List lineList) { + public List GetNextTaskNode(NWFNodeInfo beginNode, string code, bool isGetAuditors, List lineList, bool overWF = false) + { List list = new List(); - List nextNodeList = GetNextNodes(beginNode.id, code, lineList); + List nextNodeList = new List(); + + nextNodeList = GetNextNodes(beginNode.id, code, lineList, overWF); Dictionary auditers = null; if (!string.IsNullOrEmpty(config.ParamConfig.Auditers)) @@ -419,13 +459,15 @@ namespace Learun.Workflow.Engine if (auditers != null && auditers.ContainsKey(node.id)) { node.auditors = new List(); - node.auditors.Add(new NWFAuditor() { + node.auditors.Add(new NWFAuditor() + { type = 3, auditorId = auditers[node.id] }); } - switch (node.type) { + switch (node.type) + { case "conditionnode": // 条件节点 if (!isGetAuditors) { @@ -438,13 +480,15 @@ namespace Learun.Workflow.Engine list.AddRange(GetNextTaskNode(node, "disagree", isGetAuditors, lineList)); } } - else { + else + { list.AddRange(GetNextTaskNode(node, "agree", isGetAuditors, lineList)); list.AddRange(GetNextTaskNode(node, "disagree", isGetAuditors, lineList)); } break; case "confluencenode":// 会签节点 - if (!isGetAuditors) { + if (!isGetAuditors) + { int confluenceRes; if (code == "agree") { @@ -471,8 +515,9 @@ namespace Learun.Workflow.Engine break; case "childwfnode":// 子流程节点 list.Add(node); - if (node.childType == "2") { // 异步的情况下直接往下走 - list.AddRange(GetNextTaskNode(node, "agree", isGetAuditors,lineList)); + if (node.childType == "2") + { // 异步的情况下直接往下走 + list.AddRange(GetNextTaskNode(node, "agree", isGetAuditors, lineList)); } break; case "startround":// 开始节点 需要重新审核 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFIEngine.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFIEngine.cs index ab8abdcb7..c66897e59 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFIEngine.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Workflow/Learun.Workflow.Engine/NWFIEngine.cs @@ -39,7 +39,7 @@ namespace Learun.Workflow.Engine /// 当前节点Id /// 节点操作码 agree 同意 disagree 不同意 lrtimeout 超时 /// 节点信息列表 - List GetNextNodes(string nodeId, string code, List lineList); + List GetNextNodes(string nodeId, string code, List lineList, bool overFW = false); /// /// 获取上一节点列表 /// @@ -69,7 +69,7 @@ namespace Learun.Workflow.Engine /// 是否获取下一节点审核人 /// 经过的线段需要执行操作的 /// - List GetNextTaskNode(NWFNodeInfo beginNode, string code, bool isGetAuditors, List lineList); + List GetNextTaskNode(NWFNodeInfo beginNode, string code, bool isGetAuditors, List lineList, bool overWF = false); #endregion } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index bad430d1e..42a2982e3 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -7,7 +7,7 @@ export default { "enableSignUp": true, // 请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 "apiHost": [ - "http://123.57.209.16:31173/learun/adms" + "https://oa.bjquanjiang.com/learun/adms" ], // "apiHost": [ // "http://192.168.2.94:31173/learun/adms" diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue index 748a205e7..6693a3c9e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue @@ -13,13 +13,13 @@ - + @@ -30,9 +30,9 @@ 登 录 - + From a3320a6ad79d5e93c54ec240273771f92b0e7a95 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 22 Sep 2020 14:31:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=AE=B0=E5=BD=95=E7=9A=84=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=EF=BC=9B=E8=80=83=E5=8B=A4=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=BB=9F=E8=AE=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ADR_Record/Form.cshtml | 4 ++-- .../Views/ADR_Record/Form.js | 4 +++- .../Views/ADR_Record/Index.cshtml | 6 +++++- .../Views/ADR_Record/Index.js | 2 +- .../XmlConfig/system.config | 2 ++ .../ADR_Record/ADR_RecordService.cs | 19 +++++++++++++++---- 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml index a2ff9fbb7..ab37fe1a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml @@ -13,11 +13,11 @@
考勤时间
- +
打卡时间
- +
打卡状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js index e5e4e2669..b4a2c2b15 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js @@ -21,7 +21,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', param: {} }); - + $('#ADType').lrDataItemSelect({ code: 'ADType' }); $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); }, initData: function () { @@ -34,6 +34,8 @@ var bootstrap = function ($, learun) { else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); } + $("#ADTime").val(data[id].ADTime); + $("#ClockTime").val(data[id].ClockTime); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml index ec13ad6d5..637ed439b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml @@ -14,9 +14,13 @@
-
员工名字
+
姓名
+
+
职工编号
+ +
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js index a7528b05b..41086592b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js @@ -44,7 +44,7 @@ var bootstrap = function ($, learun) { }); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 220, 400); + }, 250, 400); $('#Department').lrDepartmentSelect(); $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' }); $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'}); 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 adbbc178b..e270ebadb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -154,4 +154,6 @@ + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs index 8361bf0a6..1e47e1701 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs @@ -63,6 +63,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("UserName", "%" + queryParam["UserName"].ToString() + "%", DbType.String); strSql.Append(" AND emp.F_RealName Like @UserName "); } + if (!queryParam["UserNo"].IsEmpty()) + { + dp.Add("UserNo", queryParam["UserNo"].ToString(), DbType.String); + strSql.Append(" AND t.UserNo = @UserNo "); + } if (!queryParam["Department"].IsEmpty()) { dp.Add("Department", queryParam["Department"].ToString(), DbType.String); @@ -249,12 +254,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { date = queryParam["Date"].ToDate().ToDateString(); } - var strSql = new StringBuilder(); strSql.Append("select u.F_Encode as UserNo,u.F_RealName as UserName,u.F_DepartmentId as Department,t.ID,t.ADType,t.ADTime,t.ClockTime,t.ClockStatus "); - strSql.Append(" from " + basedbname + ".dbo.LR_Base_User u "); - strSql.Append(" left join ADR_Record t on u.F_EnCode=t.UserNo and t.ADYear='" + date.Substring(0, 4) + "' and t.ADMonth='" + date.Substring(5, 2) + "' and t.ADDay='" + date.Substring(8, 2) + "' "); - strSql.Append(" where u.F_Description='教师' AND u.F_DeleteMark = 0 AND u.F_EnabledMark = 1 and u.F_Encode is not null "); + strSql.Append(" from " + basedbname + ".dbo.LR_Base_User u "); + strSql.Append(" inner join EmpInfo emp on u.F_EnCode=emp.EmpNo "); + strSql.Append(" left join ADR_Record t on u.F_EnCode=t.UserNo and t.ADYear='" + date.Substring(0, 4) + "' and t.ADMonth='" + date.Substring(5, 2) + "' and t.ADDay='" + date.Substring(8, 2) + "' "); + strSql.Append(" where u.F_Description='教师' AND u.F_DeleteMark = 0 AND u.F_EnabledMark = 1 and u.F_Encode is not null "); + + var UserNoPrev = Config.GetValue("ADR_RecordUserNoPrev"); + if (!string.IsNullOrEmpty(UserNoPrev)) + { + strSql.Append(" and u.F_encode like '" + UserNoPrev + "%' "); + } // 虚拟参数 var dp = new DynamicParameters(new { }); if (!queryParam["UserNo"].IsEmpty()) From 3159d4fa8fc7e8db65d77b0c9dc1c0b5019666c1 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Tue, 22 Sep 2020 15:02:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E9=87=8C=E6=B7=BB=E5=8A=A0=E6=9C=AA=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoApply/IndexJY.js | 32 ++++++++++--------- .../Views/Ass_AssetsInfoApply/IndexJYHC.js | 8 +++-- .../Views/NWFProcess/ContractFiling.cshtml | 13 +++++++- .../Views/NWFProcess/ContractFiling.js | 2 +- .../Ass_AssetsInfoApplyService.cs | 1 + 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js index 4a2b4b633..dec2a3205 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js @@ -146,18 +146,18 @@ var bootstrap = function ($, learun) { $('#lr_viewcg').on('click', function () { var PId = $('#gridtable').jfGridValue('PId'); //if (learun.checkrow(PId)) { - if (PId == null || PId === undefined || PId === "") { - learun.alert.warning("当前项目不含采购单！"); - return; - } - learun.layerForm({ - id: 'formAss_Purchase', - title: '查看采购单', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_Purchase/FormViewJY?keyValue=' + PId, - width: 1000, - height: 600, - btn: null - }); + if (PId == null || PId === undefined || PId === "") { + learun.alert.warning("当前项目不含采购单！"); + return; + } + learun.layerForm({ + id: 'formAss_Purchase', + title: '查看采购单', + url: top.$.rootUrl + '/AssetManagementSystem/Ass_Purchase/FormViewJY?keyValue=' + PId, + width: 1000, + height: 600, + btn: null + }); //} }); // 删除 @@ -233,8 +233,8 @@ var bootstrap = function ($, learun) { } }); } - }, - { + }, + { label: "审批状态", name: "AAStatus", width: 100, align: "left", formatter: function (cellvalue, row) { if (cellvalue === 1) { @@ -258,13 +258,15 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.AssType = '1';//普通 低值 + var loginInfo = top.learun.clientdata.get(['userinfo']); + param.AACreateUserId = loginInfo.userId; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function (res, postData) { if (res && res.code && res.code == 200) { // 发起流程 - + var postData = { schemeCode: 'Ass_PurchaseApply',// 填写流程对应模板编号 processId: processId, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js index 7e3783183..082214d19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js @@ -214,10 +214,12 @@ var bootstrap = function ($, learun) { { label: "申请人", name: "AACreateUserId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('user', { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, + keyId: 'f_account', callback: function (_data) { - callback(_data.name); + callback(_data['f_realname']); } }); } @@ -258,6 +260,8 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.AssType = '2';//耗材 + var loginInfo = top.learun.clientdata.get(['userinfo']); + param.AACreateUserId = loginInfo.userId; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml index cd1962dd3..6f1cffdf6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml @@ -2,7 +2,18 @@ ViewBag.Title = "流程监控"; Layout = "~/Views/Shared/_Index.cshtml"; } -
+
+
+
+
+
    +
  • 未完成
    • +
  • 已完成
    • +
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js index 4ba250b86..66e2b8326 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js @@ -177,7 +177,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = logbegin; param.EndTime = logend; - param.categoryId = '2'; + param.categoryId = categoryId; param.F_Category = '合同类'; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs index 23e1fba16..aae9d10fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs @@ -35,6 +35,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem t.AAId, t.AACode, t.AAPrice, + t.AAAssType, t.AACreateTime, t.AACreateDeptId, t.AACreateUserId,t.AAStatus,