From 4e09542f5b54d67bf15e2cd07290cdb4da1731de Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 9 Sep 2022 16:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E8=B0=83=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/WorkStaffController.cs | 17 +- .../Views/WorkStaff/Form.cshtml | 4 + .../Views/WorkStaff/Form.js | 44 +++++ .../WorkStaffSon/WorkStaffSonBLL.cs | 147 ++++++++++++++++ .../WorkStaffSon/WorkStaffSonEntity.cs | 7 +- .../WorkStaffSon/WorkStaffSonIBLL.cs | 50 ++++++ .../WorkStaffSon/WorkStaffSonService.cs | 163 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 3 + 8 files changed, 426 insertions(+), 9 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WorkStaffController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WorkStaffController.cs index 166d10e7e..2c610663a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WorkStaffController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WorkStaffController.cs @@ -16,6 +16,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public class WorkStaffController : MvcControllerBase { private WorkStaffIBLL workStaffIBLL = new WorkStaffBLL(); + private WorkStaffSonIBLL workStaffSonIBLL = new WorkStaffSonBLL(); #region 视图功能 @@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,7 +36,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } #endregion @@ -71,9 +72,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var WorkStaffData = workStaffIBLL.GetWorkStaffEntity( keyValue ); - var jsonData = new { + var WorkStaffData = workStaffIBLL.GetWorkStaffEntity(keyValue); + var WorkStaffSonData = workStaffSonIBLL.GetByStaffId(WorkStaffData.ID); + var jsonData = new + { WorkStaff = WorkStaffData, + WorkStaffSon = WorkStaffSonData }; return Success(jsonData); } @@ -102,13 +106,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpPost] [ValidateAntiForgeryToken] [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity) + public ActionResult SaveForm(string keyValue, string strEntity, string WorkStaffSonList) { WorkStaffEntity entity = strEntity.ToObject(); - workStaffIBLL.SaveEntity(keyValue,entity); if (string.IsNullOrEmpty(keyValue)) { } + List WorkStaffSonntitEntity = WorkStaffSonList.ToObject>(); + workStaffIBLL.SaveEntity(keyValue, entity, WorkStaffSonntitEntity); return Success("保存成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml index 9c32ecace..ac39c542c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml @@ -79,5 +79,9 @@
近三年年度考核情况
+
家庭成员及社会关系
+
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WorkStaff/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.js index a8da52bd2..46bcf4ab6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.js @@ -15,6 +15,49 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#WorkStaffSon').jfGrid({ + headData: [ + { + label: '称谓', name: 'Title', width: 100, align: 'left' + , edit: { + type: 'input' + } + }, + { + label: '姓名', name: 'Name', width: 100, align: 'left' + , edit: { + type: 'input' + } + }, + { + label: '出身年月', name: 'Birthday', width: 100, align: 'left' + , edit: { + type: 'datatime', + dateformat: '0' + } + }, + { + label: '籍贯', name: 'Origin', width: 100, align: 'left' + , edit: { + type: 'input' + } + }, + { + label: '政治面貌', name: 'Political', width: 100, align: 'left' + , edit: { + type: 'input' + } + }, + { + label: '工作单位及职务', name: 'CompanyPost', width: 100, align: 'left' + , edit: { + type: 'input' + } + }, + ], + isEdit: true, + height: 200 + }); }, initData: function () { if (!!keyValue) { @@ -39,6 +82,7 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; + postData.WorkStaffSonList = JSON.stringify($('#WorkStaffSon').jfGridGet('rowdatas')); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/WorkStaff/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonBLL.cs new file mode 100644 index 000000000..05e8caa12 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonBLL.cs @@ -0,0 +1,147 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-09-09 11:42 + /// 描 述：公开选调工作人员报名表 + /// + public class WorkStaffSonBLL : WorkStaffSonIBLL + { + private WorkStaffSonService WorkStaffSonService = new WorkStaffSonService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return WorkStaffSonService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取WorkStaff表实体数据 + /// + /// 主键 + /// + public WorkStaffSonEntity GetWorkStaffSonEntity(string keyValue) + { + try + { + return WorkStaffSonService.GetWorkStaffSonEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 获取WorkStaff表实体数据 + /// + /// 主键 + /// + public IEnumerable GetByStaffId(string keyValue) + { + try + { + return WorkStaffSonService.GetByStaffId(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + WorkStaffSonService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, WorkStaffSonEntity entity) + { + try + { + WorkStaffSonService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonEntity.cs index 8bc2bcf82..a7f1709c7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2022-09-09 10:38 /// 描 述：家庭成员 /// - public class WorkStaffSonEntity + public class WorkStaffSonEntity { #region 实体成员 /// @@ -70,14 +70,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void Create() { + this.ID = Guid.NewGuid().ToString(); } /// /// 编辑调用 /// /// - public void Modify() + public void Modify(string keyValue) { - this.ID = Guid.NewGuid().ToString(); + this.ID = keyValue; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonIBLL.cs new file mode 100644 index 000000000..db8ad1c38 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonIBLL.cs @@ -0,0 +1,50 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-09-09 11:42 + /// 描 述：公开选调工作人员报名表 + /// + public interface WorkStaffSonIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取WorkStaff表实体数据 + /// + /// 主键 + /// + WorkStaffSonEntity GetWorkStaffSonEntity(string keyValue); + IEnumerable GetByStaffId(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, WorkStaffSonEntity entity); + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonService.cs new file mode 100644 index 000000000..4bee6538e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaffSon/WorkStaffSonService.cs @@ -0,0 +1,163 @@ +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.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-09-09 11:42 + /// 描 述：公开选调工作人员报名表 + /// + public class WorkStaffSonService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" * "); + strSql.Append(" FROM WorkStaffSon t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取WorkStaff表实体数据 + /// + /// 主键 + /// + public WorkStaffSonEntity GetWorkStaffSonEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 获取WorkStaff表实体数据 + /// + /// 主键 + /// + public IEnumerable GetByStaffId(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.StaffId == 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(string keyValue, WorkStaffSonEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index e731a06f4..e5286b12c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -329,6 +329,9 @@ + + +