From 8e662a66cdc043fd38257e53adc1c094681e579a Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 20 Jul 2022 10:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=B7=E5=81=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86+=E6=B5=81=E7=A8=8B=E6=9F=A5=E7=9C=8B=20=E6=9C=AA?= =?UTF-8?q?=E9=94=80=E5=81=87=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuLeaveManagementController.cs | 2 + .../Views/StuLeaveManagement/Form.cshtml | 8 +++- .../Views/StuLeaveManagement/FormView.cshtml | 6 ++- .../StuLeaveManagementBLL.cs | 23 ++++++++++- .../StuLeaveManagementEntity.cs | 2 + .../StuLeaveManagementIBLL.cs | 1 + .../StuLeaveManagementService.cs | 39 ++++++++++++++++--- 7 files changed, 72 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs index 8ddafdca0..97b9b5d0e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs @@ -119,6 +119,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetFormData(string keyValue) { var StuLeaveManagementData = stuLeaveManagementIBLL.GetStuLeaveManagementEntity(keyValue); + StuLeaveManagementData.num = stuLeaveManagementIBLL.Num(StuLeaveManagementData.CreateUserNo); var jsonData = new { StuLeaveManagement = StuLeaveManagementData, @@ -136,6 +137,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetFormDataByProcessId(string processId) { var StuLeaveManagementData = stuLeaveManagementIBLL.GetEntityByProcessId(processId); + StuLeaveManagementData.num = stuLeaveManagementIBLL.Num(StuLeaveManagementData.CreateUserNo); var jsonData = new { StuLeaveManagement = StuLeaveManagementData, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml index 08574f89c..c6e7e5af0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml @@ -15,9 +15,13 @@
返校时间*
-
+
请假天数*
- + +
+
+
未销假次数
+
附件上传
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml index 9dd976407..19728f453 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml @@ -15,10 +15,14 @@
返校时间*
-
+
请假天数*
+
+
未销假次数
+ +
附件上传
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs index 46c2533db..4aef237d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs @@ -190,6 +190,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion - + /// + /// 未销假实体数据 + /// + /// 主键 + public int Num(string CreateUserNo) + { + try + { + return stuLeaveManagementService.CreateUserNo(CreateUserNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs index 0d2f3fac3..853c972c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs @@ -126,6 +126,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string ClassDiredctorNo { get; set; } [NotMapped] public string ClassTutorNo { get; set; } + [NotMapped] + public int? num { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs index 2842707a4..3ba13f447 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs @@ -63,5 +63,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void ChangeStatusByProcessId(string status, string processId, string userId); #endregion + int Num(string CreateUserNo); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs index 940a1e94d..48da054f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs @@ -42,12 +42,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var dp = new DynamicParameters(new { }); if (!queryParam["LeaveType"].IsEmpty()) { - dp.Add("LeaveType",queryParam["LeaveType"].ToString(), DbType.String); + dp.Add("LeaveType", queryParam["LeaveType"].ToString(), DbType.String); strSql.Append(" AND t.LeaveType = @LeaveType "); } if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("CheckStatus",queryParam["CheckStatus"].ToString(), DbType.String); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["StuNo"].IsEmpty()) @@ -93,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration // strSql.Append(" ) "); // } //} - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -168,7 +168,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.Id == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); } catch (Exception ex) { @@ -263,6 +263,35 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion - + /// + /// 未销假次数 + /// + /// + /// + public int CreateUserNo(string CreateUserNo) + { + try + { + var HisTime = DateTime.Now.AddDays(-30); + StringBuilder sb = new StringBuilder(); + sb.Append(@"SELECT count(*) as num FROM StuLeaveManagement t + left join StuCancelLeaveManagement t2 on t.Id=t2.LeaveId WHERE 1=1 and(t2.CheckStatus !=2 or t2.CheckStatus is null) + and t.checktime <='" + DateTime.Now + "' and t.checktime >='" + HisTime + "' and t.CreateUserNo='" + CreateUserNo + "' "); + var data = this.BaseRepository("CollegeMIS").FindList(sb.ToString()); + if (data.Count() > 0) + { + foreach (var item in data) + { + return Convert.ToInt32(item.num); + } + } + return 0; + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } + } } }