From cd8b9428e5c075f2500a894f542ba57741e8a15e Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 29 Aug 2023 15:44:05 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ADR_RecordController.cs | 6 +++ .../Views/ADR_Record/Form.cshtml | 16 ++++++- .../Views/ADR_Record/Form.js | 2 + .../Views/ADR_Record/FormView.cshtml | 46 ++++++++++++++++++ .../Views/ADR_Record/FormView.js | 48 +++++++++++++++++++ .../Views/ADR_Record/Index.cshtml | 5 +- .../Views/ADR_Record/Index.js | 24 ++++++++-- .../Learun.Application.Web.csproj | 2 + .../ADR_Record/ADR_RecordService.cs | 2 +- .../ADR_Restriction/ADR_RestrictionService.cs | 5 +- .../LearunApp-2.2.0/pages/login.vue | 4 +- 11 files changed, 150 insertions(+), 10 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs index 0a4e65137..699f9c605 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs @@ -42,6 +42,12 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return View(); } + [HttpGet] + public ActionResult FormView() + { + return View(); + } + [HttpGet] public ActionResult AttendanceReportByWeek() { 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 327d9852f..b63473ef5 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 @@ -21,12 +21,26 @@
打卡状态
-
+
+
+
+
+
是否外勤
+
打卡地点
+
+
照片
+
+
+
+
+
备注
+ +
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/Form.js") 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 c8b67bb9f..ed8e4f021 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 @@ -23,6 +23,8 @@ var bootstrap = function ($, learun) { }); $('#ADType').lrDataItemSelect({ code: 'ADType' }); $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' }); + $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#ADPhoto').lrUploader(); $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml new file mode 100644 index 000000000..8e2d7cb9b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml @@ -0,0 +1,46 @@ +@{ + ViewBag.Title = "考勤记录"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
员工名字
+
+
+
+
考勤类型
+
+
+
+
考勤时间
+ +
+
+
打卡时间
+ +
+
+
打卡状态
+
+
+
+
+
是否外勤
+
+
+
+
+
打卡地点
+ +
+
+
照片
+
+
+
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js new file mode 100644 index 000000000..fd182d4bf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js @@ -0,0 +1,48 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2020-08-28 18:09 + * 描 述：考勤记录 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#Department').lrselect({ + type: 'tree', + allowSearch: true, + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', + param: {} + }); + $('#ADType').lrDataItemSelect({ code: 'ADType' }); + $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' }); + $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#ADPhoto').lrUploader({ isUpload: false}); + $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/ADR_Record/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]); + } + $("#ADTime").val(data[id].ADTime); + $("#ClockTime").val(data[id].ClockTime); + } + }); + } + } + }; + page.init(); +} 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 637ed439b..25657abd9 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 @@ -42,8 +42,9 @@
-  补卡 -  编辑 +  补卡 +  编辑 +  查看  删除
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 41086592b..61e199c55 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 @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { }, 250, 400); $('#Department').lrDepartmentSelect(); $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' }); - $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'}); + $('#ADStatus').lrDataItemSelect({ code: 'ADStatus' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -81,6 +81,19 @@ var bootstrap = function ($, learun) { }); } }); + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/FormView?keyValue=' + keyValue, + width: 600, + height: 400, + btn: null + }); + } + }); // 删除 $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); @@ -97,7 +110,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetPageList', headData: [ { @@ -157,7 +170,12 @@ var bootstrap = function ($, learun) { }); } }, - { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" }, + { + label: "是否外勤", name: "AIsOut", width: 100, align: "left", formatter: function (value) { + return value == true ? "是" : "否"; + } + }, + { label: "打卡地点", name: "ClockPlace", width: 200, align: "left" }, { label: "考勤数据上传时间", name: "ADTime", width: 150, align: "left" } ], mainId: 'ID', 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 05f11e728..b992ae750 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 @@ -1460,6 +1460,7 @@ + @@ -8273,6 +8274,7 @@ + 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 c5d041b73..e83993376 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 @@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.ADYear, t.ADMonth, t.ADDay, - t.ADPhoto + t.ADPhoto,t.AIsOut,t.ARemark "); strSql.Append($" FROM ADR_Record t left JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account"); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index 34f08891b..199ef0d29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -429,7 +429,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement firstoffworkentity.ADTime = datetimenow; firstoffworkentity.ClockTime = devicetime; firstoffworkentity.ClockStatus = ClockStatus; - + firstoffworkentity.ARemark = ARemark; + firstoffworkentity.ClockPlace = ClockPlace; + firstoffworkentity.ADPhoto = ADPhoto; + firstoffworkentity.AIsOut = AIsOut; this.BaseRepository("CollegeMIS").ExecuteBySql("update ADR_Record set ADTime='" + firstoffworkentity.ADTime + "',ClockTime='" + firstoffworkentity.ClockTime + "',ClockStatus='" + firstoffworkentity.ClockStatus + "',ADPhoto='" + firstoffworkentity.ADPhoto + "' where ID='" + firstoffworkentity.ID + "'"); return true; } 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 a731c6afc..d9db7b829 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 @@ -33,9 +33,9 @@ 登 录 微信登录 - + - + 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 c5d041b73..ba7d6c0e1 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 @@ -83,7 +83,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("ADStatus", queryParam["ADStatus"].ToString(), DbType.String); strSql.Append(" AND t.ClockStatus = @ADStatus "); } - + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) @@ -289,69 +289,114 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement ClockStatus = y.ClockStatus }) }); - //启用的考勤规则 - var restrictionEntity = this.BaseRepository("CollegeMIS").FindEntity(m => m.REnable == true); - var WorkTimeTemp = string.Format("{0} {1}", date, restrictionEntity?.WorkTime).ToDate(); - var NoonCloseTimeTemp = string.Format("{0} {1}", date, restrictionEntity?.NoonCloseTime).ToDate(); - var NoonWorkTimeTemp = string.Format("{0} {1}", date, restrictionEntity?.NoonWorkTime).ToDate(); - var CloseTimeTemp = string.Format("{0} {1}", date, restrictionEntity?.CloseTime).ToDate(); - var MorningMinutes = (NoonCloseTimeTemp - WorkTimeTemp).TotalMinutes.ToInt();//上午应工作分钟数 - var AfternoonMinutes = (CloseTimeTemp - NoonWorkTimeTemp).TotalMinutes.ToInt();//下午应工作分钟数 - //结果列表 var result = new List(); - foreach (var item in data) - { - var adtype1 = item.Group.FirstOrDefault(x => x.ADType == "1"); - var adtype8 = item.Group.FirstOrDefault(x => x.ADType == "8"); - var adtype7 = item.Group.FirstOrDefault(x => x.ADType == "7"); - var adtype2 = item.Group.FirstOrDefault(x => x.ADType == "2"); - //上午 - var morning = new ADR_RecordEntity() + //启用的考勤规则 + var restrictionEntity = this.BaseRepository("CollegeMIS").FindEntity(m => m.REnable == true); + if (restrictionEntity != null) + { + //上班时间 + var WorkTimeTemp = string.Format("{0} {1}", date, restrictionEntity.WorkTime).ToDate(); + //下班时间 + var CloseTimeTemp = string.Format("{0} {1}", date, restrictionEntity.CloseTime).ToDate(); + if (restrictionEntity.ClockTime == "二次打卡") { - UserNo = item.UserNo, - UserName = item.UserName, - Department = item.Department, - ClockDate = date, - BanCi = "上下班", - TimePeriodNo = 1, - TimePeriod = string.Format("上午上下班({0}-{1})", restrictionEntity?.WorkTime, restrictionEntity?.NoonCloseTime), - ADStatusWork = adtype1 != null ? adtype1.ClockStatus : "6", - ADStatusClose = adtype8 != null ? adtype8.ClockStatus : "6", - ClockTimeWork = adtype1 != null ? adtype1.ClockTime.ToTimeString() : "-", - ClockTimeClose = adtype8 != null ? adtype8.ClockTime.ToTimeString() : "-", - ChidaoMinutes = adtype1 != null ? adtype1.ClockStatus == "2" ? (adtype1.ClockTime.Value - WorkTimeTemp).TotalMinutes.ToInt() : 0 : 0, - ZaoTuiMinutes = adtype8 != null ? adtype8.ClockStatus == "3" ? (NoonCloseTimeTemp - adtype8.ClockTime.Value).TotalMinutes.ToInt() : 0 : 0, - ChuQinMinutes = adtype1 != null && adtype8 != null ? (adtype8.ClockTime.Value - adtype1.ClockTime.Value).TotalMinutes.ToInt() : 0, - QueQinMinutes = adtype1 != null && adtype8 != null ? 0 : MorningMinutes, - RestMinutes = 0 - }; - morning.WorkMinutes = MorningMinutes == morning.QueQinMinutes ? 0 : MorningMinutes - morning.ChidaoMinutes - morning.ZaoTuiMinutes - morning.QueQinMinutes; - result.Add(morning); - //下午 - var afternoon = new ADR_RecordEntity() + #region 二次打卡 + var WholeMinutes = (CloseTimeTemp - WorkTimeTemp).TotalMinutes.ToInt();//全天应工作分钟数 + + foreach (var item in data) + { + var adtype1 = item.Group.FirstOrDefault(x => x.ADType == "1");//上班 + var adtype2 = item.Group.FirstOrDefault(x => x.ADType == "2");//下班 + //全天 + var whole = new ADR_RecordEntity() + { + UserNo = item.UserNo, + UserName = item.UserName, + Department = item.Department, + ClockDate = date, + BanCi = "上下班", + TimePeriodNo = 0, + TimePeriod = string.Format("上下班({0}-{1})", restrictionEntity.WorkTime, restrictionEntity.CloseTime), + ADStatusWork = adtype1 != null ? adtype1.ClockStatus : "6", + ADStatusClose = adtype2 != null ? adtype2.ClockStatus : "6", + ClockTimeWork = adtype1 != null ? adtype1.ClockTime.ToTimeString() : "-", + ClockTimeClose = adtype2 != null ? adtype2.ClockTime.ToTimeString() : "-", + ChidaoMinutes = adtype1 != null ? adtype1.ClockStatus == "2" ? (adtype1.ClockTime.Value - WorkTimeTemp).TotalMinutes.ToInt() : 0 : 0, + ZaoTuiMinutes = adtype2 != null ? adtype2.ClockStatus == "3" ? (CloseTimeTemp - adtype2.ClockTime.Value).TotalMinutes.ToInt() : 0 : 0, + ChuQinMinutes = adtype1 != null && adtype2 != null ? (adtype2.ClockTime.Value - adtype1.ClockTime.Value).TotalMinutes.ToInt() : 0, + QueQinMinutes = adtype1 != null && adtype2 != null ? 0 : WholeMinutes, + RestMinutes = 0 + }; + whole.WorkMinutes = WholeMinutes == whole.QueQinMinutes ? 0 : WholeMinutes - whole.ChidaoMinutes - whole.ZaoTuiMinutes - whole.QueQinMinutes; + result.Add(whole); + } + #endregion + } + else { - UserNo = item.UserNo, - UserName = item.UserName, - Department = item.Department, - ClockDate = date, - BanCi = "上下班", - TimePeriodNo = 2, - TimePeriod = string.Format("下午上下班({0}-{1})", restrictionEntity?.NoonWorkTime, restrictionEntity?.CloseTime), - ADStatusWork = adtype7 != null ? adtype7.ClockStatus : "6", - ADStatusClose = adtype2 != null ? adtype2.ClockStatus : "6", - ClockTimeWork = adtype7 != null ? adtype7.ClockTime.ToTimeString() : "-", - ClockTimeClose = adtype2 != null ? adtype2.ClockTime.ToTimeString() : "-", - ChidaoMinutes = adtype7 != null ? adtype7.ClockStatus == "2" ? (adtype7.ClockTime.Value - NoonWorkTimeTemp).TotalMinutes.ToInt() : 0 : 0, - ZaoTuiMinutes = adtype2 != null ? adtype2.ClockStatus == "3" ? (CloseTimeTemp - adtype2.ClockTime.Value).TotalMinutes.ToInt() : 0 : 0, - ChuQinMinutes = adtype7 != null && adtype2 != null ? (adtype2.ClockTime.Value - adtype7.ClockTime.Value).TotalMinutes.ToInt() : 0, - QueQinMinutes = adtype7 != null && adtype2 != null ? 0 : AfternoonMinutes, - RestMinutes = 0 - }; - afternoon.WorkMinutes = AfternoonMinutes == afternoon.QueQinMinutes ? 0 : AfternoonMinutes - afternoon.ChidaoMinutes - afternoon.ZaoTuiMinutes - afternoon.QueQinMinutes; - result.Add(afternoon); - } + #region 四次打卡 + //中午下班时间 + var NoonCloseTimeTemp = string.Format("{0} {1}", date, restrictionEntity?.NoonCloseTime).ToDate(); + //中午上班时间 + var NoonWorkTimeTemp = string.Format("{0} {1}", date, restrictionEntity?.NoonWorkTime).ToDate(); + var MorningMinutes = (NoonCloseTimeTemp - WorkTimeTemp).TotalMinutes.ToInt();//上午应工作分钟数 + var AfternoonMinutes = (CloseTimeTemp - NoonWorkTimeTemp).TotalMinutes.ToInt();//下午应工作分钟数 + foreach (var item in data) + { + var adtype1 = item.Group.FirstOrDefault(x => x.ADType == "1");//上班 + var adtype8 = item.Group.FirstOrDefault(x => x.ADType == "8");//中午下班 + var adtype7 = item.Group.FirstOrDefault(x => x.ADType == "7");//中午上班 + var adtype2 = item.Group.FirstOrDefault(x => x.ADType == "2");//下班 + //上午 + var morning = new ADR_RecordEntity() + { + UserNo = item.UserNo, + UserName = item.UserName, + Department = item.Department, + ClockDate = date, + BanCi = "上下班", + TimePeriodNo = 1, + TimePeriod = string.Format("上午上下班({0}-{1})", restrictionEntity.WorkTime, restrictionEntity.NoonCloseTime), + ADStatusWork = adtype1 != null ? adtype1.ClockStatus : "6", + ADStatusClose = adtype8 != null ? adtype8.ClockStatus : "6", + ClockTimeWork = adtype1 != null ? adtype1.ClockTime.ToTimeString() : "-", + ClockTimeClose = adtype8 != null ? adtype8.ClockTime.ToTimeString() : "-", + ChidaoMinutes = adtype1 != null ? adtype1.ClockStatus == "2" ? (adtype1.ClockTime.Value - WorkTimeTemp).TotalMinutes.ToInt() : 0 : 0, + ZaoTuiMinutes = adtype8 != null ? adtype8.ClockStatus == "3" ? (NoonCloseTimeTemp - adtype8.ClockTime.Value).TotalMinutes.ToInt() : 0 : 0, + ChuQinMinutes = adtype1 != null && adtype8 != null ? (adtype8.ClockTime.Value - adtype1.ClockTime.Value).TotalMinutes.ToInt() : 0, + QueQinMinutes = adtype1 != null && adtype8 != null ? 0 : MorningMinutes, + RestMinutes = 0 + }; + morning.WorkMinutes = MorningMinutes == morning.QueQinMinutes ? 0 : MorningMinutes - morning.ChidaoMinutes - morning.ZaoTuiMinutes - morning.QueQinMinutes; + result.Add(morning); + //下午 + var afternoon = new ADR_RecordEntity() + { + UserNo = item.UserNo, + UserName = item.UserName, + Department = item.Department, + ClockDate = date, + BanCi = "上下班", + TimePeriodNo = 2, + TimePeriod = string.Format("下午上下班({0}-{1})", restrictionEntity.NoonWorkTime, restrictionEntity.CloseTime), + ADStatusWork = adtype7 != null ? adtype7.ClockStatus : "6", + ADStatusClose = adtype2 != null ? adtype2.ClockStatus : "6", + ClockTimeWork = adtype7 != null ? adtype7.ClockTime.ToTimeString() : "-", + ClockTimeClose = adtype2 != null ? adtype2.ClockTime.ToTimeString() : "-", + ChidaoMinutes = adtype7 != null ? adtype7.ClockStatus == "2" ? (adtype7.ClockTime.Value - NoonWorkTimeTemp).TotalMinutes.ToInt() : 0 : 0, + ZaoTuiMinutes = adtype2 != null ? adtype2.ClockStatus == "3" ? (CloseTimeTemp - adtype2.ClockTime.Value).TotalMinutes.ToInt() : 0 : 0, + ChuQinMinutes = adtype7 != null && adtype2 != null ? (adtype2.ClockTime.Value - adtype7.ClockTime.Value).TotalMinutes.ToInt() : 0, + QueQinMinutes = adtype7 != null && adtype2 != null ? 0 : AfternoonMinutes, + RestMinutes = 0 + }; + afternoon.WorkMinutes = AfternoonMinutes == afternoon.QueQinMinutes ? 0 : AfternoonMinutes - afternoon.ChidaoMinutes - afternoon.ZaoTuiMinutes - afternoon.QueQinMinutes; + result.Add(afternoon); + } + #endregion + } + } return result.OrderBy(x => x.UserNo).ThenBy(x => x.UserName).ThenBy(x => x.TimePeriodNo); } catch (Exception ex) From 467eeb8c689fca8c2ffffd7acfe0ee21c06bef11 Mon Sep 17 00:00:00 2001 From: hwh2023 <598694955@qq.com> Date: Wed, 30 Aug 2023 18:08:25 +0800 Subject: [PATCH 04/32] =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=95=B0=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MessageRindController.cs | 93 +++++++++++++++++++ .../Views/Home/AdminDesktop/Index.js | 27 ++++++ 2 files changed, 120 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs index d14ddcb56..b10907083 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs @@ -6,6 +6,9 @@ using System.Collections.Generic; using System.Collections; using System; using System.Linq; +using Learun.Application.OA; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using Learun.Application.WorkFlow; namespace Learun.Application.Web.Areas.LR_Desktop.Controllers { @@ -91,6 +94,96 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers return Success(count); } + + + private SYS_ReceiveMessageIBLL sYS_ReceiveMessageIBLL = new SYS_ReceiveMessageBLL(); + private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL(); + private NoticeIBLL newsIBLL = new NoticeBLL(); + private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL(); + /// + /// 获取未读的消息的数量 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetCountFortotalUnread() + { + int totalcount = 0; + #region 待办 + var userinfo = LoginUserInfo.Get(); + Pagination paginationobj = new Pagination() { rows = 100, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; + //未读邮件 + int UnreadMail = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userinfo.userId + "\"}").Count(m => m.READFLAG == 0); + //办公事项 + paginationobj.sidx = "F_CreateDate"; + int UnreadTask = nWFProcessIBLL.GetMyTaskPageList(userinfo, paginationobj, "{}").Count(); + //公告 + List outnewslist = new List(); + var newsList = newsIBLL.GetPageList(paginationobj, ""); + foreach (var newsitemEntity in newsList) + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) + { + if (!string.IsNullOrEmpty(userinfo.postIds)) + { + if (userinfo.postIds.Contains(",")) + { + foreach (var postid in userinfo.postIds.Split(',')) + { + if (newsitemEntity.F_SendPostId.Contains(postid)) + { + outnewslist.Add(newsitemEntity); + break; + } + } + } + else + { + if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds)) + { + outnewslist.Add(newsitemEntity); + } + } + } + } + else + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) + { + if (userinfo.departmentId != null && newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId)) + { + outnewslist.Add(newsitemEntity); + } + } + else + { + outnewslist.Add(newsitemEntity); + } + } + } + var readnewslist = newsIBLL.GetList("", userinfo.userId).Where(m => !string.IsNullOrEmpty(m.RNewsId)).Select(m => m.F_NewsId); + int UnreadNews = outnewslist.Count(m => !readnewslist.Contains(m.F_NewsId)); + paginationobj.sidx = "SendTime"; + int UnreadFile = sys_ReceiveFileIBLL.GetPageListBySenderId(userinfo.userId).Count(); + //普通教师请假-未归档数 + int UnfileLeave = 0; + //中层领导请假-未归档数 + int UnfileLeaveZC = 0; + + totalcount = UnreadFile + UnreadNews + UnreadTask + UnreadMail + UnfileLeave + UnfileLeaveZC; + #endregion + var data = new + { + UnreadTask= UnreadTask, + UnreadNews= UnreadNews, + UnfileLeave= UnfileLeave, + UnfileLeaveZC= UnfileLeaveZC, + totalcount = totalcount + }; + return Success(data); + } /// /// 获取未读的消息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js index e19598913..fc17f7ef8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js @@ -328,4 +328,31 @@ } }); }; + + window.setInterval(gettotalunread, 10000); + //未读消息totalcount + function gettotalunread() { + $.ajax({ + url: top.$.rootUrl + '/LR_Desktop/MessageRind/GetCountFortotalUnread', + type: "get", + dataType: "json", + async: false, + success: function (data) { + if (data.data != 0) { + //document.getElementsByClassName("lr-im-bell2")[0].children[0].children[2].innerText = data.data; + + //UnreadTask = UnreadTask, + // UnreadNews = UnreadNews, + // UnfileLeave = UnfileLeave, + // UnfileLeaveZC = UnfileLeaveZC, + // totalcount = totalcount + $('#btn_daiban').html("待办事项 " + data.data.UnreadTask + " 条") + $('#btn_tonggao').html("通告 " + data.data.UnreadNews + " 条") + //$('#btn_gongwen').text(data.totalcount) + $('body > div.lr-im-bell2.open > ul > li:nth-child(5)').html("共 " + data.data.totalcount+" 条") + $('body > div.lr-im-bell2 > a > span:nth-child(3)').html(data.data.totalcount) + } + } + }); + }; }); \ No newline at end of file From 3522c8df14b10eb9b733d770d8962e4d714c517d Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 1 Sep 2023 15:38:59 +0800 Subject: [PATCH 05/32] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADR_Restriction/ADR_RestrictionService.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index 199ef0d29..03f1bf20d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -1165,13 +1165,16 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { adrresult.AttendanceType = 3; adrresult.AttendanceTypeString = "早退打卡"; - adrresult.UserWorkTime = attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); - adrresult.UserCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); + var userWorkTime = attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; + var userCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; + adrresult.UserWorkTime = userWorkTime != null ? userWorkTime.ToString() : ""; + adrresult.UserCloseTime = userCloseTime != null ? userCloseTime.ToString() : ""; return adrresult; } adrresult.AttendanceType = 3; adrresult.AttendanceTypeString = "早退打卡"; - adrresult.UserWorkTime = attendancerecordList.OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); + var userWorkTime2 = attendancerecordList.OrderByDescending(m => m.ADTime).FirstOrDefault().ADTime.Value; + adrresult.UserWorkTime = userWorkTime2 != null ? userWorkTime2.ToString() : ""; return adrresult; } //超过上班最晚签到时间 小于下班最早签退时间，黄色 @@ -1187,8 +1190,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement //更新最晚下班时间 adrresult.AttendanceType = 1; adrresult.AttendanceTypeString = "正常打卡"; - adrresult.UserWorkTime = attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); - adrresult.UserCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).First().ADTime.Value.ToString(); + var userWorkTime= attendancerecordList.Where(m => m.ADType == "1").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; + var userCloseTime = attendancerecordList.Where(m => m.ADType == "2").OrderByDescending(m => m.ADTime).FirstOrDefault()?.ADTime.Value; + adrresult.UserWorkTime = userWorkTime != null ? userWorkTime.ToString() : ""; + adrresult.UserCloseTime = userCloseTime != null ? userCloseTime.ToString() : ""; return adrresult; } } From dadc004aa6a35a427934a3e5aeb2909edee8c5b4 Mon Sep 17 00:00:00 2001 From: hwh2023 <598694955@qq.com> Date: Tue, 5 Sep 2023 11:46:19 +0800 Subject: [PATCH 06/32] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/AdminDesktop/Index.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js index fc17f7ef8..58be55ac4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js @@ -346,11 +346,17 @@ // UnfileLeave = UnfileLeave, // UnfileLeaveZC = UnfileLeaveZC, // totalcount = totalcount - $('#btn_daiban').html("待办事项 " + data.data.UnreadTask + " 条") - $('#btn_tonggao').html("通告 " + data.data.UnreadNews + " 条") + + //$("#btn_daiban", window.parent.document).html("11") + //$('#btn_tonggao', window.parent.document).html("<22") + ////$('#btn_gongwen').text(data.totalcount) + //$('body > div.lr-im-bell2.open > ul > li:nth-child(5)', window.parent.document).html("44") + //$('body > div.lr-im-bell2 > a > span:nth-child(3)', window.parent.document).html("123") + $("#btn_daiban", window.parent.document).html("待办事项 " + data.data.UnreadTask + " 条") + $('#btn_tonggao', window.parent.document).html("通告 " + data.data.UnreadNews + " 条") //$('#btn_gongwen').text(data.totalcount) - $('body > div.lr-im-bell2.open > ul > li:nth-child(5)').html("共 " + data.data.totalcount+" 条") - $('body > div.lr-im-bell2 > a > span:nth-child(3)').html(data.data.totalcount) + $('body > div.lr-im-bell2.open > ul > li:nth-child(5)', window.parent.document).html("共 " + data.data.totalcount+" 条") + $('body > div.lr-im-bell2 > a > span:nth-child(3)', window.parent.document).html(data.data.totalcount) } } }); From 37c6601535c859ce172352c106ef4059166fb51d Mon Sep 17 00:00:00 2001 From: hwh2023 <598694955@qq.com> Date: Tue, 5 Sep 2023 11:57:27 +0800 Subject: [PATCH 07/32] =?UTF-8?q?=E9=80=9A=E7=9F=A530=E7=A7=92=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Views/Home/AdminDesktop/Index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js index 58be55ac4..6319990a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js @@ -329,7 +329,7 @@ }); }; - window.setInterval(gettotalunread, 10000); + window.setInterval(gettotalunread, 30000); //未读消息totalcount function gettotalunread() { $.ajax({ From 69843890cb2b5126b086c5136182d86dd5aa5dee Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 5 Sep 2023 15:28:43 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E6=A1=A3=E6=A1=88=E8=87=AA?= =?UTF-8?q?=E5=B8=A6=20=E5=B1=9E=E6=80=A7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Form.cshtml | 292 +++++++++--------- .../Views/StuInfoBasic/Form.js | 5 +- .../Views/StuInfoBasic/Index.js | 96 ++++-- .../Views/StuInfoBasic/IndexCenter.js | 95 ++++-- .../StuInfoBasic/StuInfoBasicEntity.cs | 5 + 5 files changed, 292 insertions(+), 201 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index 064fad2db..9a8fbf3aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -7,10 +7,6 @@
学校*
-
-
学号*
- -
学籍号
@@ -20,101 +16,141 @@
-
通知书号*
- -
-
-
身份证号*
- +
学号*
+
+ @*
+
通知书号*
+ +
*@
姓名*
-
-
民族*
-
-
性别*
-
疫情状态
-
+
身份证号*
+ +
+
+
出生日期*
+ +
+
+
民族*
+
+ @*
+
疫情状态
+
+
*@
政治面貌
+ @*
+
健康状况
+
+
*@
-
出生日期*
- +
档案自带
+
-
健康状况
-
-
-
户口分类
-
-
籍贯
-
-
-
-
-
+
+
系所*
+
-
-
照片
-
+
+
专业*
+
-
联系电话*
- +
班级*
+
-
E-mail
- +
年级*
+
-
开户银行*
-
+
学制
+
-
开户卡账号*
- +
学习形式
+
-
开户银行位置
- +
入学年月*
+
-
通信地址*
+
通讯地址*
-
邮政编码*
- +
照片
+
-
-
户口所在地
- +
+
联系电话*
+
-
-
档案所在地
- +
+
生源地
+
+ @*
+
E-mail
+ +
*@ + @*
+
户口所在地
+ +
+
+
档案所在地
+ +
*@
户籍所在地
+
+
籍贯
+
+
+
+
+
+
-
是否单亲
-
+
邮政编码*
+ +
+
+
开户银行*
+
+
+
+
开户卡账号*
+ +
+
+
开户银行位置
+
+ @*
+
是否单亲
+
+
*@
父亲姓名
@@ -139,22 +175,22 @@
母亲电话
-
-
户籍地址
- -
-
-
户籍地址
- -
-
-
现住址
- -
-
-
现住址
- -
+ @*
+
户籍地址
+ +
+
+
户籍地址
+ +
+
+
现住址
+ +
+
+
现住址
+ +
*@
监护人姓名
@@ -167,10 +203,10 @@
监护人电话
-
-
监护人户籍地址
- -
+ @*
+
监护人户籍地址
+ +
*@
监护人现住址
@@ -184,77 +220,53 @@
-
年级*
-
+
培养层次
+
+ @*
+
本专科
+
+
+
报到日期*
+ +
*@
-
本专科
-
-
-
-
学制
-
-
-
-
报到日期*
- -
-
-
学习形式
-
-
-
-
毕业证号
- -
-
-
毕业日期
+
预计毕业日期
-
-
毕业证书备注
- -
-
-
系所*
-
-
-
-
专业*
-
-
-
-
班级*
-
-
-
-
入学年月*
- -
-
-
入党时间
- -
-
-
入团时间
- -
-
-
校内地址
- -
-
-
校内电话
- -
-
-
QQ
- -
-
-
特长
- -
+ @*
+
毕业证号
+ +
+
+
毕业证书备注
+ +
+
+
入党时间
+ +
+
+
入团时间
+ +
+
+
校内地址
+ +
+
+
校内电话
+ +
+
+
QQ
+ +
+
+
特长
+ +
*@
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index dc23b2a78..55ef9d04f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js @@ -72,6 +72,9 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); + $('#StuPlaceCode').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname' }); + $('#IsArchives').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#PieceCultivateWay').lrDataItemSelect({ code: 'EducationLevel' }); $('#F_ProvinceId').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { @@ -119,7 +122,7 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); + $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index f6436a682..ee8d095a3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -235,10 +235,8 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', headData: [ - { label: "学号", name: "StuNo", width: 100, align: "left" }, - //{ label: "学籍号", name: "StuCode", width: 100, align: "left" }, { label: "考生号", name: "ksh", width: 100, align: "left" }, - { label: "通知书号", name: "NoticeNo", width: 100, align: "left" }, + { label: "学号", name: "StuNo", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", @@ -334,14 +332,39 @@ var bootstrap = function ($, learun) { }); } }, - { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, + //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, { label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, //{ label: "余额", name: "Balance", width: 100, align: "left" }, { label: "通讯地址", name: "MailAddress", width: 100, align: "left" }, { label: "联系电话", name: "mobile", width: 100, align: "left" }, - { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, - { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, + { + label: "生源地", name: "StuPlaceCode", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY', + key: value, + keyId: 'ccode', + callback: function (_data) { + callback(_data['cname']); + } + }); + } + }, + //{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, + //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, { label: "户籍所在地", name: "Domicile", width: 100, align: "left" }, + { + label: "档案是否自带", name: "IsArchives", 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: "ResidenceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -393,6 +416,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "邮政编码", name: "PostalCode", width: 100, align: "center" }, //{ label: "E-mail", name: "E-mail", width: 100, align: "center" }, { label: "开户银行", name: "DepositBank", width: 100, align: "center", @@ -408,32 +432,31 @@ var bootstrap = function ($, learun) { }, { label: "开户卡账号", name: "BankCard", width: 100, align: "center" }, { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" }, - { label: "邮政编码", name: "PostalCode", width: 100, align: "center" }, - { - label: "是否单亲", name: "IsSingle", width: 100, align: "left", - formatter: function (value, row) { - if (value == true) { - return '是'; - } - else if (value == false) { - return '否'; - } - } - }, + //{ + // label: "是否单亲", name: "IsSingle", width: 100, align: "left", + // formatter: function (value, row) { + // if (value == true) { + // return '是'; + // } + // else if (value == false) { + // return '否'; + // } + // } + //}, { label: "父亲姓名", name: "FatherName", width: 100, align: "center" }, { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" }, { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" }, - { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" }, - { label: "现住址", name: "OneAddress", width: 100, align: "center" }, + //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" }, + //{ label: "现住址", name: "OneAddress", width: 100, align: "center" }, { label: "母亲姓名", name: "MatherName", width: 100, align: "center" }, { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" }, { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" }, - { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" }, - { label: "现住址", name: "TwoAddress", width: 100, align: "center" }, + //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" }, + //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" }, { label: "监护人姓名", name: "GuardianName", width: 100, align: "center" }, { label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" }, { label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" }, - { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" }, + //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" }, { label: "现住址", name: "GuardianAddress", width: 100, align: "center" }, { label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center", @@ -460,24 +483,37 @@ var bootstrap = function ($, learun) { } }, { - label: "本专科", name: "GraduateNo", width: 100, align: "center", + label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'CollegeType', + code: 'EducationLevel', callback: function (_data) { callback(_data.text); } }); } }, - { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, + + //{ + // label: "本专科", name: "GraduateNo", width: 100, align: "center", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'CollegeType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, { label: "毕业日期", name: "GraduateYear", width: 100, align: "center", formatter: function (cellvalue) { return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, + { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" }, //{ // label: "入党时间", name: "BankCard", width: 100, align: "center", @@ -491,10 +527,10 @@ var bootstrap = function ($, learun) { // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); // } //}, - { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" }, - { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" }, - { label: "QQ", name: "QQ", width: 100, align: "center" }, - { label: "特长", name: "GoodAt", width: 100, align: "center" }, + //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" }, + //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" }, + //{ label: "QQ", name: "QQ", width: 100, align: "center" }, + //{ label: "特长", name: "GoodAt", width: 100, align: "center" }, { label: "备注", name: "Remark", width: 200, align: "center" }, { label: "异动状态", name: "MoveStatus", width: 80, align: "center", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js index d59f83dd8..b3bcae8d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js @@ -235,10 +235,8 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', headData: [ - { label: "学号", name: "StuNo", width: 100, align: "left" }, { label: "学籍号", name: "StuCode", width: 100, align: "left" }, - //{ label: "考生号", name: "ksh", width: 100, align: "left" }, - { label: "通知书号", name: "NoticeNo", width: 100, align: "left" }, + { label: "学号", name: "StuNo", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", @@ -334,14 +332,39 @@ var bootstrap = function ($, learun) { }); } }, - { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, + //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, { label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, //{ label: "余额", name: "Balance", width: 100, align: "left" }, { label: "通讯地址", name: "MailAddress", width: 100, align: "left" }, { label: "联系电话", name: "mobile", width: 100, align: "left" }, - { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, - { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, + { + label: "生源地", name: "StuPlaceCode", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY', + key: value, + keyId: 'ccode', + callback: function (_data) { + callback(_data['cname']); + } + }); + } + }, + //{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, + //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, { label: "户籍所在地", name: "Domicile", width: 100, align: "left" }, + { + label: "档案是否自带", name: "IsArchives", 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: "ResidenceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -393,6 +416,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "邮政编码", name: "PostalCode", width: 100, align: "center" }, //{ label: "E-mail", name: "E-mail", width: 100, align: "center" }, { label: "开户银行", name: "DepositBank", width: 100, align: "center", @@ -408,32 +432,31 @@ var bootstrap = function ($, learun) { }, { label: "开户卡账号", name: "BankCard", width: 100, align: "center" }, { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" }, - { label: "邮政编码", name: "PostalCode", width: 100, align: "center" }, - { - label: "是否单亲", name: "IsSingle", width: 100, align: "left", - formatter: function (value, row) { - if (value == true) { - return '是'; - } - else if (value == false) { - return '否'; - } - } - }, + //{ + // label: "是否单亲", name: "IsSingle", width: 100, align: "left", + // formatter: function (value, row) { + // if (value == true) { + // return '是'; + // } + // else if (value == false) { + // return '否'; + // } + // } + //}, { label: "父亲姓名", name: "FatherName", width: 100, align: "center" }, { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" }, { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" }, - { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" }, - { label: "现住址", name: "OneAddress", width: 100, align: "center" }, + //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" }, + //{ label: "现住址", name: "OneAddress", width: 100, align: "center" }, { label: "母亲姓名", name: "MatherName", width: 100, align: "center" }, { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" }, { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" }, - { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" }, - { label: "现住址", name: "TwoAddress", width: 100, align: "center" }, + //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" }, + //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" }, { label: "监护人姓名", name: "GuardianName", width: 100, align: "center" }, { label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" }, { label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" }, - { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" }, + //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" }, { label: "现住址", name: "GuardianAddress", width: 100, align: "center" }, { label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center", @@ -460,24 +483,36 @@ var bootstrap = function ($, learun) { } }, { - label: "本专科", name: "GraduateNo", width: 100, align: "center", + label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'CollegeType', + code: 'EducationLevel', callback: function (_data) { callback(_data.text); } }); } }, - { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, + //{ + // label: "本专科", name: "GraduateNo", width: 100, align: "center", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'CollegeType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, { label: "毕业日期", name: "GraduateYear", width: 100, align: "center", formatter: function (cellvalue) { return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, + { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" }, //{ // label: "入党时间", name: "BankCard", width: 100, align: "center", @@ -491,10 +526,10 @@ var bootstrap = function ($, learun) { // return learun.formatDate(cellvalue, 'yyyy-MM-dd'); // } //}, - { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" }, - { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" }, - { label: "QQ", name: "QQ", width: 100, align: "center" }, - { label: "特长", name: "GoodAt", width: 100, align: "center" }, + //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" }, + //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" }, + //{ label: "QQ", name: "QQ", width: 100, align: "center" }, + //{ label: "特长", name: "GoodAt", width: 100, align: "center" }, { label: "备注", name: "Remark", width: 200, align: "center" }, { label: "异动状态", name: "MoveStatus", width: 80, align: "center", diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 5b84f0ab5..a9e1f5794 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -377,6 +377,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("MATHERNAME")] public string MatherName { get; set; } /// + /// 档案是否自带 + /// + [Column("ISARCHIVES")] + public string IsArchives { get; set; } + /// /// 档案所在地 /// [Column("MATHERUNIT")] From 1e8160fa9f0936999ce45ec50501c7b6cd9c9311 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 5 Sep 2023 15:38:47 +0800 Subject: [PATCH 09/32] --- .../EducationalAdministration/Views/StuInfoBasic/Index.js | 4 ++-- .../Views/StuInfoBasic/IndexCenter.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index ee8d095a3..646ec661c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -513,8 +513,8 @@ var bootstrap = function ($, learun) { return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, - { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, - { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" }, + //{ label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, + //{ label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" }, //{ // label: "入党时间", name: "BankCard", width: 100, align: "center", // formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js index b3bcae8d6..89b99e680 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js @@ -512,8 +512,8 @@ var bootstrap = function ($, learun) { return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, - { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, - { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" }, + //{ label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" }, + //{ label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" }, //{ // label: "入党时间", name: "BankCard", width: 100, align: "center", // formatter: function (cellvalue) { From cb61589e14e367cd34eade8c49e8e1dbe8e6d395 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 5 Sep 2023 16:29:51 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermAttemperController.cs | 3 +- .../Views/ArrangeLessonTermAttemper/Form.js | 4 +- .../ArrangeLessonTermAttemper/FormView.cshtml | 6 +- .../ArrangeLessonTermAttemper/FormView.js | 41 ++++++++---- .../Views/ArrangeLessonTermAttemper/Index.js | 27 +++----- .../TimeTable/IndexInEducationSelect_.js | 3 +- .../ArrangeLessonTermAttemperEntity.cs | 2 +- .../ArrangeLessonTermAttemperService.cs | 64 ++++++++++++------- 8 files changed, 88 insertions(+), 62 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermAttemperController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermAttemperController.cs index c7c59cf3d..9a69cf7a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermAttemperController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermAttemperController.cs @@ -157,7 +157,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers int index = 0; foreach (var item in jo["predata"]) { - index++; + //index++; if (string.IsNullOrEmpty(lastdata) || lastdata != item["LessonTime"].ToString()) { lastdata = item["LessonTime"].ToString(); @@ -177,6 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers NewLessonTime = newlessontime }; query.Add(term); + index++; } entity.query = query; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 1b48e5f73..9e86788d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -484,7 +484,7 @@ var bootstrap = function ($, learun) { learun.alert.warning("校区、学年、学期不一致！"); return false; } - } else if (formData.AttemperType == "01") { //调课：调度时间比较；教师或教室必填一个； + } else if (formData.AttemperType == "01") { //换课：调度时间比较；教师或教室必填一个； if ((formData.NewEmpNo == null || formData.NewEmpNo == "") && (formData.NewClassroomNo == null || formData.NewClassroomNo == "")) { learun.alert.warning("课程新安排中教师或教室不能为空！"); return false; @@ -493,7 +493,7 @@ var bootstrap = function ($, learun) { learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } - } else if (formData.AttemperType == "04") { + } else if (formData.AttemperType == "04") { //调课 if (formData) { formData.predata = JSON.parse($('#gridtable').attr("data-val")); formData.tardata = JSON.parse( $('#gridtable1').attr("data-val")); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index 32f15fa52..b53f159d8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -142,11 +142,13 @@
调度开始时间*
-
+ @*
*@ +
调度结束时间*
-
+ @*
*@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index 2787d6e1c..f4909c22f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -189,7 +189,7 @@ var bootstrap = function ($, learun) { $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); - + }, initData: function () { if (!!keyValue) { @@ -274,7 +274,7 @@ var bootstrap = function ($, learun) { } html1 += '日期：' + oldtime + '
节次：' + oldjieci.join(';') + '
课程：' + course + '
教师：' + teacher + ';
班级：' + class_.join(';') + '
教室：' + classroom; html2 += '调整到：' + newtime + '的' + newjieci.join(';'); - console.log(html1) + //console.log(html1) $("#gridtable").html(html1); //{"targettime":"2023-6-24","targetjieci":"1节；2节；"} var target_json = { "targettime": newtime, "targetjieci": newjieci.join(';') } @@ -282,7 +282,7 @@ var bootstrap = function ($, learun) { $("#gridtable1").html(html2) } } - + } }); } @@ -290,15 +290,30 @@ var bootstrap = function ($, learun) { }; bindData = function (temprow) { if (!!temprow) { - //$('#F_SchoolId').lrselectSet(temprow.schooldId); - $('#AcademicYearNo').lrselectSet(temprow.academicyear); - $('#Semester').lrselectSet(temprow.semester); - $('#DeptNo').lrselectSet(temprow.deptNo); - $('#MajorNo').lrselectSet(temprow.majorNo); - $('#LessonNo').lrselectSet(temprow.lessonNo); - $('#TeachClassNo').lrselectSet(temprow.teachClassNo); - $('#EmpNo').lrselectSet(temprow.empno); - $('#ClassroomNo').lrselectSet(temprow.classRoomNo); + if ($("#AttemperType").lrselectGet() == "04") { + //console.log(temprow) + var dataparams = temprow.predata; + //$('#gridtable').jfGridSet('refreshdata', temprow.predata); + var datahtml = temprow.predatastr;//tardata.targettime + '的' + tardata.targetjieci; + $('#gridtable').html(datahtml); + $('#gridtable').attr("data-val", JSON.stringify(dataparams)) + var tardata = (temprow.tardata); + var html = '调整到：' + tardata.targettime + '的' + tardata.targetjieci; + $('#gridtable1').html(html); + $('#gridtable1').attr("data-val", JSON.stringify(tardata)) + //$('#gridtable1').jfGridSet('refreshdata', temprow.predata); + //$('#gridtable'). + } else { + //$('#F_SchoolId').lrselectSet(temprow.schooldId); + $('#AcademicYearNo').lrselectSet(temprow.academicyear); + $('#Semester').lrselectSet(temprow.semester); + $('#DeptNo').lrselectSet(temprow.deptNo); + $('#MajorNo').lrselectSet(temprow.majorNo); + $('#LessonNo').lrselectSet(temprow.lessonNo); + $('#TeachClassNo').lrselectSet(temprow.teachClassNo); + $('#EmpNo').lrselectSet(temprow.empno); + $('#ClassroomNo').lrselectSet(temprow.classRoomNo); + } page.query(); } }; @@ -402,7 +417,7 @@ var bootstrap = function ($, learun) { } html1 += '日期：' + oldtime + '
节次：' + oldjieci.join(';') + '
课程：' + course + '
教师：' + teacher + ';
班级：' + class_.join(';') + '
教室：' + classroom; html2 += '调整到：' + newtime + '的' + newjieci.join(';'); - console.log(html1) + //console.log(html1) $("#gridtable").html(html1); //{"targettime":"2023-6-24","targetjieci":"1节；2节；"} var target_json = { "targettime": newtime, "targetjieci": newjieci.join(';') } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index 408b977cf..1e12860ea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -254,7 +254,8 @@ var bootstrap = function ($, learun) { }); } }, - { label: "日期", name: "AcademicYearNo", width: 100, align: "left", + { + label: "日期", name: "AcademicYearNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.httpAsyncGet('/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) { if (res.code == learun.httpCode.success) { @@ -275,7 +276,7 @@ var bootstrap = function ($, learun) { learun.httpAsyncGet('/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) { if (res.code == learun.httpCode.success) { var t_data = []; - var t_w=[] + var t_w = [] for (var i = 0; i < res.data.length; i++) { if (t_data.indexOf(res.data[i].LessonTime.substring(1)) < 0) { t_data.push(res.data[i].LessonTime.substring(1)) @@ -285,7 +286,7 @@ var bootstrap = function ($, learun) { } } if (row.AttemperType == '04') { - callback("星期" + weekChina[t_w.join(',') - 1]+'第'+t_data.join(',')+'节'); + callback("星期" + weekChina[t_w.join(',') - 1] + '第' + t_data.sort((a, b) => { return a - b; }).join(',') + '节'); } else { callback(''); } @@ -301,7 +302,7 @@ var bootstrap = function ($, learun) { if (res.code == learun.httpCode.success) { var t_data = []; for (var i = 0; i < res.data.length; i++) { - if (t_data.indexOf(res.data[i].NewLessonDate.substring(0,10)) < 0) { + if (t_data.indexOf(res.data[i].NewLessonDate.substring(0, 10)) < 0) { t_data.push(res.data[i].NewLessonDate.substring(0, 10)) } } @@ -317,7 +318,7 @@ var bootstrap = function ($, learun) { { label: "调课星期/节次", name: "AcademicYearNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.httpAsyncGet( '/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) { + learun.httpAsyncGet('/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) { if (res.code == learun.httpCode.success) { var t_data = []; var t_w = [] @@ -330,21 +331,10 @@ var bootstrap = function ($, learun) { } } if (row.AttemperType == '04') { - callback("星期" + weekChina[t_w.join(',') - 1] + '第' + t_data.join(',') + '节'); + callback("星期" + weekChina[t_w.join(',') - 1] + '第' + t_data.sort((a, b) => { return a - b; }).join(',') + '节'); } else { callback(''); } - //var t_data = []; - //for (var i = 0; i < res.data.length; i++) { - // if (t_data.indexOf(res.data[i].NewLessonTime.substring(1)) < 0) { - // t_data.push(res.data[i].NewLessonTime.substring(1)) - // } - //} - //if (row.AttemperType == '04') { - // callback(t_data.join(',') + '节'); - //} else { - // callback(''); - //} } }); } @@ -543,6 +533,9 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") { + param.CreateUserId = learun.clientdata.get(['userinfo']).userId; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect_.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect_.js index 185344e4e..06f7da3bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect_.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect_.js @@ -15,8 +15,7 @@ var bootstrap = function ($, learun) { if ($("#predata").text()) { //当前班级 var dataval = JSON.parse($("#predata .card-box").attr("data-val")) - //var classno = dataval.map(item =>} {}) - param.ClassNo = dataval.map(item => { return item.className }).filter(function (itm, i, a) { + param.ClassNo = dataval.map(item => { return item.teachClassNo }).filter(function (itm, i, a) { return i == a.indexOf(itm); }).join(','); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs index d92fac405..7feb07d58 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs @@ -21,7 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("ID")] public string Id { get; set; } /// - /// 调度类型：1调课，2停课，3对调 + /// 调度类型：1换课，2停课，3对调，4调课 /// [Column("ATTEMPERTYPE")] public string AttemperType { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs index fd930ff81..2a9ea37c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs @@ -89,9 +89,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); strSql.Append(" AND (t.EmpNo = @EmpNo or t.NewEmpNo=@EmpNo) "); - } + } + if (!queryParam["CreateUserId"].IsEmpty()) + { + dp.Add("CreateUserId", queryParam["CreateUserId"].ToString(), DbType.String); + strSql.Append(" AND t.CreateUserId = @CreateUserId "); + } var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); - + return result; } catch (Exception ex) @@ -117,15 +122,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var db = this.BaseRepository("CollegeMIS").BeginTrans(); - var result=db.FindEntity(c => c.Id == keyValue); - //result.query = db.FindList(c => c.AttemperId == keyValue).ToList(); - result.query = db.FindList(@"select a.*,b.lessonname,b.EmpName,b.empno,c.classname,d.classroomname from ArrangeLessonTermAttrmperChild a + var result = db.FindEntity(c => c.Id == keyValue); + if (result != null) + { + result.query = db.FindList($@"select a.*,b.lessonname,b.EmpName,b.empno,c.classname,d.classroomname from ArrangeLessonTermAttrmperChild a left join arrangelessonterm b on a.LessonId=b.ALTId left join classinfo c on c.classno=replace(b.teachclassno,b.lessonname,'') - left join classroominfo d on d.classroomno=b.ClassroomNo").ToList(); + left join classroominfo d on d.classroomno=b.ClassroomNo + where 1=1 and a.AttemperId='{result.Id}' ").ToList(); + } return result; - - //return this.BaseRepository("CollegeMIS").FindEntity(keyValue); } catch (Exception ex) { @@ -151,13 +157,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var db = this.BaseRepository("CollegeMIS").BeginTrans(); var result = db.FindEntity(t => t.ProcessId == processId); - //result.query = db.FindList(c => c.AttemperId == keyValue).ToList(); - result.query = db.FindList(@"select a.*,b.lessonname,b.EmpName,b.empno,c.classname,d.classroomname from ArrangeLessonTermAttrmperChild a + if (result != null) + { + result.query = db.FindList($@"select a.*,b.lessonname,b.EmpName,b.empno,c.classname,d.classroomname from ArrangeLessonTermAttrmperChild a left join arrangelessonterm b on a.LessonId=b.ALTId left join classinfo c on c.classno=replace(b.teachclassno,b.lessonname,'') - left join classroominfo d on d.classroomno=b.ClassroomNo").ToList(); + left join classroominfo d on d.classroomno=b.ClassroomNo + where 1=1 and a.AttemperId='{result.Id}' ").ToList(); + } return result; - //return this.BaseRepository("CollegeMIS").FindEntity(t => t.ProcessId == processId); } catch (Exception ex) { @@ -214,23 +222,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { entity.Modify(keyValue); this.BaseRepository("CollegeMIS").Update(entity); - this.BaseRepository("CollegeMIS").Delete(c => c.AttemperId == keyValue); - foreach (ArrangeLessonTermAttrmperChildEntity item in entity.query) + if (entity.AttemperType == "04") { - item.AttemperId = entity.Id; - item.Create(); - this.BaseRepository("CollegeMIS").Insert(item); + this.BaseRepository("CollegeMIS").Delete(c => c.AttemperId == keyValue); + foreach (ArrangeLessonTermAttrmperChildEntity item in entity.query) + { + item.AttemperId = entity.Id; + item.Create(); + this.BaseRepository("CollegeMIS").Insert(item); + } } + } else { entity.Create(); this.BaseRepository("CollegeMIS").Insert(entity); - foreach (ArrangeLessonTermAttrmperChildEntity item in entity.query) + if (entity.AttemperType == "04") { - item.AttemperId = entity.Id; - item.Create(); - this.BaseRepository("CollegeMIS").Insert(item); + foreach (ArrangeLessonTermAttrmperChildEntity item in entity.query) + { + item.AttemperId = entity.Id; + item.Create(); + this.BaseRepository("CollegeMIS").Insert(item); + } } } } @@ -428,12 +443,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - else if(entity.AttemperType == "04")//调课 + else if (entity.AttemperType == "04")//调课 { - entity.query = db.FindList(@"select a.*,b.lessonname,b.EmpName,b.empno,c.classname,d.classroomname from ArrangeLessonTermAttrmperChild a + entity.query = db.FindList($@"select a.*,b.lessonname,b.EmpName,b.empno,c.classname,d.classroomname from ArrangeLessonTermAttrmperChild a left join arrangelessonterm b on a.LessonId=b.ALTId left join classinfo c on c.classno=replace(b.teachclassno,b.lessonname,'') - left join classroominfo d on d.classroomno=b.ClassroomNo").ToList(); + left join classroominfo d on d.classroomno=b.ClassroomNo + where 1=1 and a.AttemperId='{entity.Id}' ").ToList(); foreach (var item in entity.query) { string updatesql = "update ArrangeLessonTerm set LessonDate='" + item.NewLessonDate + "',LessonTime='" + item.NewLessonTime + "' where ALTId='" + item.LessonId + "'"; From 50769edfe20cda735973f6d42f1c07bb245ecbef Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 5 Sep 2023 18:22:20 +0800 Subject: [PATCH 11/32] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=85=8D=E7=BD=AE=E5=8E=BB=E6=8E=89=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_Desktop/Views/WeChatTemplet/Index.cshtml | 2 +- .../Areas/LR_Desktop/Views/WeChatTemplet/Index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.cshtml index a8599c269..a75f586e0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.cshtml @@ -12,7 +12,7 @@
-
+
 录入  修改  删除 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.js index 99e630fb1..98529dbce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.js @@ -65,7 +65,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LR_Desktop/WeChatTemplet/GetPageList', headData: [ { label: "模板名称", name: "TName", width: 100, align: "left" }, From 88ec220566566456bf7561b885da4dff5caadb96 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 6 Sep 2023 15:29:42 +0800 Subject: [PATCH 12/32] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=80=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingManagementController.cs | 26 +- .../Controllers/MeetingMinutesController.cs | 128 ++++ .../Controllers/MeetingNoticeController.cs | 128 ++++ .../MeetingSignInRecordController.cs | 19 - .../Views/MeetingManagement/Form.cshtml | 4 +- .../Views/MeetingManagement/FormView.cshtml | 8 +- .../Views/MeetingManagement/FormView.js | 17 +- .../Views/MeetingManagement/Index.cshtml | 4 +- .../Views/MeetingManagement/IndexAll.cshtml | 46 ++ .../Views/MeetingManagement/IndexAll.js | 145 +++++ .../MeetingManagement/IndexOfMyApply.cshtml | 10 +- .../Views/MeetingManagement/IndexOfMyApply.js | 56 +- .../MeetingManagement/IndexOfMyJoin.cshtml | 11 +- .../Views/MeetingManagement/IndexOfMyJoin.js | 185 +++++- .../Views/MeetingManagement/qrCode.cshtml | 23 + .../Views/MeetingManagement/qrCode.js | 116 ++++ .../Views/MeetingMinutes/Form.cshtml | 19 + .../Views/MeetingMinutes/Form.js | 54 ++ .../Views/MeetingMinutes/Index.cshtml | 43 ++ .../Views/MeetingMinutes/Index.js | 98 +++ .../Views/MeetingNotice/Form.cshtml | 15 + .../Views/MeetingNotice/Form.js | 54 ++ .../Views/MeetingNotice/Index.cshtml | 43 ++ .../Views/MeetingNotice/Index.js | 98 +++ .../Views/MeetingSignInRecord/Index.js | 2 + .../MeetingManagementApi.cs | 168 +++++ .../PersonnelManagement/MeetingMinutesApi.cs | 116 ++++ .../MeetingSignInRecordApi.cs | 137 ++++ .../PersonnelManagement/MeetingMinutesMap.cs | 29 + .../PersonnelManagement/MeetingNoticeMap.cs | 29 + .../MeetingManagement/MeetingManagementBLL.cs | 49 +- .../MeetingManagementIBLL.cs | 11 +- .../MeetingManagementService.cs | 172 ++++-- .../MeetingMinutes/MeetingMinutesBLL.cs | 149 +++++ .../MeetingMinutes/MeetingMinutesEntity.cs | 78 +++ .../MeetingMinutes/MeetingMinutesIBLL.cs | 56 ++ .../MeetingMinutes/MeetingMinutesService.cs | 198 ++++++ .../MeetingNotice/MeetingNoticeBLL.cs | 149 +++++ .../MeetingNotice/MeetingNoticeEntity.cs | 73 +++ .../MeetingNotice/MeetingNoticeIBLL.cs | 56 ++ .../MeetingNotice/MeetingNoticeService.cs | 198 ++++++ .../MeetingSignInRecordBLL.cs | 2 +- .../MeetingSignInRecordIBLL.cs | 2 +- .../MeetingSignInRecordService.cs | 61 +- .../MeetingManagement/list.vue | 147 ++++- .../MeetingManagement/single.vue | 583 +++++++++++------- .../MeetingManagement/singleFlow.vue | 277 +++++++++ .../MeetingManagement/single_old.vue | 272 ++++++++ .../PersonnelManagement/MeetingMy/list.vue | 67 +- .../PersonnelManagement/MeetingMy/single.vue | 38 +- .../MeetingSignInScan/list.vue | 49 +- 51 files changed, 4046 insertions(+), 472 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingNoticeMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeService.cs create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/singleFlow.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single_old.vue diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs index 04e2bc2b4..b003db4ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs @@ -57,7 +57,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return View(); } /// - /// 主页面-我参加的会议 + /// 主页面-我申请的会议 /// /// [HttpGet] @@ -65,13 +65,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { return View(); } - - /// - /// 报表统计 - /// - /// [HttpGet] - public ActionResult IndexStatistics() + public ActionResult IndexAll() + { + return View(); + } + [HttpGet] + public ActionResult qrCode() { return View(); } @@ -113,18 +113,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success(data); } /// - /// 获取报表数据 - /// - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetStatisticList(string queryJson) - { - var data = meetingManagementIBLL.GetStatisticList(queryJson); - return Success(data); - } - /// /// 获取表单数据 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs new file mode 100644 index 000000000..75c234822 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs @@ -0,0 +1,128 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesController : MvcControllerBase + { + private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = meetingMinutesIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingMinutesIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue ); + var jsonData = new { + MeetingMinutes = MeetingMinutesData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingMinutesIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); + MeetingMinutesEntity entity = strEntity.ToObject(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = userInfo.userId; + meetingMinutesIBLL.SaveEntity(userInfo,keyValue,entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs new file mode 100644 index 000000000..4a6d2da67 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs @@ -0,0 +1,128 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public class MeetingNoticeController : MvcControllerBase + { + private MeetingNoticeIBLL meetingNoticeIBLL = new MeetingNoticeBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = meetingNoticeIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingNoticeIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingNoticeData = meetingNoticeIBLL.GetMeetingNoticeEntity( keyValue ); + var jsonData = new { + MeetingNotice = MeetingNoticeData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingNoticeIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); + MeetingNoticeEntity entity = strEntity.ToObject(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = userInfo.userId; + meetingNoticeIBLL.SaveEntity(userInfo,keyValue,entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs index 697c4d0cf..f899ed8c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs @@ -37,25 +37,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { return View(); } - /// - /// 会议考勤 - /// - /// - [HttpGet] - public ActionResult IndexAttendance() - { - return View(); - } - /// - /// 会议考勤-查看 - /// - /// - [HttpGet] - public ActionResult FormViewAttendance() - { - return View(); - } - #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml index 949b5ee1e..4eecae013 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml @@ -21,11 +21,11 @@
会议开始时间*
- +
会议结束时间*
- +
会议记录者
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml index cc6d59681..5968422e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml @@ -22,11 +22,11 @@
会议开始时间*
- +
会议结束时间*
- +
会议记录者
@@ -44,9 +44,9 @@
联系电话*
-
+ @*
扫码签到
-
+
*@
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js index 5e536ad42..e4cbd9c77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js @@ -97,19 +97,12 @@ var bootstrap = function ($, learun) { }; // 保存数据 save = function (processId, callBack, i) { - var formData = $('body').lrGetFormData(); - if (!!processId) { - formData.ProcessId = processId; + if (!!callBack) { + var res = { + code: 200, data: {} + }; + callBack(res, i); } - var postData = { - strEntity: JSON.stringify(formData) - }; - $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(res, i); - } - }); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml index 3cb8f5afb..a4883b7a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml @@ -43,8 +43,8 @@  考勤  纪要  通知 -  审核通过 -  审核不通过 + @* 审核通过 +  审核不通过*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.cshtml new file mode 100644 index 000000000..009986977 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.cshtml @@ -0,0 +1,46 @@ +@{ + /**/ + + ViewBag.Title = "会议管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + +
+
+
+
+
+
+
+
+
+
会议主题
+ +
+
+
会议场地
+
+
+
+
申请人
+
+
+
+
+
+
+
+
+ +
+
+  查看 +  签到情况 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.js new file mode 100644 index 000000000..973a63287 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.js @@ -0,0 +1,145 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#CreateUser').lrUserSelect(0); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '查看会议工作', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + // 会议签到情况 + $('#lr_case').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '签到情况', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList', + headData: [ + { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" }, + { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" }, + { label: "开始时间", name: "BeginTime", width: 120, align: "left" }, + { label: "结束时间", name: "EndTime", width: 120, align: "left" }, + { + label: "会议记录者", name: "RecordPerson", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "联系人", name: "Linkman", width: 100, align: "left" }, + { label: "联系电话", name: "LinkPhone", width: 100, align: "left" }, + { + label: "申请人", name: "CreateUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "申请时间", name: "CreateTime", width: 120, align: "left" }, + { + label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已通过" : cellvalue == "2" ? "未通过" : cellvalue == "3" ? "审核中" : "未审核"; + } + }, + { + label: "审核人", name: "CheckUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + //callback(_data.name); + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name); + } + }); + } + }, + { + label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) { + return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value; + } + }, + ], + mainId: 'Id', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + // 发起流程 + var postData = { + schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml index baa5705a1..5a652902d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml @@ -4,6 +4,7 @@ ViewBag.Title = "会议管理"; Layout = "~/Views/Shared/_Index.cshtml"; } +
@@ -38,13 +39,16 @@  删除  查看  提交 +  二维码
-  考勤 + @* 考勤*@  纪要  通知 -  审核通过 -  审核不通过 +  签到情况 +  打印 + @* 审核通过 +  审核不通过*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js index 9be3e8340..dad876495 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js @@ -137,9 +137,34 @@ var bootstrap = function ($, learun) { }); } }); - // 考勤 // 纪要 + $('#lr_minutes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingMinutesIndex', + title: '会议纪要', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); // 通知 + $('#lr_notice').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingNoticeIndex', + title: '会议通知', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); // 审核通过 $('#lr_checkyes').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); @@ -176,6 +201,35 @@ var bootstrap = function ($, learun) { }); } }); + // 会议签到情况 + $('#lr_case').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '签到情况', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + // 查看 + $('#lr_print').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '二维码', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/qrCode?keyValue=' + keyValue, + width: 700, + height: 800, + btn: null + }); + } + }); + }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml index a7873c2ad..00e6f0a8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml @@ -1,7 +1,7 @@ @{ /**/ - ViewBag.Title = "我参加的会议"; + ViewBag.Title = "会议管理"; Layout = "~/Views/Shared/_Index.cshtml"; }
@@ -34,8 +34,15 @@
 查看 +  签到情况 +
+
+ @* 考勤*@ +  纪要 +  通知 + @* 审核通过 +  审核不通过*@
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js index 36c36c606..ab540e8ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js @@ -28,6 +28,79 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'addform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form', + width: 1000, + height: 800, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerForm({ + id: 'editform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue, + width: 1000, + height: 800, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已审核或审核中！"); + return false; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); // 查看 $('#lr_view').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); @@ -42,7 +115,106 @@ var bootstrap = function ($, learun) { }); } }); - + //提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == "1") { + learun.alert.warning("当前项已审核通过！"); + return false; + } else if (CheckStatus == "3") { + learun.alert.warning("当前项审核中！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); + // 纪要 + $('#lr_minutes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingMinutesIndex', + title: '会议纪要', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + // 通知 + $('#lr_notice').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingNoticeIndex', + title: '会议通知', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); + // 审核通过 + $('#lr_checkyes').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '1') { + learun.alert.warning("该项已审核通过！"); + return false; + } + learun.layerConfirm('是否确认审核通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 审核不通过 + $('#lr_checkno').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus == '2') { + learun.alert.warning("该项已审核不通过！"); + return false; + } + learun.layerConfirm('是否确认审核不通过该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 会议签到情况 + $('#lr_case').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '签到情况', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); }, // 初始化列表 initGird: function () { @@ -114,6 +286,17 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + // 发起流程 + var postData = { + schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } page.search(); }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.cshtml new file mode 100644 index 000000000..e2ced8208 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "会议管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
+ 打印 +
+
+
+
会议主题*
+ +
+
+
会议场地*
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js") +@Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js", "/Content/js/qrcode.min.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js new file mode 100644 index 000000000..66246133f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js @@ -0,0 +1,116 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; +var bootstrap = function ($, learun) { + "use strict"; + // 设置权限 + setAuthorize = function (data) { + if (!!data) { + for (var field in data) { + if (data[field].isLook != 1) {// 如果没有查看权限就直接移除 + $('#' + data[field].fieldId).parent().remove(); + } + else { + if (data[field].isEdit != 1) { + $('#' + data[field].fieldId).attr('disabled', 'disabled'); + if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) { + $('#' + data[field].fieldId).css({ 'padding-right': '58px' }); + $('#' + data[field].fieldId).find('.btn-success').remove(); + } + } + } + } + } + }; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#MeetingPlace').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList', + value: "ID", + text: "Name" + }); + $('#subprint').on('click', function () { + $('#form').jqprint(); + }) + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/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]); + } + //扫码签到 + makeCode(data[id].Id); + } + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId, param, callback) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/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 == 'MeetingManagement' && data[id]) { + keyValue = data[id].Id; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + callback && callback(); + } + // 验证数据是否填写完整 + validForm = function () { + if (!$('body').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + if (!!callBack) { + var res = { + code: 200, data: {} + }; + callBack(res, i); + } + }; + page.init(); +} +//扫码签到 +var qrcode = new QRCode(document.getElementById("qrCode"), { + width: 550, + height: 550 +}); +function makeCode(urls) { + qrcode.makeCode(urls); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml new file mode 100644 index 000000000..b8d27e31a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml @@ -0,0 +1,19 @@ +@{ + ViewBag.Title = "会议纪要"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
纪要标题*
+ +
+
+
纪要内容
+ +
+
+
附件上传
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js new file mode 100644 index 000000000..cb8645f13 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议纪要 + */ +var acceptClick; +var keyValue = request('keyValue'); +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#Files').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var data = $('body').lrGetFormData(); + data.MeetID = MeetID; + var postData = { + strEntity: JSON.stringify(data) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml new file mode 100644 index 000000000..8ddb98ebc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml @@ -0,0 +1,43 @@ +@{ + /**/ + + ViewBag.Title = "会议纪要"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
会议名称
+ +
+
+
纪要标题
+ +
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js new file mode 100644 index 000000000..c107383eb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js @@ -0,0 +1,98 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议纪要 + */ +var refreshGirdData; +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'MeetingMinutesform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?MeetID=' + MeetID, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingMinutesform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?keyValue=' + keyValue + '&MeetID=' + MeetID, + width: 600, + 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 + '/PersonnelManagement/MeetingMinutes/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetPageList', + headData: [ + { label: "会议", name: "MeetingTitle", width: 150, align: "left" }, + { label: "纪要标题", name: "Title", width: 150, align: "left" }, + { label: "内容", name: "Content", width: 150, align: "left" }, + { label: "创建时间", name: "CreateTime", width: 100, align: "left" }, + { label: "创建人", name: "CreateUser", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.MeetID = MeetID; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml new file mode 100644 index 000000000..655adb1a1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml @@ -0,0 +1,15 @@ +@{ + ViewBag.Title = "会议通知"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
通知标题*
+ +
+
+
通知内容
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingNotice/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js new file mode 100644 index 000000000..29ae06d53 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议通知 + */ +var acceptClick; +var keyValue = request('keyValue'); +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#Files').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var data = $('body').lrGetFormData(); + data.MeetID = MeetID; + var postData = { + strEntity: JSON.stringify(data) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml new file mode 100644 index 000000000..120f309a3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml @@ -0,0 +1,43 @@ +@{ + /**/ + + ViewBag.Title = "会议通知"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
会议名称
+ +
+
+
通知标题
+ +
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingNotice/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js new file mode 100644 index 000000000..df6bb776b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js @@ -0,0 +1,98 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议通知 + */ +var refreshGirdData; +var MeetID = request('MeetID');//会议ID +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'MeetingNoticeform', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Form?MeetID=' + MeetID, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'MeetingNoticeform', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Form?keyValue=' + keyValue + '&MeetID=' + MeetID, + width: 600, + 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 + '/PersonnelManagement/MeetingNotice/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/GetPageList', + headData: [ + { label: "会议", name: "MeetingTitle", width: 150, align: "left" }, + { label: "通知标题", name: "Title", width: 150, align: "left" }, + { label: "内容", name: "Content", width: 150, align: "left" }, + { label: "创建时间", name: "CreateTime", width: 100, align: "left" }, + { label: "创建人", name: "CreateUser", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'CreateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.MeetID = MeetID; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js index 22d437003..71293cb87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js @@ -5,6 +5,7 @@ * 描 述：会议签到记录 */ var refreshGirdData; +var MeetID = request('MeetID');//会议ID var bootstrap = function ($, learun) { "use strict"; var page = { @@ -126,6 +127,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.MeetID = MeetID; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs new file mode 100644 index 000000000..ca7d8a27d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs @@ -0,0 +1,168 @@ +using Nancy; +using Learun.Util; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System; +using Learun.Application.WorkFlow; + +namespace Learun.Application.WebApi +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 + /// + public class MeetingManagementApi : BaseApi + { + private MeetingManagementIBLL meetingManagementIBLL = new MeetingManagementBLL(); + private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL(); + + /// + /// 注册接口 + /// + public MeetingManagementApi() + : base("/learun/adms/PersonnelManagement/MeetingManagement") + { + Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Get["/shList"] = GetshList; + Post["/delete"] = DeleteForm; + Post["/save"] = SaveForm; + Post["/submit"] = Submit; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = meetingManagementIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = meetingManagementIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity(keyValue); + var jsonData = new + { + MeetingManagement = MeetingManagementData, + }; + return Success(jsonData); + } + + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetshList(dynamic _) + { + MeetingManagementEntity parameter = this.GetReqData(); + var MeetingManagement = meetingManagementIBLL.GetMeetingManagementEntityByProcessId(parameter.ProcessId); + return Success(MeetingManagement); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + meetingManagementIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + MeetingManagementEntity entity = parameter.strEntity.ToObject(); + entity.CreateUser = userInfo.userId; + entity.CreateTime = DateTime.Now; + entity.CheckStatus = "0"; + string id = meetingManagementIBLL.SaveEntity(this.userInfo, parameter.keyValue, entity); ; + var json = new + { + Id = id + }; + return Success(json); + } + ///// + ///// 提交 + ///// + ///// + ///// + //public Response Submit(dynamic _) + //{ + // string keyValue = this.GetReqData(); + // var processId = Guid.NewGuid().ToString(); + // meetingManagementIBLL.DoSubmit(keyValue, "1", processId); + // UserInfo userInfo = LoginUserInfo.Get(); + // nWFProcessIBLL.CreateFlow("MeetingManagementApply", processId, "", 1, "", userInfo); + // return Success("提交成功！"); + //} + + public Response Submit(dynamic _) + { + MeetingManagementEntity parameter = this.GetReqData(); + //string keyValue = this.GetReqData(); + //var processId = Guid.NewGuid().ToString(); + meetingManagementIBLL.DoSubmit(parameter.Id, "1", parameter.ProcessId); + //UserInfo userInfo = LoginUserInfo.Get(); + //nWFProcessIBLL.CreateFlow("0.1", processId, "", 1, "", userInfo); + return Success("提交成功！"); + } + #endregion + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity + { + public string keyValue { get; set; } + public string strEntity { get; set; } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs new file mode 100644 index 000000000..38893dd70 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs @@ -0,0 +1,116 @@ +using Nancy; +using Learun.Util; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.PersonnelManagement; +namespace Learun.Application.WebApi +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesApi : BaseApi + { + private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL(); + + /// + /// 注册接口 + /// + public MeetingMinutesApi() + : base("/Learun/adms/PersonnelManagement/MeetingMinutes") + { + Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Post["/delete"] = DeleteForm; + Post["/save"] = SaveForm; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = meetingMinutesIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = meetingMinutesIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue ); + var jsonData = new { + MeetingMinutes = MeetingMinutesData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + meetingMinutesIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + MeetingMinutesEntity entity = parameter.strEntity.ToObject(); + meetingMinutesIBLL.SaveEntity(this.userInfo,parameter.keyValue,entity); + return Success("保存成功！"); + } + #endregion + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity { + public string keyValue { get; set; } + public string strEntity{ get; set; } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs new file mode 100644 index 000000000..88d79efe0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs @@ -0,0 +1,137 @@ +using Nancy; +using Learun.Util; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.PersonnelManagement; +namespace Learun.Application.WebApi +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordApi : BaseApi + { + private MeetingSignInRecordIBLL meetingSignInRecordIBLL = new MeetingSignInRecordBLL(); + + /// + /// 注册接口 + /// + public MeetingSignInRecordApi() + : base("/learun/adms/PersonnelManagement/MeetingSignInRecord") + { + Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Post["/delete"] = DeleteForm; + Post["/save"] = SaveForm; + Get["/scan"] = Scan; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = meetingSignInRecordIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = meetingSignInRecordIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity(keyValue); + var jsonData = new + { + MeetingSignInRecord = MeetingSignInRecordData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + meetingSignInRecordIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + + /// + /// 会议扫码签到 + /// + /// + /// + public Response Scan(dynamic _) + { + ScanParam scanParam = this.GetReqData(); + var result = meetingSignInRecordIBLL.Scan(scanParam.userid, scanParam.meetid); + return Success(new { result }); + } + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + MeetingSignInRecordEntity entity = parameter.strEntity.ToObject(); + meetingSignInRecordIBLL.SaveEntity(this.userInfo, parameter.keyValue, entity); + return Success("保存成功！"); + } + #endregion + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity + { + public string keyValue { get; set; } + public string strEntity { get; set; } + } + + private class ScanParam + { + public string userid { get; set; } + public string meetid { get; set; } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs new file mode 100644 index 000000000..22f03f183 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesMap : EntityTypeConfiguration + { + public MeetingMinutesMap() + { + #region 表、主键 + //表 + this.ToTable("MEETINGMINUTES"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingNoticeMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingNoticeMap.cs new file mode 100644 index 000000000..1174c4b1c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingNoticeMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public class MeetingNoticeMap : EntityTypeConfiguration + { + public MeetingNoticeMap() + { + #region 表、主键 + //表 + this.ToTable("MEETINGNOTICE"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs index c39cfa2a1..6db1c2702 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs @@ -114,31 +114,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } - - /// - /// 获取MeetingManagement表实体数据 - /// 主键 - /// - /// - public DataTable GetStatisticList(string queryJson) - { - try - { - return meetingManagementService.GetStatisticList(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - #endregion #region 提交数据 @@ -172,11 +147,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// /// - public void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity) + public string SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity) { try { - meetingManagementService.SaveEntity(userInfo, keyValue, entity); + return meetingManagementService.SaveEntity(userInfo, keyValue, entity); } catch (Exception ex) { @@ -189,6 +164,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement throw ExceptionEx.ThrowBusinessException(ex); } } + return entity.Id; } /// @@ -262,6 +238,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } + public void ReceivedList(string processId) + { + try + { + meetingManagementService.ReceivedList(processId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs index 744cc0d95..236b539c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs @@ -40,12 +40,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// MeetingManagementEntity GetMeetingManagementEntityByProcessId(string processId); - /// - /// 获取报表数据 - /// - /// - /// - DataTable GetStatisticList(string queryJson); #endregion #region 提交数据 @@ -61,7 +55,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// /// - void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity); + string SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity); /// /// 审核实体数据 @@ -82,6 +76,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// void ChangeStatusByProcessId(string processId, string status, string userId); + + void ReceivedList(string processId); + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs index 23a1c40d0..c159ae22c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs @@ -1,11 +1,19 @@ using Dapper; using Learun.Application.Organization; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using Learun.Application.TwoDevelopment.LR_Desktop; using Learun.DataBase.Repository; using Learun.Util; +using Microsoft.AspNet.SignalR.Client; +using Newtonsoft.Json; 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; namespace Learun.Application.TwoDevelopment.PersonnelManagement { @@ -127,7 +135,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + var data = this.BaseRepository("CollegeMIS").FindEntity(keyValue); + if (data != null) + { + data.ConferenceRoomName = this.BaseRepository("CollegeMIS").FindEntity(data.MeetingPlace).Name; + } + return data; } catch (Exception ex) { @@ -166,55 +179,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } - /// - /// 获取报表数据 - /// - /// 查询参数 - /// - public DataTable GetStatisticList(string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.meetingtitle, - t.begintime, - t.endtime, - t.正常, - t.未到 - "); - strSql.Append(" FROM (select m.MeetingTitle,isnull(t.正常,0) 正常,isnull(t.未到,0) 未到,m.BeginTime,m.EndTime from MeetingManagement m left join (select meetid,sum(case issignin when 1 then 1 else 0 end) as 正常, sum(case issignin when 0 then 1 else 0 end) as 未到 from MeetingSignInRecord group by meetid) t on t.MeetID=m.Id)t "); - strSql.Append(" WHERE 1=1 "); - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - if (!queryParam["meetingtitle"].IsEmpty()) - { - dp.Add("meetingtitle", "%" + queryParam["meetingtitle"].ToString() + "%", DbType.String); - strSql.Append(" AND t.meetingtitle Like @meetingtitle "); - } - if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) - { - dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); - dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); - strSql.Append(" AND ( t.begintime >= @startTime AND t.begintime <= @endTime ) "); - } - return this.BaseRepository("CollegeMIS").FindTable(strSql.ToString(), dp); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion #region 提交数据 @@ -255,7 +219,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// /// - public void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity) + public string SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity) { var db = this.BaseRepository("CollegeMIS").BeginTrans(); try @@ -285,6 +249,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement throw ExceptionEx.ThrowServiceException(ex); } } + return entity.Id; } /// @@ -516,7 +481,112 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + public void ReceivedList(string processId) + { + var Received = GetMeetingManagementEntityByProcessId(processId); + List userInfos = new List(); + foreach (var rid in Received.InternalParticipants.Split(',')) + { + var user = this.BaseRepository().FindEntity(m => m.F_UserId == rid); + if (!userInfos.Contains(user)) + { + userInfos.Add(user); + } + } + if (!string.IsNullOrEmpty(Received.RecordPerson)) + { + foreach (var rid in Received.RecordPerson.Split(',')) + { + var user = this.BaseRepository().FindEntity(m => m.F_UserId == rid); + if (!userInfos.Contains(user)) + { + userInfos.Add(user); + } + } + } + //foreach (var uitem in userInfos) + //{ + // SYS_ReceiveMessageEntity receiveMessageEntity = new SYS_ReceiveMessageEntity(); + // receiveMessageEntity.Create(); + // receiveMessageEntity.SENDERID = Received.SENDERID; + // receiveMessageEntity.SENDER = messageentity.SENDER; + // receiveMessageEntity.RECEIVERID = uitem.F_UserId; + // receiveMessageEntity.RECEIVER = uitem.F_RealName; + // receiveMessageEntity.TITLE = messageentity.TITLE; + // receiveMessageEntity.CONTENTS = messageentity.CONTENTS; + // receiveMessageEntity.URL = messageentity.URL; + // receiveMessageEntity.READFLAG = 0; + // receiveMessageEntity.SENDTIME = DateTime.Now; + // receiveMessageEntity.DelFlag = false; + // this.BaseRepository().Insert(receiveMessageEntity); + //} + + //读取信息推送管理-会议申请推送（03）的配置 + var informationPushEntity = this.BaseRepository().FindEntity(x => x.PushItem == "03"); + if (informationPushEntity != null && informationPushEntity.Status == true) + { + //微信推送 + try + { + PushWeixin(userInfos, Received.MeetingTitle); + } + 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", Received.InternalParticipants, Received.MeetingTitle, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Received.Content)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Received.Content)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Received.Content)).Substring(0, 20), "mail", string.Join(",", userInfos.Select(m => m.F_UserId)), ""); + } + }); + } + } + 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); + } + } + } + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs new file mode 100644 index 000000000..91bbba6ec --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs @@ -0,0 +1,149 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesBLL : MeetingMinutesIBLL + { + private MeetingMinutesService meetingMinutesService = new MeetingMinutesService(); + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return meetingMinutesService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return meetingMinutesService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取MeetingMinutes表实体数据 + /// 主键 + /// + /// + public MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue) + { + try + { + return meetingMinutesService.GetMeetingMinutesEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + meetingMinutesService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(UserInfo userInfo, string keyValue, MeetingMinutesEntity entity) + { + try + { + meetingMinutesService.SaveEntity(userInfo, 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/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs new file mode 100644 index 000000000..2b5e62a69 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs @@ -0,0 +1,78 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesEntity + { + #region 实体成员 + /// + /// 编号 + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 会议id + /// + [Column("MEETID")] + public string MeetID { get; set; } + /// + /// 纪要标题 + /// + [Column("TITLE")] + public string Title { get; set; } + /// + /// 纪要内容 + /// + [Column("CONTENT")] + public string Content { get; set; } + /// + /// 附件 + /// + [Column("FILES")] + public string Files { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 创建人 + /// + [Column("CREATEUSER")] + public string CreateUser { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create(UserInfo userInfo) + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue, UserInfo userInfo) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + [NotMapped] + public string MeetingTitle { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs new file mode 100644 index 000000000..5ddfa91ac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs @@ -0,0 +1,56 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public interface MeetingMinutesIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 查询参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取MeetingMinutes表实体数据 + /// 主键 + /// + /// + MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(UserInfo userInfo, string keyValue, MeetingMinutesEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs new file mode 100644 index 000000000..97e8a7250 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs @@ -0,0 +1,198 @@ +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.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,m.MeetingTitle "); + strSql.Append(" FROM MeetingMinutes t left join MeetingManagement m on t.MeetID=m.Id "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } + if (!queryParam["MeetingTitle"].IsEmpty()) + { + dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String); + strSql.Append(" AND m.MeetingTitle Like @MeetingTitle "); + } + if (!queryParam["Title"].IsEmpty()) + { + dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Title Like @Title "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM MeetingMinutes t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } + if (!queryParam["Title"].IsEmpty()) + { + dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Title Like @Title "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MeetingMinutes表实体数据 + /// 主键 + /// + /// + public MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + 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( UserInfo userInfo, string keyValue, MeetingMinutesEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue,userInfo); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(userInfo); + 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/PersonnelManagement/MeetingNotice/MeetingNoticeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeBLL.cs new file mode 100644 index 000000000..eaed57786 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeBLL.cs @@ -0,0 +1,149 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public class MeetingNoticeBLL : MeetingNoticeIBLL + { + private MeetingNoticeService meetingNoticeService = new MeetingNoticeService(); + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return meetingNoticeService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return meetingNoticeService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取MeetingNotice表实体数据 + /// 主键 + /// + /// + public MeetingNoticeEntity GetMeetingNoticeEntity(string keyValue) + { + try + { + return meetingNoticeService.GetMeetingNoticeEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + meetingNoticeService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(UserInfo userInfo, string keyValue, MeetingNoticeEntity entity) + { + try + { + meetingNoticeService.SaveEntity(userInfo, 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/PersonnelManagement/MeetingNotice/MeetingNoticeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeEntity.cs new file mode 100644 index 000000000..309e8af08 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeEntity.cs @@ -0,0 +1,73 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public class MeetingNoticeEntity + { + #region 实体成员 + /// + /// 编号 + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 会议id + /// + [Column("MEETID")] + public string MeetID { get; set; } + /// + /// 通知标题 + /// + [Column("TITLE")] + public string Title { get; set; } + /// + /// 通知内容 + /// + [Column("CONTENT")] + public string Content { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 创建人 + /// + [Column("CREATEUSER")] + public string CreateUser { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create(UserInfo userInfo) + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue, UserInfo userInfo) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + [NotMapped] + public string MeetingTitle { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeIBLL.cs new file mode 100644 index 000000000..7d62b9682 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeIBLL.cs @@ -0,0 +1,56 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public interface MeetingNoticeIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 查询参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取MeetingNotice表实体数据 + /// 主键 + /// + /// + MeetingNoticeEntity GetMeetingNoticeEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(UserInfo userInfo, string keyValue, MeetingNoticeEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeService.cs new file mode 100644 index 000000000..7283d2195 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingNotice/MeetingNoticeService.cs @@ -0,0 +1,198 @@ +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.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议通知 + /// + public class MeetingNoticeService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,m.MeetingTitle "); + strSql.Append(" FROM MeetingNotice t left join MeetingManagement m on t.MeetID=m.Id "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } + if (!queryParam["MeetingTitle"].IsEmpty()) + { + dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String); + strSql.Append(" AND m.MeetingTitle Like @MeetingTitle "); + } + if (!queryParam["Title"].IsEmpty()) + { + dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Title Like @Title "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM MeetingNotice t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } + if (!queryParam["Title"].IsEmpty()) + { + dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Title Like @Title "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MeetingNotice表实体数据 + /// 主键 + /// + /// + public MeetingNoticeEntity GetMeetingNoticeEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + 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( UserInfo userInfo, string keyValue, MeetingNoticeEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue,userInfo); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(userInfo); + 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/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs index 8f0018280..c7acad931 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs @@ -167,7 +167,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } - public bool Scan(string scanParamUserid, string scanParamMeetid) + public string Scan(string scanParamUserid, string scanParamMeetid) { try { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs index 5f4d427a6..7adcd122e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs @@ -59,6 +59,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement void DoSignIn(string keyValue, bool isSignIn); #endregion - bool Scan(string scanParamUserid, string scanParamMeetid); + string Scan(string scanParamUserid, string scanParamMeetid); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs index 557dbdef8..bbe1cae66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs @@ -36,6 +36,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } if (!queryParam["MeetingTitle"].IsEmpty()) { dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String); @@ -46,18 +51,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement dp.Add("ParticipantName", "%" + queryParam["ParticipantName"].ToString() + "%", DbType.String); strSql.Append(" AND t.ParticipantName like @ParticipantName "); } - if (!queryParam["IsSignIn"].IsEmpty()) - { - if (queryParam["IsSignIn"].ToString() == "true") - { - strSql.Append(" AND t.IsSignIn=1 "); - } - else - { - strSql.Append(" AND t.IsSignIn=0 "); - } - - } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } @@ -223,20 +216,44 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement #endregion - public bool Scan(string scanParamUserid, string scanParamMeetid) + public string Scan(string scanParamUserid, string scanParamMeetid) { try { - var result = false; - var meetEntity = this.BaseRepository("CollegeMIS") - .FindEntity(a => - a.MeetID == scanParamMeetid && a.ParticipantID == scanParamUserid); - if (meetEntity != null) + var result = ""; + var meetEntity = this.BaseRepository("CollegeMIS").FindEntity(a => a.MeetID == scanParamMeetid && a.ParticipantID == scanParamUserid); + var date = DateTime.Now; + var meetEntityList = this.BaseRepository("CollegeMIS") + .FindEntity(x => x.Id == scanParamMeetid); + DateTime BeginTime = meetEntityList.BeginTime.ToDate(); + if (meetEntityList != null) { - meetEntity.IsSignIn = true; - this.BaseRepository("CollegeMIS").Update(meetEntity); - result = true; - + if (date.Subtract(BeginTime).Duration().Minutes <= 5 && BeginTime > date) + { + if (meetEntity != null) + { + meetEntity.IsSignIn = true; + meetEntity.SignInTime = date; + this.BaseRepository("CollegeMIS").Update(meetEntity); + result = "签到成功"; + } + else + { + result = "当前用户不可签到,签到失败"; + } + } + else if (BeginTime > date) + { + result = "会议未开始，签到失败"; + } + else + { + result = "签到失败!!!会议已开始"; + } + } + else + { + result = "签到失败"; } return result; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue index aae48d1d6..c13045f00 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue @@ -1,4 +1,4 @@ -