diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DepartmentWeekController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DepartmentWeekController.cs
new file mode 100644
index 000000000..44a9b5584
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DepartmentWeekController.cs
@@ -0,0 +1,179 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ /// Copyright (c) 2013-2020 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 14:13
+ /// 描 述:DepartmentWeek
+ ///
+ public class DepartmentWeekController : MvcControllerBase
+ {
+ private DepartmentWeekIBLL departmentWeekIBLL = new DepartmentWeekBLL();
+
+ #region 视图功能
+
+ ///
+ /// 主页面
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Index()
+ {
+ return View();
+ }
+ ///
+ /// 表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Form()
+ {
+ return View();
+ }
+ public ActionResult FormView()
+ {
+ return View();
+ }
+ public ActionResult FormLook()
+ {
+ return View();
+ }
+ #endregion
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetPageList(string pagination, string queryJson)
+ {
+ Pagination paginationobj = pagination.ToObject();
+ var data = departmentWeekIBLL.GetPageList(paginationobj, queryJson);
+ var jsonData = new
+ {
+ rows = data,
+ total = paginationobj.total,
+ page = paginationobj.page,
+ records = paginationobj.records
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ /// 主键
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetFormData(string keyValue)
+ {
+ var DepartmentWeekData = departmentWeekIBLL.GetDepartmentWeekEntity(keyValue);
+ var Firset = departmentWeekIBLL.GetDetail(DepartmentWeekData.ID, "1");
+ var Second = departmentWeekIBLL.GetDetail(DepartmentWeekData.ID, "2");
+ var jsonData = new
+ {
+ DepartmentWeek = DepartmentWeekData,
+ Firset = Firset,
+ Second = Second,
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ /// 流程实例主键
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetFormDataByProcessId(string processId)
+ {
+ var DepartmentWeekData = departmentWeekIBLL.GetEntityByProcessId(processId);
+ var Firset = departmentWeekIBLL.GetDetail(DepartmentWeekData.ID, "1");
+ var Second = departmentWeekIBLL.GetDetail(DepartmentWeekData.ID, "2");
+ var jsonData = new
+ {
+ DepartmentWeek = DepartmentWeekData,
+ Firset = Firset,
+ Second = Second,
+ };
+ return Success(jsonData);
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DeleteForm(string keyValue)
+ {
+ departmentWeekIBLL.DeleteEntity(keyValue);
+ return Success("删除成功!");
+ }
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult SaveForm(string keyValue, string strEntity, string Firset, string Second)
+ {
+ DepartmentWeekEntity entity = strEntity.ToObject();
+
+ List FirsetDetail = Firset.ToObject>();
+ List SecondDetail = Second.ToObject>();
+
+ departmentWeekIBLL.SaveEntity(keyValue, entity, FirsetDetail, SecondDetail);
+ if (string.IsNullOrEmpty(keyValue))
+ {
+ }
+ return Success("保存成功!");
+ }
+ ///
+ /// 推送
+ ///
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult PushForm()
+ {
+ departmentWeekIBLL.PushEntity();
+ return Success("推送成功!");
+ }
+ ///
+ /// 推送
+ ///
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult ChangeStatusById(string keyValue, int status, string processId)
+ {
+ departmentWeekIBLL.ChangeStatusById(keyValue, status, processId);
+ return Success("提交成功!");
+ }
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Form.cshtml
new file mode 100644
index 000000000..21e543510
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Form.cshtml
@@ -0,0 +1,34 @@
+@{
+ ViewBag.Title = "DepartmentWeek";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+@*
+*@
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/DepartmentWeek/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Form.js
new file mode 100644
index 000000000..501d08290
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Form.js
@@ -0,0 +1,184 @@
+/* * 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ * Copyright (c) 2013-2020 北京泉江科技有限公司
+ * 创建人:超级管理员
+ * 日 期:2024-12-18 14:13
+ * 描 述:DepartmentWeek
+ */
+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 () {
+ $('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+ $('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
+ $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+ $('#Firset').jfGrid({
+ headData: [
+ {
+ label: '主要工作', name: 'MainWork', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '完成时限', name: 'TimeLimitFinish', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '责任人及关联部门', name: 'PersonAndDepartment', width: 120, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '对接专项任务', name: 'QuestSpecialProject', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '备注', name: 'Remark', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ ],
+ isEdit: true,
+ height: 200
+ });
+
+ $('#Second').jfGrid({
+ headData: [
+ {
+ label: '主要工作', name: 'MainWork', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '完成时限', name: 'TimeLimitFinish', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '责任人及关联部门', name: 'PersonAndDepartment', width: 120, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '对接专项任务', name: 'QuestSpecialProject', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '备注', name: 'Remark', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ ],
+ isEdit: true,
+ height: 200
+ });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/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]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 设置表单数据
+ setFormData = function (processId, param, callback) {
+ if (!!processId) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/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 == 'DepartmentWeek' && 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) {
+ var formData = $('body').lrGetFormData();
+ if (!!processId) {
+ formData.ProcessId = processId;
+ }
+ //var postData = {
+ // strEntity: JSON.stringify(formData)
+ //};
+ var postData = {};
+ postData.strEntity = JSON.stringify($('[data-table="DepartmentWeek"]').lrGetFormData());
+ postData.Firset = JSON.stringify($('#Firset').jfGridGet('rowdatas'));
+ postData.Second = JSON.stringify($('#Second').jfGridGet('rowdatas'));
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack(res, i);
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.cshtml
new file mode 100644
index 000000000..0c6a0280b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.cshtml
@@ -0,0 +1,34 @@
+@{
+ ViewBag.Title = "DepartmentWeek";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+@*
+*@
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.js
new file mode 100644
index 000000000..256b7a9ea
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormLook.js
@@ -0,0 +1,164 @@
+/* * 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ * Copyright (c) 2013-2020 北京泉江科技有限公司
+ * 创建人:超级管理员
+ * 日 期:2024-12-18 14:13
+ * 描 述:DepartmentWeek
+ */
+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 () {
+ $('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+ $('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
+ $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+ $('#Firset').jfGrid({
+ headData: [
+ {
+ label: '主要工作', name: 'MainWork', width: 100, align: 'left'
+ ,
+ },
+ {
+ label: '完成时限', name: 'TimeLimitFinish', width: 100, align: 'left'
+
+ },
+ {
+ label: '责任人及关联部门', name: 'PersonAndDepartment', width: 120, align: 'left'
+
+ },
+ {
+ label: '对接专项任务', name: 'QuestSpecialProject', width: 100, align: 'left'
+
+ },
+ {
+ label: '备注', name: 'Remark', width: 100, align: 'left'
+
+ },
+ ],
+ isEdit: false,
+ height: 200
+ });
+
+ $('#Second').jfGrid({
+ headData: [
+ {
+ label: '主要工作', name: 'MainWork', width: 100, align: 'left'
+
+ },
+ {
+ label: '完成时限', name: 'TimeLimitFinish', width: 100, align: 'left'
+
+ },
+ {
+ label: '责任人及关联部门', name: 'PersonAndDepartment', width: 120, align: 'left'
+
+ },
+ {
+ label: '对接专项任务', name: 'QuestSpecialProject', width: 100, align: 'left'
+
+ },
+ {
+ label: '备注', name: 'Remark', width: 100, align: 'left'
+
+ },
+ ],
+ isEdit: false,
+ height: 200
+ });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/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]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 设置表单数据
+ setFormData = function (processId, param, callback) {
+ if (!!processId) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/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 == 'DepartmentWeek' && 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) {
+ var formData = $('body').lrGetFormData();
+ if (!!processId) {
+ formData.ProcessId = processId;
+ }
+ //var postData = {
+ // strEntity: JSON.stringify(formData)
+ //};
+ var postData = {};
+ postData.strEntity = JSON.stringify($('[data-table="DepartmentWeek"]').lrGetFormData());
+ postData.Firset = JSON.stringify($('#Firset').jfGridGet('rowdatas'));
+ postData.Second = JSON.stringify($('#Second').jfGridGet('rowdatas'));
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack(res, i);
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.cshtml
new file mode 100644
index 000000000..2ec67ee76
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.cshtml
@@ -0,0 +1,34 @@
+@{
+ ViewBag.Title = "DepartmentWeek";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+@*
+*@
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.js
new file mode 100644
index 000000000..501d08290
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/FormView.js
@@ -0,0 +1,184 @@
+/* * 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ * Copyright (c) 2013-2020 北京泉江科技有限公司
+ * 创建人:超级管理员
+ * 日 期:2024-12-18 14:13
+ * 描 述:DepartmentWeek
+ */
+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 () {
+ $('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+ $('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
+ $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+ $('#Firset').jfGrid({
+ headData: [
+ {
+ label: '主要工作', name: 'MainWork', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '完成时限', name: 'TimeLimitFinish', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '责任人及关联部门', name: 'PersonAndDepartment', width: 120, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '对接专项任务', name: 'QuestSpecialProject', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '备注', name: 'Remark', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ ],
+ isEdit: true,
+ height: 200
+ });
+
+ $('#Second').jfGrid({
+ headData: [
+ {
+ label: '主要工作', name: 'MainWork', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '完成时限', name: 'TimeLimitFinish', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '责任人及关联部门', name: 'PersonAndDepartment', width: 120, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '对接专项任务', name: 'QuestSpecialProject', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ {
+ label: '备注', name: 'Remark', width: 100, align: 'left'
+ , edit: {
+ type: 'input'
+ }
+ },
+ ],
+ isEdit: true,
+ height: 200
+ });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/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]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 设置表单数据
+ setFormData = function (processId, param, callback) {
+ if (!!processId) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/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 == 'DepartmentWeek' && 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) {
+ var formData = $('body').lrGetFormData();
+ if (!!processId) {
+ formData.ProcessId = processId;
+ }
+ //var postData = {
+ // strEntity: JSON.stringify(formData)
+ //};
+ var postData = {};
+ postData.strEntity = JSON.stringify($('[data-table="DepartmentWeek"]').lrGetFormData());
+ postData.Firset = JSON.stringify($('#Firset').jfGridGet('rowdatas'));
+ postData.Second = JSON.stringify($('#Second').jfGridGet('rowdatas'));
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack(res, i);
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Index.cshtml
new file mode 100644
index 000000000..420746518
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Index.cshtml
@@ -0,0 +1,42 @@
+@{
+ ViewBag.Title = "DepartmentWeek";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/DepartmentWeek/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Index.js
new file mode 100644
index 000000000..9e296f796
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DepartmentWeek/Index.js
@@ -0,0 +1,246 @@
+/* * 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ * Copyright (c) 2013-2020 北京泉江科技有限公司
+ * 创建人:超级管理员
+ * 日 期:2024-12-18 14:13
+ * 描 述:DepartmentWeek
+ */
+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);
+ $('#CreateUser').lrUserSelect(0);
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 新增
+ $('#lr_add').on('click', function () {
+ learun.layerForm({
+ id: 'form',
+ title: '新增',
+ url: top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/Form',
+ width: 1000,
+ height: 650,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ processId = learun.newGuid();
+ res = top[id].save(processId, refreshGirdData);
+ page.search();
+ }
+ page.search();
+ return res;
+ }
+ });
+ });
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var Status = $('#gridtable').jfGridValue('Status');
+ if (Status !== 0) {
+ learun.alert.warning("当前项目已提交,不可编辑!");
+ return;
+ }
+ learun.layerForm({
+ id: 'form',
+ title: '编辑',
+ url: top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/Form?keyValue=' + keyValue,
+ width: 1000,
+ height: 650,
+ 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 Status = $('#gridtable').jfGridValue('Status');
+ if (Status !== 0) {
+ learun.alert.warning("当前项目已提交,不可删除!");
+ return;
+ }
+ learun.layerConfirm('是否确认删除该项!', function (res) {
+ if (res) {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/DeleteForm', { keyValue: keyValue }, function () {
+ page.search();
+ });
+ }
+ });
+ }
+ });
+ // 打印
+ $('#lr_print').on('click', function () {
+ $('#gridtable').jqprintTable();
+ });
+ // 提交
+ $('#lr_submit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var Status = $('#gridtable').jfGridValue('Status');
+ if (Status !== 0) {
+ learun.alert.warning("当前项目已提交,请耐心等待审批!");
+ return;
+ }
+ learun.layerConfirm('是否确认提交该项!', function (res) {
+ if (res) {
+ processId = learun.newGuid();
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/ChangeStatusById', { keyValue: keyValue, status: 1, processId: processId }, function (res) {
+ // 发起流程
+ var postData = {
+ schemeCode: 'DepartmentWeek',// 填写流程对应模板编号
+ processId: processId,
+ level: '1',
+ };
+ learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+ learun.loading(false);
+ });
+ page.search();
+ });
+ }
+ });
+ }
+ });
+ // 推送
+ $('#lr_push').on('click', function () {
+ //var keyValue = $('#gridtable').jfGridValue('ID');
+ //if (learun.checkrow(keyValue)) {
+ // var Status = $('#gridtable').jfGridValue('Status');
+ // if (Status !== 2) {
+ // learun.alert.warning("当前项目不可推送!");
+ // return;
+ // }
+ // learun.postForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/PushForm', {}, function () {
+ // page.search();
+ // });
+ //}
+
+ //if (learun.checkrow(keyValue)) {
+ //var Status = $('#gridtable').jfGridValue('Status');
+ //if (Status !== 2) {
+ // learun.alert.warning("当前项目不可推送!");
+ // return;
+ //}
+ learun.layerConfirm('是否确认一键推送所有已审核项!', function (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/PushForm', {}, function () {
+ page.search();
+ });
+ });
+ //}
+
+ });
+ //查看
+ $('#lr_view').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ if (keyValue.indexOf(',') != -1) {
+ learun.alert.warning("只能选择一条记录进行查看!");
+ return;
+ }
+ learun.layerForm({
+ id: 'form',
+ title: '查看',
+ url: top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/FormView?keyValue=' + keyValue,
+ width: 1000,
+ height: 650,
+ btn: null
+ });
+ }
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/DepartmentWeek/GetPageList',
+ headData: [
+ { label: "标题", name: "Title", width: 100, align: "left" },
+ {
+ label: "状态", name: "Status", width: 100, align: "left",
+ formatter: function (cellvalue) {
+ if (cellvalue == 0) {
+ return "草稿";
+ } else if (cellvalue == 1) {
+ return "审批中";
+ } else if (cellvalue == 2) {
+ return "审批通过";
+ } else if (cellvalue == 3) {
+ return "推送";
+ } else {
+ return "作废";
+ }
+ }
+ },
+ {
+ 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: 100, align: "left",
+ formatter: function (cellvalue) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss');
+ }
+ },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ sidx: "CreateTime"
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function (res, postData) {
+ refreshGirdData = function () {
+ page.search();
+ };
+ //if (!!res) {
+ // if (res.code == 200 && processId != null) {
+ // // 发起流程
+ // var postData = {
+ // schemeCode: 'DepartmentWeek',// 填写流程对应模板编号
+ // 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/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 2a427505d..deb9e2f33 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
@@ -922,6 +922,7 @@
+
@@ -1094,6 +1095,8 @@
+
+
@@ -1136,6 +1139,8 @@
+
+
@@ -7242,6 +7247,10 @@
+
+
+
+
@@ -7263,7 +7272,9 @@
Designer
-
+
+ Designer
+
Designer
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config
index f1e795bbd..35614ebfa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config
@@ -39,6 +39,7 @@
+
@@ -88,6 +89,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DepartmentWeekDetailMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DepartmentWeekDetailMap.cs
new file mode 100644
index 000000000..27c5eb52c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DepartmentWeekDetailMap.cs
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ /// Copyright (c) 2013-2020 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 15:37
+ /// 描 述:DepartmentWeekDetail
+ ///
+ public class DepartmentWeekDetailMap : EntityTypeConfiguration
+ {
+ public DepartmentWeekDetailMap()
+ {
+ #region 表、主键
+ //表
+ this.ToTable("DEPARTMENTWEEKDETAIL");
+ //主键
+ this.HasKey(t => t.ID);
+ #endregion
+
+ #region 配置关系
+ #endregion
+ }
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DepartmentWeekMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DepartmentWeekMap.cs
new file mode 100644
index 000000000..44e8bb0ec
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DepartmentWeekMap.cs
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ /// Copyright (c) 2013-2020 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 14:13
+ /// 描 述:DepartmentWeek
+ ///
+ public class DepartmentWeekMap : EntityTypeConfiguration
+ {
+ public DepartmentWeekMap()
+ {
+ #region 表、主键
+ //表
+ this.ToTable("DEPARTMENTWEEK");
+ //主键
+ this.HasKey(t => t.ID);
+ #endregion
+
+ #region 配置关系
+ #endregion
+ }
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index 122a45ca7..ab6ed6fb9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
@@ -683,6 +683,8 @@
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekBLL.cs
new file mode 100644
index 000000000..385fd2877
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekBLL.cs
@@ -0,0 +1,249 @@
+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 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 14:13
+ /// 描 述:DepartmentWeek
+ ///
+ public class DepartmentWeekBLL : DepartmentWeekIBLL
+ {
+ private DepartmentWeekService departmentWeekService = new DepartmentWeekService();
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ public IEnumerable GetPageList(Pagination pagination, string queryJson)
+ {
+ try
+ {
+ return departmentWeekService.GetPageList(pagination, queryJson);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取DepartmentWeek表实体数据
+ ///
+ /// 主键
+ ///
+ public DepartmentWeekEntity GetDepartmentWeekEntity(string keyValue)
+ {
+ try
+ {
+ return departmentWeekService.GetDepartmentWeekEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 获取DepartmentWeek表实体数据
+ ///
+ /// 主键
+ ///
+ public IEnumerable GetDetail(string keyValue, string types)
+ {
+ try
+ {
+ return departmentWeekService.GetDetail(keyValue, types);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 获取主表实体数据
+ ///
+ /// 流程实例ID
+ ///
+ public DepartmentWeekEntity GetEntityByProcessId(string processId)
+ {
+ try
+ {
+ return departmentWeekService.GetEntityByProcessId(processId);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ public void DeleteEntity(string keyValue)
+ {
+ try
+ {
+ departmentWeekService.DeleteEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ public void SaveEntity(string keyValue, DepartmentWeekEntity entity)
+ {
+ try
+ {
+ departmentWeekService.SaveEntity(keyValue, entity);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ public void SaveEntity(string keyValue, DepartmentWeekEntity entity, List Firset, List Second)
+ {
+ try
+ {
+ departmentWeekService.SaveEntity(keyValue, entity, Firset, Second);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ public void ChangeStatusById(string keyValue, int status, string processId)
+ {
+ try
+ {
+ departmentWeekService.ChangeStatusById(keyValue, status, processId);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+
+ public void ChangeStatusByProcessId(int status, string processId)
+ {
+ try
+ {
+ departmentWeekService.ChangeStatusByProcessId(status, processId);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ public void PushEntity()
+ {
+ try
+ {
+ departmentWeekService.PushEntity();
+ }
+ 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/DepartmentWeek/DepartmentWeekEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekEntity.cs
new file mode 100644
index 000000000..2c991f0a0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekEntity.cs
@@ -0,0 +1,87 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ /// Copyright (c) 2013-2020 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 14:13
+ /// 描 述:DepartmentWeek
+ ///
+ public class DepartmentWeekEntity
+ {
+ #region 实体成员
+ ///
+ /// ID
+ ///
+ [Column("ID")]
+ public string ID { get; set; }
+ ///
+ /// Title
+ ///
+ [Column("TITLE")]
+ public string Title { get; set; }
+ ///
+ /// Firset
+ ///
+ [Column("FIRSET")]
+ public string Firset { get; set; }
+ ///
+ /// Second
+ ///
+ [Column("SECOND")]
+ public string Second { get; set; }
+ ///
+ /// Remark
+ ///
+ [Column("REMARK")]
+ public string Remark { get; set; }
+ ///
+ /// CreateTime
+ ///
+ [Column("CREATETIME")]
+ public DateTime? CreateTime { get; set; }
+ ///
+ /// CreateUser
+ ///
+ [Column("CREATEUSER")]
+ public string CreateUser { get; set; }
+ ///
+ /// ProcessId
+ ///
+ [Column("PROCESSID")]
+ public string ProcessId { get; set; }
+ ///
+ /// STATUS
+ ///
+ [Column("STATUS")]
+ public int? Status { get; set; }
+ #endregion
+
+ #region 扩展操作
+ ///
+ /// 新增调用
+ ///
+ public void Create()
+ {
+ this.ID = Guid.NewGuid().ToString();
+ this.Status = 0;
+ }
+ ///
+ /// 编辑调用
+ ///
+ ///
+ public void Modify(string keyValue)
+ {
+ this.ID = keyValue;
+ }
+ #endregion
+ #region 扩展字段
+ #endregion
+ }
+}
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekIBLL.cs
new file mode 100644
index 000000000..0150606a1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekIBLL.cs
@@ -0,0 +1,70 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ /// Copyright (c) 2013-2020 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 14:13
+ /// 描 述:DepartmentWeek
+ ///
+ public interface DepartmentWeekIBLL
+ {
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ IEnumerable GetPageList(Pagination pagination, string queryJson);
+ ///
+ /// 获取DepartmentWeek表实体数据
+ ///
+ /// 主键
+ ///
+ DepartmentWeekEntity GetDepartmentWeekEntity(string keyValue);
+ IEnumerable GetDetail(string keyValue, string types);
+
+ ///
+ /// 获取主表实体数据
+ ///
+ /// 流程实例ID
+ ///
+ DepartmentWeekEntity GetEntityByProcessId(string processId);
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ void DeleteEntity(string keyValue);
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ void SaveEntity(string keyValue, DepartmentWeekEntity entity);
+
+
+ void SaveEntity(string keyValue, DepartmentWeekEntity entity, List First, List Second);
+ ///
+ /// 推送
+ ///
+ ///
+ void PushEntity();
+ ///
+ /// 提交
+ ///
+ void ChangeStatusById(string keyValue, int status, string processId);
+ void ChangeStatusByProcessId(int status, string processId);
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekService.cs
new file mode 100644
index 000000000..46110bee5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeek/DepartmentWeekService.cs
@@ -0,0 +1,349 @@
+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 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 14:13
+ /// 描 述:DepartmentWeek
+ ///
+ public class DepartmentWeekService : RepositoryFactory
+ {
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ public IEnumerable GetPageList(Pagination pagination, string queryJson)
+ {
+ try
+ {
+ var strSql = new StringBuilder();
+ strSql.Append("SELECT ");
+ strSql.Append(@" t.* ");
+ strSql.Append(" FROM DepartmentWeek t ");
+ strSql.Append(" WHERE 1=1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["CreateUser"].IsEmpty())
+ {
+ dp.Add("CreateUser", queryParam["CreateUser"].ToString(), DbType.String);
+ strSql.Append(" AND t.CreateUser = @CreateUser ");
+ }
+ return this.BaseRepository().FindList(strSql.ToString(), dp, pagination);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取DepartmentWeek表实体数据
+ ///
+ /// 主键
+ ///
+ public DepartmentWeekEntity GetDepartmentWeekEntity(string keyValue)
+ {
+ try
+ {
+ return this.BaseRepository().FindEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取StuInfoFreshEmergePeople表数据
+ ///
+ ///
+ public IEnumerable GetDetail(string keyValue, string Types)
+ {
+ try
+ {
+ return this.BaseRepository().FindList(t => t.DWeekID == keyValue && t.Types == Types);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 获取主表实体数据
+ ///
+ /// 流程实例ID
+ ///
+ public DepartmentWeekEntity GetEntityByProcessId(string processId)
+ {
+ try
+ {
+ return this.BaseRepository().FindEntity(t => t.ProcessId == processId);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ public void DeleteEntity(string keyValue)
+ {
+ var db = this.BaseRepository().BeginTrans();
+ try
+ {
+ var id = keyValue.Split(',');
+ foreach (var item in id)
+ {
+ db.Delete(t => t.ID == item);
+ db.Delete(t => t.DWeekID == item);
+ db.Commit();
+ }
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ public void SaveEntity(string keyValue, DepartmentWeekEntity entity)
+ {
+ try
+ {
+ if (!string.IsNullOrEmpty(keyValue))
+ {
+ entity.Modify(keyValue);
+ this.BaseRepository().Update(entity);
+ }
+ else
+ {
+ entity.Create();
+ this.BaseRepository().Insert(entity);
+ }
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ public void SaveEntity(string keyValue, DepartmentWeekEntity entity, List First, List Second)
+ {
+ var db = this.BaseRepository().BeginTrans();
+ try
+ {
+ if (!string.IsNullOrEmpty(keyValue))
+ {
+ var up = GetDepartmentWeekEntity(keyValue);
+ entity.Modify(keyValue);
+ db.Update(entity);
+ db.Delete(t => t.DWeekID == up.ID);
+ if (null != First && null != Second)
+ {
+ foreach (DepartmentWeekDetailEntity item in First)
+ {
+ item.Create();
+ item.DWeekID = up.ID;
+ item.Types = "1";
+ item.CreateTime = DateTime.Now;
+ db.Insert(item);
+ }
+ db.Delete(t => t.DWeekID == up.ID);
+ foreach (DepartmentWeekDetailEntity item in Second)
+ {
+ item.Create();
+ item.DWeekID = up.ID;
+ item.Types = "2";
+ item.CreateTime = DateTime.Now;
+ db.Insert(item);
+ }
+ }
+ }
+ else
+ {
+ entity.Create();
+ db.Insert(entity);
+ if (null != First && null != Second)
+ {
+ foreach (DepartmentWeekDetailEntity item in First)
+ {
+ item.Create();
+ item.DWeekID = entity.ID;
+ item.Types = "1";
+ item.CreateTime = DateTime.Now;
+ db.Insert(item);
+ }
+
+ foreach (DepartmentWeekDetailEntity item in Second)
+ {
+ item.Create();
+ item.DWeekID = entity.ID;
+ item.Types = "2";
+ item.CreateTime = DateTime.Now;
+ db.Insert(item);
+ }
+ }
+ }
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 推送
+ ///
+ ///
+ public void PushEntity()
+ {
+ var db = this.BaseRepository().BeginTrans();
+ try
+ {
+ //var id = keyValue.Split(',');
+ //foreach (var item in id)
+ //{
+ // db.ExecuteBySql("update DepartmentWeek set Status='3' where ID = '" + item + "'");
+ //}
+ db.ExecuteBySql("update DepartmentWeek set Status='3' where Status = '2' ");
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void ChangeStatusByProcessId(int status, string processId)
+ {
+ try
+ {
+ this.BaseRepository().ExecuteBySql($"update DepartmentWeek set Status='{status}' where processId='{processId}'");
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 提交
+ ///
+ ///
+ ///
+ ///
+ public void ChangeStatusById(string keyValue, int status, string processId)
+ {
+ try
+ {
+ this.BaseRepository().ExecuteBySql($"update DepartmentWeek set Status='{status}',processId='{processId}' where ID='{keyValue}'");
+ }
+ 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/EducationalAdministration/DepartmentWeekDetail/DepartmentWeekDetailEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeekDetail/DepartmentWeekDetailEntity.cs
new file mode 100644
index 000000000..06df3b25b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DepartmentWeekDetail/DepartmentWeekDetailEntity.cs
@@ -0,0 +1,92 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 数字化智慧校园
+ /// Copyright (c) 2013-2020 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2024-12-18 15:37
+ /// 描 述:DepartmentWeekDetail
+ ///
+ public class DepartmentWeekDetailEntity
+ {
+ #region 实体成员
+ ///
+ /// ID
+ ///
+ ///
+ [Column("ID")]
+ public string ID { get; set; }
+ ///
+ /// DWeekID
+ ///
+ ///
+ [Column("DWEEKID")]
+ public string DWeekID { get; set; }
+ ///
+ /// Types
+ ///
+ ///
+ [Column("TYPES")]
+ public string Types { get; set; }
+ ///
+ /// MainWork
+ ///
+ ///
+ [Column("MAINWORK")]
+ public string MainWork { get; set; }
+ ///
+ /// 完成时限
+ ///
+ ///
+ [Column("TIMELIMITFINISH")]
+ public string TimeLimitFinish { get; set; }
+ ///
+ /// PersonAndDepartment
+ ///
+ ///
+ [Column("PERSONANDDEPARTMENT")]
+ public string PersonAndDepartment { get; set; }
+ ///
+ /// QuestSpecialProject
+ ///
+ ///
+ [Column("QUESTSPECIALPROJECT")]
+ public string QuestSpecialProject { get; set; }
+ ///
+ /// Remark
+ ///
+ ///
+ [Column("REMARK")]
+ public string Remark { get; set; }
+ ///
+ /// CreateTime
+ ///
+ ///
+ [Column("CREATETIME")]
+ public DateTime? CreateTime { get; set; }
+ #endregion
+
+ #region 扩展操作
+ ///
+ /// 新增调用
+ ///
+ public void Create()
+ {
+ this.ID = Guid.NewGuid().ToString();
+ }
+ ///
+ /// 编辑调用
+ ///
+ ///
+ public void Modify(string keyValue)
+ {
+ this.ID = keyValue;
+ }
+ #endregion
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 2fd408580..c830ccd7b 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
@@ -172,6 +172,7 @@
+
@@ -2152,6 +2153,10 @@
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj
index 52d4248c6..8f7488fcd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj
@@ -98,6 +98,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/DepartmentWeekMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/DepartmentWeekMethod.cs
new file mode 100644
index 000000000..b48d5d2ea
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/DepartmentWeekMethod.cs
@@ -0,0 +1,32 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Learun.Application.WorkFlow
+{
+ public class DepartmentWeekMethod : IWorkFlowMethod
+ {
+ DepartmentWeekIBLL departmentWeekIBLL = new DepartmentWeekBLL();
+
+
+ public void Execute(WfMethodParameter parameter)
+ {
+ if (parameter.code == "agree")
+ {
+ departmentWeekIBLL.ChangeStatusByProcessId(2, parameter.processId);
+ }
+ else
+ {
+ if (parameter.code == "2")
+ {
+ departmentWeekIBLL.ChangeStatusByProcessId(-1, parameter.processId);
+ }
+ departmentWeekIBLL.ChangeStatusByProcessId(0, parameter.processId);
+ }
+ }
+ }
+}