diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.cshtml index 10da31358..831438ef9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.cshtml @@ -3,9 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
类型*
-
+ @*
*@ +
物品编号*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.js index a8633af1c..a35654589 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#typeId').lrDataSourceSelect({ code: 'Ass_AssetsType',value: 'atid',text: 'aname' }); + //$('#typeId').lrDataSourceSelect({ code: 'Ass_AssetsType',value: 'atid',text: 'aname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.cshtml index b3e24ebb6..1ba8cbe2e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.cshtml @@ -12,7 +12,8 @@
类型
-
+ +
物品编号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.js index f96a5282c..ac69ac5ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoods/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#typeId').lrDataSourceSelect({ code: 'Ass_AssetsType',value: 'atid',text: 'aname' }); + //$('#typeId').lrDataSourceSelect({ code: 'Ass_AssetsType',value: 'atid',text: 'aname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -73,17 +73,19 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/AssetManagementSystem/LowDurableGoods/GetPageList', headData: [ - { label: "类型", name: "typeId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', - key: value, - keyId: 'atid', - callback: function (_data) { - callback(_data['aname']); - } - }); - }}, + { + label: "类型", name: "typeId", width: 100, align: "left" + //,formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', + // key: value, + // keyId: 'atid', + // callback: function (_data) { + // callback(_data['aname']); + // } + // }); + //} + }, { label: "物品编号", name: "goods_code", width: 100, align: "left"}, { label: "物品名称", name: "goods_name", width: 100, align: "left"}, { label: "物品型号", name: "goods_model", width: 100, align: "left"}, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsBaseInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsBaseInfo/Form.js index 2b421d414..06b502dd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsBaseInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsBaseInfo/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#base_isuse').lrRadioCheckbox({ type: 'radio', - code: 'YesOrNoInt', + code: 'YesOrNoBit', }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsShareData/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsShareData/Form.js index 76e22028f..969982e8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsShareData/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsShareData/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#share_isuse').lrRadioCheckbox({ type: 'radio', - code: 'YesOrNoInt', + code: 'YesOrNoBit', }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsSysManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsSysManage/Form.js index 743eedd1d..79f54904b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsSysManage/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/LowDurableGoodsSysManage/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#sys_isuse').lrRadioCheckbox({ type: 'radio', - code: 'YesOrNoInt', + code: 'YesOrNoBit', }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/GraduateConditionController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/GraduateConditionController.cs new file mode 100644 index 000000000..482b7d8bc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/GraduateConditionController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-04 15:41 + /// 描 述:毕业条件管理 + /// + public class GraduateConditionController : MvcControllerBase + { + private StuGraduateConditionIBLL graduateConditionIBLL = new StuGraduateConditionBLL(); + + #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 = graduateConditionIBLL.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 StuGraduateConditionData = graduateConditionIBLL.GetStuGraduateConditionEntity( keyValue ); + var jsonData = new { + StuGraduateCondition = StuGraduateConditionData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + graduateConditionIBLL.DeleteEntity(keyValue); + return Success("删除成功!"); + } + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + StuGraduateConditionEntity entity = strEntity.ToObject(); + graduateConditionIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功!"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipLogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipLogController.cs index 24623ff75..eb4e1a8af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipLogController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipLogController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + #endregion #region 获取数据 @@ -105,6 +117,41 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers internShipLogIBLL.SaveEntity(keyValue,entity); return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + InternShipLogEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = internShipLogIBLL.GetInternShipLogEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime + 1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + internShipLogIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipSummaryController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipSummaryController.cs index e3a2188f1..23dca5cbb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipSummaryController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternShipSummaryController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + #endregion #region 获取数据 @@ -105,6 +117,41 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers internShipSummaryIBLL.SaveEntity(keyValue,entity); return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + InternShipSummaryEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = internShipSummaryIBLL.GetInternShipSummaryEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime + 1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + internShipSummaryIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternshipPlanPostController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternshipPlanPostController.cs index 09bce5f77..6b44ac180 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternshipPlanPostController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/InternshipPlanPostController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + + + #endregion #region 获取数据 @@ -105,6 +118,43 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers internshipPlanPostIBLL.SaveEntity(keyValue,entity); return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + InternshipPlanPostEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = internshipPlanPostIBLL.GetInternshipPlanPostEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime+1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + internshipPlanPostIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } + + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAppraisalController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAppraisalController.cs index 94c0ef8f5..da913ad1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAppraisalController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAppraisalController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + #endregion #region 获取数据 @@ -111,6 +123,41 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + Practice_AppraisalEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = practiceAppraisalIBLL.GetPractice_AppraisalEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime + 1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + practiceAppraisalIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAssessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAssessController.cs index db74edf77..827f9c093 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAssessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeAssessController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + #endregion #region 获取数据 @@ -111,6 +122,42 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + Practice_AssessEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = practiceAssessIBLL.GetPractice_AssessEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime + 1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + practiceAssessIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeMaterialController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeMaterialController.cs index 00a3112a9..b6cb6ede1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeMaterialController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeMaterialController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + #endregion #region 获取数据 @@ -111,6 +123,42 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + Practice_MaterialEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = practiceMaterialIBLL.GetPractice_MaterialEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime + 1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + practiceMaterialIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeUnitVisitController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeUnitVisitController.cs index a510d0a86..30f8ea91f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeUnitVisitController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PracticeUnitVisitController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -37,6 +38,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 上传页面 + /// + /// + [HttpGet] + public ActionResult UploadForm() + { + return View(); + } + #endregion #region 获取数据 @@ -111,6 +123,42 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success("保存成功!"); } + + /// + /// 保存实体数据(新增、修改) + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult UploadForm(string keyValue, string strEntity) + { + Practice_Unit_VisitEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(keyValue)) + { + var entity2 = practiceUnitVisitIBLL.GetPractice_Unit_VisitEntity(keyValue); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = entity2.updatetime + 1;//已提交 + entity.upfileDate = DateTime.Now; + } + } + else + { + entity.Create(); + if (!string.IsNullOrEmpty(entity.attach_file)) + { + entity.updatetime = 1;//已提交 + entity.upfileDate = DateTime.Now; + } + + } + + practiceUnitVisitIBLL.SaveEntity(keyValue, entity); + return Success("提交成功!"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Form.cshtml new file mode 100644 index 000000000..7ea237654 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Form.cshtml @@ -0,0 +1,15 @@ +@{ + ViewBag.Title = "毕业条件管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
条件名称*
+ +
+
+
启用*
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/GraduateCondition/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Form.js new file mode 100644 index 000000000..e14af4622 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Form.js @@ -0,0 +1,52 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-04 15:41 + * 描 述:毕业条件管理 + */ +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 () { + $('#EnabledMark').lrDataItemSelect({ code: 'EnableStatus' }); + $('#EnabledMark').lrselectSet("1"); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/GraduateCondition/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 postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/GraduateCondition/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Index.cshtml new file mode 100644 index 000000000..0706a8af1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Index.cshtml @@ -0,0 +1,41 @@ +@{ + ViewBag.Title = "毕业条件管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
条件名称
+ +
+
+
启用
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/GraduateCondition/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Index.js new file mode 100644 index 000000000..411415eee --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/GraduateCondition/Index.js @@ -0,0 +1,102 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-04 15:41 + * 描 述:毕业条件管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#EnabledMark').lrDataItemSelect({ code: 'EnableStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/GraduateCondition/Form', + 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: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/GraduateCondition/Form?keyValue=' + keyValue, + 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 + '/EducationalAdministration/GraduateCondition/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/GraduateCondition/GetPageList', + headData: [ + { label: "条件名称", name: "Name", width: 100, align: "left"}, + { label: "启用", name: "EnabledMark", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnableStatus', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#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/EducationalAdministration/Views/InternShipLog/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.cshtml index 24932c84b..648b512c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.cshtml @@ -31,6 +31,7 @@  修改  删除
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.js index 7050252da..3437e1f29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/Index.js @@ -62,6 +62,23 @@ var bootstrap = function ($, learun) { }); } }); + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/InternShipLog/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.cshtml new file mode 100644 index 000000000..1e1487100 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.js new file mode 100644 index 000000000..d3d83604a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipLog/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/InternShipLog/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/InternShipLog/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.cshtml index 99c572318..efd2d688a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.cshtml @@ -31,6 +31,7 @@  修改  删除
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.js index a6bb2b8bc..5d0d920fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/Index.js @@ -62,6 +62,22 @@ var bootstrap = function ($, learun) { }); } }); + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/InternShipSummary/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.cshtml new file mode 100644 index 000000000..7cd33dfa4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.js new file mode 100644 index 000000000..bea684a5b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternShipSummary/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/InternShipSummary/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/InternShipSummary/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.cshtml index e1c57c5db..9e439a40f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.cshtml @@ -28,13 +28,14 @@
- + 刷新
 录入  修改  删除
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.js index 18db0b5ea..e33d8f0c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/Index.js @@ -62,6 +62,24 @@ var bootstrap = function ($, learun) { }); } }); + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/InternshipPlanPost/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + }, // 初始化列表 initGird: function () { @@ -87,7 +105,15 @@ var bootstrap = function ($, learun) { }}, { label: "内容简介", name: "ContentValidate", width: 100, align: "left"}, { label: "岗位职责", name: "Responsibilities", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { + label: "附件", name: "Remark", width: 100, align: "left", + formatterAsync: function(callback, value, row, op, $cell) { + if (value != null && value != "") { + return "下载" + } + } + }, ], mainId:'ID', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.cshtml new file mode 100644 index 000000000..c94675b40 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.js new file mode 100644 index 000000000..759d18701 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/InternshipPlanPost/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/InternshipPlanPost/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/InternshipPlanPost/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.cshtml index 752437472..cfe4b7137 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.cshtml @@ -27,10 +27,11 @@
-  新增 -  编辑 +  新增 +  编辑  删除
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.js index cc7abe006..adbbdd826 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/Index.js @@ -62,6 +62,23 @@ var bootstrap = function ($, learun) { }); } }); + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/PracticeAppraisal/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.cshtml new file mode 100644 index 000000000..7b9648da5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.js new file mode 100644 index 000000000..e99a89aa5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAppraisal/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PracticeAppraisal/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PracticeAppraisal/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.cshtml index 7e9c4abd5..3f447cf6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.cshtml @@ -3,9 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
实习学生*
-
+ @*
*@ +
实习注册号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.js index 28750d927..26cf06bb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#StuId').lrDataSourceSelect({ code: 'Practice_StuInfo',value: 'stuid',text: 'stuname' }); + //$('#StuId').lrDataSourceSelect({ code: 'Practice_StuInfo',value: 'stuid',text: 'stuname' }); $('#InternId').lrDataSourceSelect({ code: 'PracticeBase',value: 'id',text: 'name' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.cshtml index 048436c08..f2b7bb5c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.cshtml @@ -35,10 +35,11 @@
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.js index 654d1eabb..20cbc90a7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/Index.js @@ -63,23 +63,42 @@ var bootstrap = function ($, learun) { }); } }); + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/PracticeAssess/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/PracticeAssess/GetPageList', headData: [ - { label: "实习学生", name: "StuId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Practice_StuInfo', - key: value, - keyId: 'stuid', - callback: function (_data) { - callback(_data['stuname']); - } - }); - }}, + { + label: "实习学生", name: "StuId", width: 100, align: "left" + //,formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Practice_StuInfo', + // key: value, + // keyId: 'stuid', + // callback: function (_data) { + // callback(_data['stuname']); + // } + // }); + //} + }, { label: "实习注册号", name: "InternId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.cshtml new file mode 100644 index 000000000..b04de0df8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.js new file mode 100644 index 000000000..178fabdcf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeAssess/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PracticeAssess/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PracticeAssess/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.cshtml index a8a1d5827..8e824fa24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.cshtml @@ -35,10 +35,11 @@
-  新增 -  编辑 +  新增 +  编辑  删除
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.js index 19418a72b..17a31a0ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/Index.js @@ -62,6 +62,23 @@ var bootstrap = function ($, learun) { }); } }); + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/PracticeMaterial/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.cshtml new file mode 100644 index 000000000..1edd1367e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.js new file mode 100644 index 000000000..63dfdccf6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeMaterial/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PracticeMaterial/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PracticeMaterial/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.cshtml index 14b838438..9b1f5601c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.cshtml @@ -34,10 +34,11 @@
-  新增 -  编辑 +  新增 +  编辑  删除
+  上传文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.js index 1900dfe66..9a63d872b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/Index.js @@ -62,6 +62,23 @@ var bootstrap = function ($, learun) { }); } }); + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/EducationalAdministration/PracticeUnitVisit/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.cshtml new file mode 100644 index 000000000..4f8a80e00 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "文件上传"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+ + +
+
文件上传
+
+
+ +
+
说明
+ +
+
+ + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.js new file mode 100644 index 000000000..75ed2e967 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PracticeUnitVisit/UploadForm.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人:超级管理员 + * 日 期:2019-09-24 15:35 + * 描 述:绩效跟踪 + */ +var acceptClick; +var keyValue = request('keyValue'); +var ParentId = request('ParentId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + //$('#MPStatus').lrDataItemSelect({ code: 'SubmissionState' }); + $('#attach_file').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PracticeUnitVisit/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 entity = $('body').lrGetFormData(); + if (ParentId) { + entity.ParentId = ParentId; + } + var postData = { + strEntity: JSON.stringify(entity) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PracticeUnitVisit/UploadForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/RecruitInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/RecruitInfo/Form.cshtml index 4d32a0185..e4efcb749 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/RecruitInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/RecruitInfo/Form.cshtml @@ -4,7 +4,7 @@ }
-
企业id*
+
企业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.cshtml index 9aa4d9080..17fd65523 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.js index f671752d0..22e4a4ad9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CertificateGrant.js @@ -10,27 +10,27 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 320, 400); - $('#DeptNo').lrselect({ - allowSearch: true, - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - select: function (item) { - if (item) { - $('#MajorNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } - }); - } else { - $('#MajorNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { strWhere: "1=1 AND CheckMark=1" } - }); - } - } - }); + //$('#DeptNo').lrselect({ + // allowSearch: true, + // value: "deptno", + // text: "deptname", + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + // select: function (item) { + // if (item) { + // $('#MajorNo').lrselectRefresh({ + // allowSearch: true, + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + // }); + // } else { + // $('#MajorNo').lrselectRefresh({ + // allowSearch: true, + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { strWhere: "1=1 AND CheckMark=1" } + // }); + // } + // } + //}); $('#MajorNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.cshtml index 3932b23bb..a0ee25c81 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.js index f0eeb53ac..0ea0bab6e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/CheckIndex.js @@ -10,28 +10,28 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 320, 400); - $('#DeptNo').lrselect({ - allowSearch: true, - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - select: function (item) { - if (item) { - $('#MajorNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } - }); - } else { - $('#MajorNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { strWhere: "1=1 AND CheckMark=1" } - }); - } + //$('#DeptNo').lrselect({ + // allowSearch: true, + // value: "deptno", + // text: "deptname", + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + // select: function (item) { + // if (item) { + // $('#MajorNo').lrselectRefresh({ + // allowSearch: true, + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + // }); + // } else { + // $('#MajorNo').lrselectRefresh({ + // allowSearch: true, + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { strWhere: "1=1 AND CheckMark=1" } + // }); + // } - } - }); + // } + //}); $('#MajorNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml index 28b6eccd5..72a05dca8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml @@ -88,9 +88,9 @@
-
+ @*
-
+
*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js index 698ecee82..9cd886a8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js @@ -21,7 +21,7 @@ var bootstrap = function ($, learun) { // 查询 $('#btn_Search').on('click', function () { var p = {}; - p.DeptNo = $('#DeptNo').lrselectGet(); + //p.DeptNo = $('#DeptNo').lrselectGet(); p.MajorNo = $('#MajorNo').lrselectGet(); p.ClassNo = $('#ClassNo').lrselectGet(); p.StuNo = $('#StuNo').lrselectGet(); @@ -70,19 +70,19 @@ var bootstrap = function ($, learun) { }, bindSelect: function () { - $('#DeptNo').lrDataSourceSelect({ - placeholder: "请选择系", code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { - var deptno = ""; - if (val) { - deptno = val.deptno; - } - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, - text: "MajorName", - value: "MajorNo" - }) - } - }); + //$('#DeptNo').lrDataSourceSelect({ + // placeholder: "请选择系", code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + // var deptno = ""; + // if (val) { + // deptno = val.deptno; + // } + // $('#MajorNo').lrselectRefresh({ + // url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + // text: "MajorName", + // value: "MajorNo" + // }) + // } + //}); $('#MajorNo').lrDataSourceSelect({ placeholder: "请选择专业", code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (val) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml index 54a820a3d..155e7ef8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml @@ -88,9 +88,9 @@
-
+ @*
-
+
*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js index c6df00e6d..35d5a0b57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js @@ -22,7 +22,7 @@ var bootstrap = function ($, learun) { var p = {}; p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); p.Semester = $('#Semester').lrselectGet(); - p.ClassNo = $('#ClassNo').lrselectGet(); + //p.ClassNo = $('#ClassNo').lrselectGet(); p.TableName = $('#TableName').lrselectGet(); p.StuNo = $('#StuNo').lrselectGet(); if (p.AcademicYearNo == null || p.AcademicYearNo == "") { @@ -33,10 +33,10 @@ var bootstrap = function ($, learun) { learun.alert.warning("请选择学期!"); return; } - if (p.ClassNo == null || p.ClassNo == "") { - learun.alert.warning("请选择班级!"); - return; - } + //if (p.ClassNo == null || p.ClassNo == "") { + // learun.alert.warning("请选择班级!"); + // return; + //} $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoData', p, function (data) { var temparr = []; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml index 5b1acb47f..41aadd3c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml @@ -9,7 +9,7 @@
部门编号*
- +
部门简称
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/LogisticsLaultRepairController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/LogisticsLaultRepairController.cs index a7e1bd0b0..ac90f1dbc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/LogisticsLaultRepairController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/LogisticsLaultRepairController.cs @@ -27,7 +27,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -36,7 +36,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } /// /// 网络故障报修统计 @@ -82,8 +82,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Logistics_Lault_RepairData = logisticsLaultRepairIBLL.GetLogistics_Lault_RepairEntity( keyValue ); - var jsonData = new { + var Logistics_Lault_RepairData = logisticsLaultRepairIBLL.GetLogistics_Lault_RepairEntity(keyValue); + var jsonData = new + { Logistics_Lault_Repair = Logistics_Lault_RepairData, }; return Success(jsonData); @@ -101,7 +102,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers Device = x.FirstOrDefault()?.Device,//设备名称 Maintainer = x.FirstOrDefault()?.Maintainer, TotalMoney = x.Sum(s => s.TotalMoney), - RepairCount = x.Count(s => s.Repair_State != null && s.Repair_State > 0) + RepairCount = x.Count(s => !string.IsNullOrEmpty(s.Repair_State)) }).OrderBy(x => x.Maintainer).ThenBy(x => x.TotalMoney).ThenBy(x => x.RepairCount); return Success(list); } @@ -136,7 +137,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Logistics_Lault_RepairEntity entity = strEntity.ToObject(); - logisticsLaultRepairIBLL.SaveEntity(keyValue,entity); + logisticsLaultRepairIBLL.SaveEntity(keyValue, entity); if (string.IsNullOrEmpty(keyValue)) { } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Logistics_Lault_Repair_StatisticsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Logistics_Lault_Repair_StatisticsController.cs new file mode 100644 index 000000000..8c4771713 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Logistics_Lault_Repair_StatisticsController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:37 + /// 描 述:后勤维修统计 + /// + public class Logistics_Lault_Repair_StatisticsController : MvcControllerBase + { + private Logistics_Lault_Repair_StatisticsIBLL logistics_Lault_Repair_StatisticsIBLL = new Logistics_Lault_Repair_StatisticsBLL(); + + #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 = logistics_Lault_Repair_StatisticsIBLL.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 Logistics_Lault_Repair_StatisticsData = logistics_Lault_Repair_StatisticsIBLL.GetLogistics_Lault_Repair_StatisticsEntity( keyValue ); + var jsonData = new { + Logistics_Lault_Repair_Statistics = Logistics_Lault_Repair_StatisticsData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + logistics_Lault_Repair_StatisticsIBLL.DeleteEntity(keyValue); + return Success("删除成功!"); + } + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Logistics_Lault_Repair_StatisticsEntity entity = strEntity.ToObject(); + logistics_Lault_Repair_StatisticsIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功!"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkPracticalRepairController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkPracticalRepairController.cs index d3997be26..2bde90b15 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkPracticalRepairController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkPracticalRepairController.cs @@ -27,7 +27,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -36,7 +36,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } /// @@ -83,8 +83,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Network_Practical_RepairData = networkPracticalRepairIBLL.GetNetwork_Practical_RepairEntity( keyValue ); - var jsonData = new { + var Network_Practical_RepairData = networkPracticalRepairIBLL.GetNetwork_Practical_RepairEntity(keyValue); + var jsonData = new + { Network_Practical_Repair = Network_Practical_RepairData, }; return Success(jsonData); @@ -98,18 +99,18 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers Pagination paginationobj = pagination.ToObject(); var Data = networkPracticalRepairIBLL.GetStatistics(paginationobj, queryJson); - var list = Data.GroupBy(x =>x.Maintainer).Select(x => new + var list = Data.GroupBy(x => x.Maintainer).Select(x => new { Maintainer = x.FirstOrDefault()?.Maintainer, TotalMoney = x.Sum(s => s.TotalMoney), - RepairCount = x.Count(s => s.Repair_State != null && s.Repair_State > 0) + RepairCount = x.Count(s => !string.IsNullOrEmpty(s.Repair_State)) }).OrderBy(x => x.Maintainer).ThenBy(x => x.TotalMoney).ThenBy(x => x.RepairCount); var list2 = Data.GroupBy(x => x.PracticalName).Select(x => new { PracticalName = x.FirstOrDefault()?.PracticalName, TotalMoney = x.Sum(s => s.TotalMoney), - RepairCount = x.Count(s => s.Repair_State != null && s.Repair_State > 0) + RepairCount = x.Count(s => !string.IsNullOrEmpty(s.Repair_State)) }).OrderBy(x => x.PracticalName).ThenBy(x => x.TotalMoney).ThenBy(x => x.RepairCount); @@ -144,7 +145,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Network_Practical_RepairEntity entity = strEntity.ToObject(); - networkPracticalRepairIBLL.SaveEntity(keyValue,entity); + networkPracticalRepairIBLL.SaveEntity(keyValue, entity); if (string.IsNullOrEmpty(keyValue)) { } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkRepairController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkRepairController.cs index b82a80a3c..90872073b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkRepairController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/NetworkRepairController.cs @@ -27,7 +27,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -36,7 +36,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } /// @@ -83,8 +83,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Network_RepairData = networkRepairIBLL.GetNetwork_RepairEntity( keyValue ); - var jsonData = new { + var Network_RepairData = networkRepairIBLL.GetNetwork_RepairEntity(keyValue); + var jsonData = new + { Network_Repair = Network_RepairData, }; return Success(jsonData); @@ -101,11 +102,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { Pagination paginationobj = pagination.ToObject(); var Data = networkRepairIBLL.GetStatistics(paginationobj, queryJson); - var list = Data.GroupBy(x =>x.Maintainer).Select(x => new + var list = Data.GroupBy(x => x.Maintainer).Select(x => new { Maintainer = x.FirstOrDefault()?.Maintainer, - TotalMoney = x.Sum(s=>s.TotalMoney), - RepairCount = x.Count(s=> s.Repair_State != null && s.Repair_State > 0) + TotalMoney = x.Sum(s => s.TotalMoney), + RepairCount = x.Count(s => !string.IsNullOrEmpty(s.Repair_State)) }).OrderBy(x => x.Maintainer).ThenBy(x => x.TotalMoney).ThenBy(x => x.RepairCount); return Success(list); } @@ -139,7 +140,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Network_RepairEntity entity = strEntity.ToObject(); - networkRepairIBLL.SaveEntity(keyValue,entity); + networkRepairIBLL.SaveEntity(keyValue, entity); if (string.IsNullOrEmpty(keyValue)) { } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Network_Practical_Repair_StatisticsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Network_Practical_Repair_StatisticsController.cs new file mode 100644 index 000000000..342b3475b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Network_Practical_Repair_StatisticsController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:31 + /// 描 述:网络实训统计 + /// + public class Network_Practical_Repair_StatisticsController : MvcControllerBase + { + private Network_Practical_Repair_StatisticsIBLL network_Practical_Repair_StatisticsIBLL = new Network_Practical_Repair_StatisticsBLL(); + + #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 = network_Practical_Repair_StatisticsIBLL.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 Network_Practical_Repair_StatisticsData = network_Practical_Repair_StatisticsIBLL.GetNetwork_Practical_Repair_StatisticsEntity( keyValue ); + var jsonData = new { + Network_Practical_Repair_Statistics = Network_Practical_Repair_StatisticsData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + network_Practical_Repair_StatisticsIBLL.DeleteEntity(keyValue); + return Success("删除成功!"); + } + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Network_Practical_Repair_StatisticsEntity entity = strEntity.ToObject(); + network_Practical_Repair_StatisticsIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功!"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Network_Repair_StatisticsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Network_Repair_StatisticsController.cs new file mode 100644 index 000000000..51aa829be --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Network_Repair_StatisticsController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:26 + /// 描 述:网络维修统计 + /// + public class Network_Repair_StatisticsController : MvcControllerBase + { + private Network_Repair_StatisticsIBLL network_Repair_StatisticsIBLL = new Network_Repair_StatisticsBLL(); + + #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 = network_Repair_StatisticsIBLL.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 Network_Repair_StatisticsData = network_Repair_StatisticsIBLL.GetNetwork_Repair_StatisticsEntity( keyValue ); + var jsonData = new { + Network_Repair_Statistics = Network_Repair_StatisticsData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + network_Repair_StatisticsIBLL.DeleteEntity(keyValue); + return Success("删除成功!"); + } + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Network_Repair_StatisticsEntity entity = strEntity.ToObject(); + network_Repair_StatisticsIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功!"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Repair_Purchase_App_StatisticsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Repair_Purchase_App_StatisticsController.cs new file mode 100644 index 000000000..f54990077 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Repair_Purchase_App_StatisticsController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:42 + /// 描 述:维护采购申请统计 + /// + public class Repair_Purchase_App_StatisticsController : MvcControllerBase + { + private Repair_Purchase_App_StatisticsIBLL repair_Purchase_App_StatisticsIBLL = new Repair_Purchase_App_StatisticsBLL(); + + #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 = repair_Purchase_App_StatisticsIBLL.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 Repair_Purchase_App_StatisticsData = repair_Purchase_App_StatisticsIBLL.GetRepair_Purchase_App_StatisticsEntity( keyValue ); + var jsonData = new { + Repair_Purchase_App_Statistics = Repair_Purchase_App_StatisticsData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + repair_Purchase_App_StatisticsIBLL.DeleteEntity(keyValue); + return Success("删除成功!"); + } + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Repair_Purchase_App_StatisticsEntity entity = strEntity.ToObject(); + repair_Purchase_App_StatisticsIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功!"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/LogisticsLaultRepair/Statistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/LogisticsLaultRepair/Statistics.js index f4ce674df..e69f4435a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/LogisticsLaultRepair/Statistics.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/LogisticsLaultRepair/Statistics.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { { label: "总金额", name: "TotalMoney", width: 100, align: "left" }, { label: "维修次数", name: "RepairCount", width: 100, align: "left" } ], - mainId: 'Maintainer', + mainId: 'Device', isPage: true }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.cshtml new file mode 100644 index 000000000..7d1f00002 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "后勤维修统计"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
统计类型名称*
+ +
+
+
计数*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.js new file mode 100644 index 000000000..6bf89a132 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Form.js @@ -0,0 +1,50 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:37 + * 描 述:后勤维修统计 + */ +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 () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Logistics_Lault_Repair_Statistics/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 postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Logistics_Lault_Repair_Statistics/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.cshtml new file mode 100644 index 000000000..2f8744f91 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.cshtml @@ -0,0 +1,47 @@ +@{ + ViewBag.Title = "后勤维修统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
统计类型名称
+ +
+
+
计数
+ +
+
+
开始时间
+
+
+
结束时间
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.js new file mode 100644 index 000000000..00599b637 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Logistics_Lault_Repair_Statistics/Index.js @@ -0,0 +1,95 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:37 + * 描 述:后勤维修统计 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Logistics_Lault_Repair_Statistics/Form', + 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: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Logistics_Lault_Repair_Statistics/Form?keyValue=' + keyValue, + 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 + '/LogisticsManagement/Logistics_Lault_Repair_Statistics/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Logistics_Lault_Repair_Statistics/GetPageList', + headData: [ + { label: "统计类型名称", name: "Statistics_Name", width: 100, align: "left"}, + { label: "计数", name: "Repair_Sum", width: 100, align: "left"}, + { label: "开始时间", name: "BeginTime", width: 100, align: "left"}, + { label: "结束时间", name: "EndTime", width: 100, align: "left" }, + { label: "统计时间", name: "Createdate", width: 100, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#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/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.cshtml new file mode 100644 index 000000000..08528d9a1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "网络实训统计"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
统计类型名称*
+ +
+
+
计数*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.js new file mode 100644 index 000000000..cd77c950d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Form.js @@ -0,0 +1,51 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:31 + * 描 述:网络实训统计 + */ +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 () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Network_Practical_Repair_Statistics/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]); + } + } + }); + } + $('#Repair_Sum').val('0'); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Network_Practical_Repair_Statistics/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.cshtml new file mode 100644 index 000000000..622af4d77 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.cshtml @@ -0,0 +1,47 @@ +@{ + ViewBag.Title = "网络实训统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
统计类型名称
+ +
+
+
计数
+ +
+
+
开始时间
+
+
+
结束时间
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.js new file mode 100644 index 000000000..1ae2bbe00 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Practical_Repair_Statistics/Index.js @@ -0,0 +1,95 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:31 + * 描 述:网络实训统计 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Network_Practical_Repair_Statistics/Form', + 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: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Network_Practical_Repair_Statistics/Form?keyValue=' + keyValue, + 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 + '/LogisticsManagement/Network_Practical_Repair_Statistics/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Network_Practical_Repair_Statistics/GetPageList', + headData: [ + { label: "统计类型名称", name: "Statistics_Name", width: 100, align: "left"}, + { label: "计数", name: "Repair_Sum", width: 100, align: "left"}, + { label: "开始时间", name: "BeginTime", width: 100, align: "left"}, + { label: "结束时间", name: "EndTime", width: 100, align: "left" }, + { label: "统计时间", name: "Createdate", width: 100, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#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/LogisticsManagement/Views/Network_Repair_Statistics/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Form.cshtml new file mode 100644 index 000000000..d773ce5bb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Form.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "网络维修统计"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
统计类型名称*
+ +
+
+
计数*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Form.js new file mode 100644 index 000000000..d0c758160 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Form.js @@ -0,0 +1,51 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:26 + * 描 述:网络维修统计 + */ +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 () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Network_Repair_Statistics/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]); + } + } + }); + } + $('#Repair_Sum').val('0'); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Network_Repair_Statistics/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.cshtml new file mode 100644 index 000000000..1651734f1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.cshtml @@ -0,0 +1,47 @@ +@{ + ViewBag.Title = "网络维修统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
统计类型名称
+ +
+
+
计数
+ +
+
+
开始时间
+
+
+
结束时间
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.js new file mode 100644 index 000000000..70b9803ec --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Network_Repair_Statistics/Index.js @@ -0,0 +1,95 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:26 + * 描 述:网络维修统计 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Network_Repair_Statistics/Form', + 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: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Network_Repair_Statistics/Form?keyValue=' + keyValue, + 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 + '/LogisticsManagement/Network_Repair_Statistics/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Network_Repair_Statistics/GetPageList', + headData: [ + { label: "统计类型名称", name: "Statistics_Name", width: 100, align: "left"}, + { label: "计数", name: "Repair_Sum", width: 100, align: "left"}, + { label: "开始时间", name: "BeginTime", width: 100, align: "left"}, + { label: "结束时间", name: "EndTime", width: 100, align: "left" }, + { label: "统计时间", name: "Createdate", width: 100, align: "left" } + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#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/LogisticsManagement/Views/QuickRepairStatistics/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/QuickRepairStatistics/Form.cshtml index dd003a206..b14877ce8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/QuickRepairStatistics/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/QuickRepairStatistics/Form.cshtml @@ -29,7 +29,7 @@
费用总金额*
- +
统计时间*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.cshtml new file mode 100644 index 000000000..04cf97453 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "维护采购申请统计"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
统计类型名称*
+ +
+
+
计数*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.js new file mode 100644 index 000000000..ca98aa27e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Form.js @@ -0,0 +1,51 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:42 + * 描 述:维护采购申请统计 + */ +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 () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Repair_Purchase_App_Statistics/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]); + } + } + }); + } + $('#Repair_Sum').val('0'); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Repair_Purchase_App_Statistics/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.cshtml new file mode 100644 index 000000000..3c7b5e95e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.cshtml @@ -0,0 +1,47 @@ +@{ + ViewBag.Title = "维护采购申请统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
统计类型名称
+ +
+
+
计数
+ +
+
+
开始时间
+
+
+
结束时间
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.js new file mode 100644 index 000000000..87f6262eb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Repair_Purchase_App_Statistics/Index.js @@ -0,0 +1,95 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2023-02-05 22:42 + * 描 述:维护采购申请统计 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Repair_Purchase_App_Statistics/Form', + 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: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Repair_Purchase_App_Statistics/Form?keyValue=' + keyValue, + 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 + '/LogisticsManagement/Repair_Purchase_App_Statistics/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Repair_Purchase_App_Statistics/GetPageList', + headData: [ + { label: "统计类型名称", name: "Statistics_Name", width: 100, align: "left"}, + { label: "计数", name: "Repair_Sum", width: 100, align: "left"}, + { label: "开始时间", name: "BeginTime", width: 100, align: "left"}, + { label: "结束时间", name: "EndTime", width: 100, align: "left" }, + { label: "统计时间", name: "Createdate", width: 100, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#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/ExcellentPartyMember/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.cshtml index f54d6cb40..62fe9663a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.cshtml @@ -3,9 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
党员姓名*
-
+ @*
*@ +
当选日期*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.js index d02fdc282..8555a6e45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#MemberId').lrDataSourceSelect({ code: 'PartyMemberInfo',value: 'id',text: 'name' }); + // $('#MemberId').lrDataSourceSelect({ code: 'PartyMemberInfo',value: 'id',text: 'name' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Index.js index 830899768..ffd81dbbd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ExcellentPartyMember/Index.js @@ -69,17 +69,19 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/ExcellentPartyMember/GetPageList', headData: [ - { label: "党员姓名", name: "MemberId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMemberInfo', - key: value, - keyId: 'id', - callback: function (_data) { - callback(_data['name']); - } - }); - }}, + { + label: "党员姓名", name: "MemberId", width: 100, align: "left" + //, formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMemberInfo', + // key: value, + // keyId: 'id', + // callback: function (_data) { + // callback(_data['name']); + // } + // }); + //} + }, { label: "当选日期", name: "Comment_Date", width: 100, align: "left"}, { label: "当选评价", name: "Comment", width: 100, align: "left"}, ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.cshtml index 2a86ffde5..58fc65557 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.cshtml @@ -3,9 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
姓名*
-
+ @*
*@ +
生日*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.js index a84b6a0b4..13562375d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#MemberId').lrDataSourceSelect({ code: 'PartyMemberInfo',value: 'id',text: 'name' }); + //$('#MemberId').lrDataSourceSelect({ code: 'PartyMemberInfo',value: 'id',text: 'name' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Index.js index d99c113ed..92feb6fc3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember_Birthday_Reminder/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#MemberId').lrDataSourceSelect({ code: 'PartyMemberInfo',value: 'id',text: 'name' }); + $('#MemberId').lrDataSourceSelect({ code: 'PartyMemberInfo', value: 'id', text: 'name' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -56,7 +56,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认删除该项!', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/PartyMember_Birthday_Reminder/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/PartyMember_Birthday_Reminder/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -69,29 +69,31 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/PartyMember_Birthday_Reminder/GetPageList', headData: [ - { label: "姓名", name: "MemberId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMemberInfo', - key: value, - keyId: 'id', - callback: function (_data) { - callback(_data['name']); - } - }); - }}, - { label: "生日", name: "Birthday", width: 100, align: "left"}, - { label: "提醒时间", name: "Reminder_Date", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, + { + label: "姓名", name: "MemberId", width: 100, align: "left" + //, formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMemberInfo', + // key: value, + // keyId: 'id', + // callback: function (_data) { + // callback(_data['name']); + // } + // }); + //} + }, + { label: "生日", name: "Birthday", width: 100, align: "left" }, + { label: "提醒时间", name: "Reminder_Date", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, ], - mainId:'Id', + mainId: 'Id', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.cshtml index d6df01222..d794816af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.cshtml @@ -3,10 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
系部*
-
+
*@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.js index 60650b443..248f6c7ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#ClassId').lrDataSourceSelect({ code: 'allbjqj',value: 'classid',text: 'classname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.cshtml index d61f8d6fb..c4f99127e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.js index a0a1eb1bc..b3dee583f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EmploymentInfo/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#ClassId').lrDataSourceSelect({ code: 'allbjqj',value: 'classid',text: 'classname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); @@ -77,17 +77,17 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/StudentWork/EmploymentInfo/GetPageList', headData: [ - { label: "系部", name: "DepartId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptid', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, + //{ label: "系部", name: "DepartId", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptid', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // }}, { label: "专业", name: "MajorId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.cshtml index b6df24af3..a0fee86e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.cshtml @@ -7,9 +7,10 @@
环境名称*
-
+
责任人*
-
+ + @*
*@
启用*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.js index 922d0c3a4..4527c71a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#Manager').lrDataItemSelect({ code: 'bxgmzldm' }); + //$('#Manager').lrDataItemSelect({ code: 'bxgmzldm' }); $('#IsUse').lrRadioCheckbox({ type: 'radio', code: 'YesOrNoBit', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.cshtml index b1fefa898..36d200575 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.cshtml @@ -16,7 +16,7 @@
责任人
-
+
启用
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.js index d59e684b7..8e1bb9207 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#Manager').lrDataItemSelect({ code: 'bxgmzldm' }); + //$('#Manager').lrDataItemSelect({ code: 'bxgmzldm' }); $('#IsUse').lrRadioCheckbox({ type: 'radio', code: 'YesOrNoBit', @@ -78,16 +78,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/StudentWork/EnvironmentFactor/GetPageList', headData: [ { label: "环境名称", name: "EnvironmentName", width: 100, align: "left"}, - { label: "责任人", name: "Manager", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'bxgmzldm', - callback: function (_data) { - callback(_data.text); - } - }); - }}, + { label: "责任人", name: "Manager", width: 100, align: "left"}, { label: "启用", name: "IsUse", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('dataItem', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Form.js index eb8ed8cb4..88553bd0c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Form.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#Semester').lrDataItemSelect({ code: 'Semester' }); - $('#Passed').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#Passed').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#Provided').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#Provided').lrselectSet("1"); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Index.js index 0d71b2ac5..560631d4b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ExemptionApplication/Index.js @@ -93,7 +93,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'YesOrNoBit', + code: 'YesOrNoInt', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Form.js index 58ad8bb3c..c4a960129 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Form.js @@ -19,7 +19,7 @@ var bootstrap = function ($, learun) { type: 'radio', code: 'Semester', }); - $('#issend').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#issend').lrDataItemSelect({ code: 'YesOrNoBit' }); $('#issend').lrselectSet("1"); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Index.js index de62d6b68..4c8c4d734 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyNotice/Index.js @@ -97,7 +97,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'YesOrNoInt', + code: 'YesOrNoBit', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.cshtml index 1ef219c44..d79a8b909 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.cshtml @@ -3,10 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
系部*
-
+
*@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.js index a8c29870e..6d516907c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.cshtml index e0069dafb..e46f704b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.js index fcc2a08cc..3b6807bc3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateRecommend/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); // 刷新 @@ -71,17 +71,17 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/StudentWork/GraduateRecommend/GetPageList', headData: [ - { label: "系部", name: "DepartId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptid', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, + //{ label: "系部", name: "DepartId", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptid', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // }}, { label: "专业", name: "MajorId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.cshtml index ddf424bfe..4a97d8846 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.cshtml @@ -3,10 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
系部*
-
+
*@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.js index c41255dec..b9bbfcecd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.cshtml index 09dfe4893..dd202a0d5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.js index a63864424..e8cb0c912 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GraduateWorkInfo/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); // 刷新 @@ -71,17 +71,17 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/StudentWork/GraduateWorkInfo/GetPageList', headData: [ - { label: "系部", name: "DepartId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptid', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, + //{ label: "系部", name: "DepartId", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptid', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // }}, { label: "专业", name: "MajorId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.cshtml index 1a9275ebd..b4e7de6a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.cshtml @@ -27,10 +27,10 @@
政治面貌*
-
+ @*
系部*
-
+
*@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.js index 7bb74de59..439db4857 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.js @@ -21,7 +21,7 @@ var bootstrap = function ($, learun) { }); $('#Nation').lrDataItemSelect({ code: 'National' }); $('#Politics').lrDataItemSelect({ code: 'PolityStatus' }); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.cshtml index bdb5a61d4..fcfd952ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.cshtml @@ -34,10 +34,10 @@
政治面貌
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.js index 09eaa74ff..48d0a0a34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.js @@ -22,7 +22,7 @@ var bootstrap = function ($, learun) { }); $('#Nation').lrDataItemSelect({ code: 'National' }); $('#Politics').lrDataItemSelect({ code: 'PolityStatus' }); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); // 刷新 $('#lr_refresh').on('click', function () { @@ -113,17 +113,17 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "系部", name: "DepartId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptid', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, + //{ label: "系部", name: "DepartId", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptid', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // }}, { label: "专业", name: "MajorId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.cshtml index 9bf8a003a..e92bf41e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.cshtml @@ -3,14 +3,14 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
系部名称*
系部编号*
-
+
*@
专业名称*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.js index 3e6a73caa..9beeca28a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Form.js @@ -15,8 +15,8 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DetpName').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptname',text: 'deptname' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); + //$('#DetpName').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptname',text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); $('#MajorName').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorname',text: 'majorname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' }); $('#Grade').lrDataItemSelect({ code: 'jyYear' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.cshtml index 00dfca7de..e4c9f2739 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.cshtml @@ -10,14 +10,14 @@
-
-
系部名称
-
-
-
-
系部编号
-
-
+ @*
+
系部名称
+
+
+
+
系部编号
+
+
*@
专业名称
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.js index 3a7a1293b..b1acdd12a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/HolidaysBack/Index.js @@ -16,8 +16,8 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#DetpName').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptname',text: 'deptname' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); + //$('#DetpName').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptname',text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); $('#MajorName').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorname',text: 'majorname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' }); $('#Grade').lrDataItemSelect({ code: 'jyYear' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.cshtml index 785a109db..59549cd8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.cshtml @@ -11,10 +11,10 @@
学期*
-
+ @*
系部*
-
+
*@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.js index be70ec8ef..1ae7bc74a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#Semester').lrDataItemSelect({ code: 'Semester' }); $('#Semester').lrselectSet("1"); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#HaveAbnormal').lrRadioCheckbox({ type: 'radio', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.cshtml index 9392bf691..524b7379e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.cshtml @@ -18,10 +18,10 @@
学期
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.js index 745cafa21..1880d0495 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#Semester').lrDataItemSelect({ code: 'Semester' }); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#HaveAbnormal').lrRadioCheckbox({ type: 'radio', @@ -90,17 +90,17 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "系部", name: "DepartId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptid', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, + //{ label: "系部", name: "DepartId", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptid', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // }}, { label: "专业", name: "MajorId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.cshtml index c8f6ed840..4ff5fc3e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.js index 19ca1791a..03d065dd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StuInSchoolCertificate/Index.js @@ -11,28 +11,28 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 450, 400); - $('#DeptNo').lrselect({ - allowSearch: true, - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - select: function (item) { - if (item) { - $('#MajorNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } - }); - } else { - $('#MajorNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', - param: { strWhere: "1=1 AND CheckMark=1" } - }); - } + //$('#DeptNo').lrselect({ + // allowSearch: true, + // value: "deptno", + // text: "deptname", + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + // select: function (item) { + // if (item) { + // $('#MajorNo').lrselectRefresh({ + // allowSearch: true, + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + // }); + // } else { + // $('#MajorNo').lrselectRefresh({ + // allowSearch: true, + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + // param: { strWhere: "1=1 AND CheckMark=1" } + // }); + // } - } - }); + // } + //}); $('#MajorNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.cshtml index 299143109..1a23b1224 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.cshtml @@ -3,10 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
系部*
-
+
*@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.js index 210832c02..0b592d2c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#ClassId').lrDataSourceSelect({ code: 'allbjqj',value: 'classid',text: 'classname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.cshtml index aafffed13..0bda62e25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.cshtml @@ -10,10 +10,10 @@
-
+ @*
系部
-
+
*@
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.js index 9ebe27b17..026cd3498 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/TwoWayChoice/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); + //$('#DepartId').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptid',text: 'deptname' }); $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',text: 'majorname' }); $('#ClassId').lrDataSourceSelect({ code: 'allbjqj',value: 'classid',text: 'classname' }); $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' }); @@ -73,17 +73,17 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/StudentWork/TwoWayChoice/GetPageList', headData: [ - { label: "系部", name: "DepartId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptid', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, + //{ label: "系部", name: "DepartId", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op,$cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptid', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // }}, { label: "专业", name: "MajorId", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('custmerData', { 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 73a3185cd..13719b05b 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 @@ -972,6 +972,11 @@ + + + + + @@ -1193,6 +1198,9 @@ + + + @@ -1218,8 +1226,12 @@ + + + + @@ -1377,6 +1389,13 @@ + + + + + + + @@ -7425,6 +7444,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml index ccaa981e5..2611e7989 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml @@ -1,5 +1,5 @@ @{ - ViewBag.Title = "数字化智慧校园"; + ViewBag.Title = "长阳职教中心数字化校园"; Layout = "~/Views/Shared/_Admin.cshtml"; } @Html.AppendCssFile("/Views/Home/AdminDefault/index.css") @@ -30,7 +30,7 @@ 经典风格
- +
@*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml index aaaaedddb..551340c3d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml @@ -168,10 +168,10 @@
- @*
+ *@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml index b43282a63..7612eee55 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml @@ -165,10 +165,10 @@
- @*
+ *@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml index d01c93459..754ea5aae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml @@ -9,9 +9,9 @@ - 网上办事大厅 - - + 长阳职教中心网上办事大厅 + + @@ -128,10 +128,10 @@
- @*
+ *@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs index f4293a4d1..00615d749 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs @@ -280,6 +280,10 @@ namespace Learun.Application.Base.SystemModule { try { + if (itemCode == "Semester") { + int ss = 0; + } + List list = cache.Read>(cacheKeyDetail + itemCode, CacheId.dataItem); if (list?.Count == 0 || list == null) { @@ -358,6 +362,11 @@ namespace Learun.Application.Base.SystemModule var list = GetClassifyList(); foreach (var item in list) { + if (item.F_ItemCode== "Semester") + { + int kk = 0; + } + var detailList = GetDetailList(item.F_ItemCode); if (!dic.ContainsKey(item.F_ItemCode)) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateConditionMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateConditionMap.cs index 026ab0946..aac87df81 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateConditionMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateConditionMap.cs @@ -7,8 +7,8 @@ namespace Learun.Application.Mapping /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 /// 创 建:超级管理员 - /// 日 期:2022-08-05 09:35 - /// 描 述:毕业条件模板管理 + /// 日 期:2023-02-04 15:41 + /// 描 述:毕业条件管理 /// public class StuGraduateConditionMap : EntityTypeConfiguration { 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 3f4ed6ef7..7c550a659 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 @@ -730,6 +730,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Logistics_Lault_Repair_StatisticsMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Logistics_Lault_Repair_StatisticsMap.cs new file mode 100644 index 000000000..31eab56e3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Logistics_Lault_Repair_StatisticsMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:37 + /// 描 述:后勤维修统计 + /// + public class Logistics_Lault_Repair_StatisticsMap : EntityTypeConfiguration + { + public Logistics_Lault_Repair_StatisticsMap() + { + #region 表、主键 + //表 + this.ToTable("LOGISTICS_LAULT_REPAIR_STATISTICS"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Network_Practical_Repair_StatisticsMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Network_Practical_Repair_StatisticsMap.cs new file mode 100644 index 000000000..64ecde8c9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Network_Practical_Repair_StatisticsMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:31 + /// 描 述:网络实训统计 + /// + public class Network_Practical_Repair_StatisticsMap : EntityTypeConfiguration + { + public Network_Practical_Repair_StatisticsMap() + { + #region 表、主键 + //表 + this.ToTable("NETWORK_PRACTICAL_REPAIR_STATISTICS"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Network_Repair_StatisticsMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Network_Repair_StatisticsMap.cs new file mode 100644 index 000000000..fe749e377 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Network_Repair_StatisticsMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:26 + /// 描 述:网络维修统计 + /// + public class Network_Repair_StatisticsMap : EntityTypeConfiguration + { + public Network_Repair_StatisticsMap() + { + #region 表、主键 + //表 + this.ToTable("NETWORK_REPAIR_STATISTICS"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Repair_Purchase_App_StatisticsMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Repair_Purchase_App_StatisticsMap.cs new file mode 100644 index 000000000..a60f0b765 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Repair_Purchase_App_StatisticsMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:42 + /// 描 述:维护采购申请统计 + /// + public class Repair_Purchase_App_StatisticsMap : EntityTypeConfiguration + { + public Repair_Purchase_App_StatisticsMap() + { + #region 表、主键 + //表 + this.ToTable("REPAIR_PURCHASE_APP_STATISTICS"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionBLL.cs new file mode 100644 index 000000000..94bbcb4f0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionBLL.cs @@ -0,0 +1,125 @@ +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 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-04 15:41 + /// 描 述:毕业条件管理 + /// + public class GraduateConditionBLL : GraduateConditionIBLL + { + private GraduateConditionService graduateConditionService = new GraduateConditionService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return graduateConditionService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取StuGraduateCondition表实体数据 + /// + /// 主键 + /// + public StuGraduateConditionEntity GetStuGraduateConditionEntity(string keyValue) + { + try + { + return graduateConditionService.GetStuGraduateConditionEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + graduateConditionService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, StuGraduateConditionEntity entity) + { + try + { + graduateConditionService.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/GraduateCondition/GraduateConditionIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionIBLL.cs new file mode 100644 index 000000000..c4c74d7e2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-04 15:41 + /// 描 述:毕业条件管理 + /// + public interface GraduateConditionIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取StuGraduateCondition表实体数据 + /// + /// 主键 + /// + StuGraduateConditionEntity GetStuGraduateConditionEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, StuGraduateConditionEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionService.cs new file mode 100644 index 000000000..aaf8c2196 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/GraduateConditionService.cs @@ -0,0 +1,156 @@ +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 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-04 15:41 + /// 描 述:毕业条件管理 + /// + public class GraduateConditionService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.Name, + t.EnabledMark + "); + strSql.Append(" FROM StuGraduateCondition t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Name"].IsEmpty()) + { + dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Name Like @Name "); + } + if (!queryParam["EnabledMark"].IsEmpty()) + { + dp.Add("EnabledMark",queryParam["EnabledMark"].ToString(), DbType.String); + strSql.Append(" AND t.EnabledMark = @EnabledMark "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取StuGraduateCondition表实体数据 + /// + /// 主键 + /// + public StuGraduateConditionEntity GetStuGraduateConditionEntity(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(string keyValue, StuGraduateConditionEntity 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/EducationalAdministration/GraduateCondition/StuGraduateConditionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/StuGraduateConditionEntity.cs new file mode 100644 index 000000000..40da09766 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/GraduateCondition/StuGraduateConditionEntity.cs @@ -0,0 +1,55 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-04 15:41 + /// 描 述:毕业条件管理 + /// + public class StuGraduateConditionEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 毕业判定条件 + /// + [Column("NAME")] + public string Name { get; set; } + /// + /// 启用标识 + /// + [Column("ENABLEDMARK")] + public string EnabledMark { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + 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/InternShipLog/InternShipLogEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogEntity.cs index 06a4cd676..0a6c3c6dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogEntity.cs @@ -54,6 +54,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("REMARK")] public string Remark { get; set; } + + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogService.cs index e75197044..0b00aa4f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipLog/InternShipLogService.cs @@ -38,7 +38,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.IUnit, t.AddTime, t.LogContent, - t.Remark + t.Remark, + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM InternShipLog t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryEntity.cs index 7fd7f643f..770daff66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryEntity.cs @@ -49,6 +49,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("SUMMARYCONTENT")] public string SummaryContent { get; set; } + + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryService.cs index 83046513e..9dd50a00b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSummary/InternShipSummaryService.cs @@ -37,7 +37,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.AddTime, t.Mobile, t.Remark, - t.SummaryContent + t.SummaryContent, + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM InternShipSummary t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostEntity.cs index 3a277fddf..f5fde3e1a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostEntity.cs @@ -74,6 +74,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("REMARK")] public string Remark { get; set; } + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostService.cs index 35f3b3c7e..7015bbc78 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternshipPlanPost/InternshipPlanPostService.cs @@ -42,7 +42,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.Status, t.ContentValidate, t.Responsibilities, - t.Remark + t.Remark, + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM InternshipPlanPost t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/PracticeAppraisalService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/PracticeAppraisalService.cs index 302d565ef..f13b1b7e0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/PracticeAppraisalService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/PracticeAppraisalService.cs @@ -36,7 +36,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.AppraisalName, t.Down_Url, t.Down_Time, - t.Reamark + t.Reamark, + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM Practice_Appraisal t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/Practice_AppraisalEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/Practice_AppraisalEntity.cs index dbf249639..322d0391f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/Practice_AppraisalEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAppraisal/Practice_AppraisalEntity.cs @@ -59,6 +59,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("MODIFYUSERID")] public string ModifyUserId { get; set; } + + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/PracticeAssessService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/PracticeAssessService.cs index 00e12cad0..a5337f733 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/PracticeAssessService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/PracticeAssessService.cs @@ -38,7 +38,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.IUnit, t.IPost, t.Total_Score, - t.Assess_Content + t.Assess_Content , + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM Practice_Assess t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/Practice_AssessEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/Practice_AssessEntity.cs index aefbe6d1c..5b087a41f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/Practice_AssessEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeAssess/Practice_AssessEntity.cs @@ -94,6 +94,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("MODIFYUSERID")] public string ModifyUserId { get; set; } + + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/PracticeMaterialService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/PracticeMaterialService.cs index e003402e0..dd7ea3d6e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/PracticeMaterialService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/PracticeMaterialService.cs @@ -37,7 +37,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.Use_Total, t.Stock, t.Price, - t.Remark + t.Remark, + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM Practice_Material t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/Practice_MaterialEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/Practice_MaterialEntity.cs index d4532d5eb..082e6a422 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/Practice_MaterialEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeMaterial/Practice_MaterialEntity.cs @@ -64,6 +64,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("MODIFYUSERID")] public string ModifyUserId { get; set; } + + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/PracticeUnitVisitService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/PracticeUnitVisitService.cs index bf0fc8100..3a641f420 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/PracticeUnitVisitService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/PracticeUnitVisitService.cs @@ -37,7 +37,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.UnitId, t.Visit_Date, t.Visiter, - t.Feedback + t.Feedback, + t.attach_file, + t.upfileDate, + t.fileremark, + t.updatetime "); strSql.Append(" FROM Practice_Unit_Visit t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/Practice_Unit_VisitEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/Practice_Unit_VisitEntity.cs index d6a720500..d16f9a0b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/Practice_Unit_VisitEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeUnitVisit/Practice_Unit_VisitEntity.cs @@ -64,6 +64,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("MODIFYUSERID")] public string ModifyUserId { get; set; } + + /// + /// 附件 + /// + [Column("attach_file")] + public string attach_file { get; set; } + + /// + /// 上传时间 + /// + [Column("upfileDate")] + public DateTime? upfileDate { get; set; } + /// + /// 文件上传备注 + /// + [Column("fileremark")] + public string fileremark { get; set; } + /// + /// 上传次数 + /// + [Column("updatetime")] + public int? updatetime { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/RecruitEnterpriseReg/Recruit_Enterprise_RegEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/RecruitEnterpriseReg/Recruit_Enterprise_RegEntity.cs index e71186f31..a636297f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/RecruitEnterpriseReg/Recruit_Enterprise_RegEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/RecruitEnterpriseReg/Recruit_Enterprise_RegEntity.cs @@ -85,10 +85,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("MODIFYUSERID")] public string ModifyUserId { get; set; } - public string Enterprise_Name { get; set; } - public string Enterprise_Type { get; set; } - public string Business { get; set; } - public string Introduction { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjEntity.cs index 8d830d66b..83c674265 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjEntity.cs @@ -19,7 +19,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// [Column("ID")] - public string id { get; set; } + public long id { get; set; } /// /// ProjName /// @@ -64,13 +64,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void Create() { - this.id = Guid.NewGuid().ToString(); + //this.id = Guid.NewGuid().ToString(); + this.CreateTime = DateTime.Now; } /// /// 编辑调用 /// /// - public void Modify(string keyValue) + public void Modify(long keyValue) { this.id = keyValue; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjService.cs index 82cf926a3..42a0ee06a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateProj/StuGraduateProjService.cs @@ -137,7 +137,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.id == keyValue); + long id = Convert.ToInt64(keyValue); + this.BaseRepository("CollegeMIS").Delete(t=>t.id == id); } catch (Exception ex) { @@ -163,7 +164,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { if (!string.IsNullOrEmpty(keyValue)) { - entity.Modify(keyValue); + long id = Convert.ToInt64(keyValue); + entity.Modify(id); this.BaseRepository("CollegeMIS").Update(entity); } else 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 ca65ac0f3..b500f3fe2 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 @@ -2340,6 +2340,22 @@ + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/LogisticsLaultRepair/Logistics_Lault_RepairEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/LogisticsLaultRepair/Logistics_Lault_RepairEntity.cs index 4e95d1584..2aa7a3953 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/LogisticsLaultRepair/Logistics_Lault_RepairEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/LogisticsLaultRepair/Logistics_Lault_RepairEntity.cs @@ -53,7 +53,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// Repair_State /// [Column("REPAIR_STATE")] - public int? Repair_State { get; set; } + public string Repair_State { get; set; } /// /// Maintainer /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsBLL.cs new file mode 100644 index 000000000..442a8629f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:37 + /// 描 述:后勤维修统计 + /// + public class Logistics_Lault_Repair_StatisticsBLL : Logistics_Lault_Repair_StatisticsIBLL + { + private Logistics_Lault_Repair_StatisticsService logistics_Lault_Repair_StatisticsService = new Logistics_Lault_Repair_StatisticsService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return logistics_Lault_Repair_StatisticsService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Logistics_Lault_Repair_Statistics表实体数据 + /// + /// 主键 + /// + public Logistics_Lault_Repair_StatisticsEntity GetLogistics_Lault_Repair_StatisticsEntity(string keyValue) + { + try + { + return logistics_Lault_Repair_StatisticsService.GetLogistics_Lault_Repair_StatisticsEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + logistics_Lault_Repair_StatisticsService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Logistics_Lault_Repair_StatisticsEntity entity) + { + try + { + logistics_Lault_Repair_StatisticsService.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/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsEntity.cs new file mode 100644 index 000000000..1e49f2766 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsEntity.cs @@ -0,0 +1,93 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:37 + /// 描 述:后勤维修统计 + /// + public class Logistics_Lault_Repair_StatisticsEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// Statistics_Name + /// + [Column("STATISTICS_NAME")] + public string Statistics_Name { get; set; } + /// + /// Repair_Sum + /// + [Column("REPAIR_SUM")] + public int? Repair_Sum { get; set; } + /// + /// TotalMoney + /// + [Column("TOTALMONEY")] + public decimal? TotalMoney { get; set; } + /// + /// BeginTime + /// + [Column("BEGINTIME")] + public DateTime? BeginTime { get; set; } + /// + /// EndTime + /// + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } + /// + /// Createdate + /// + [Column("CREATEDATE")] + public DateTime? Createdate { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// ModifyTime + /// + [Column("MODIFYTIME")] + public DateTime? ModifyTime { get; set; } + /// + /// ModifyUserId + /// + [Column("MODIFYUSERID")] + public string ModifyUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.Createdate = DateTime.Now; + this.ModifyTime = DateTime.Now; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.ModifyTime = DateTime.Now; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsIBLL.cs new file mode 100644 index 000000000..5f4d2d972 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:37 + /// 描 述:后勤维修统计 + /// + public interface Logistics_Lault_Repair_StatisticsIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Logistics_Lault_Repair_Statistics表实体数据 + /// + /// 主键 + /// + Logistics_Lault_Repair_StatisticsEntity GetLogistics_Lault_Repair_StatisticsEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Logistics_Lault_Repair_StatisticsEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsService.cs new file mode 100644 index 000000000..3e2b1f8d3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Logistics_Lault_Repair_Statistics/Logistics_Lault_Repair_StatisticsService.cs @@ -0,0 +1,168 @@ +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.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:37 + /// 描 述:后勤维修统计 + /// + public class Logistics_Lault_Repair_StatisticsService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.Statistics_Name, + t.Repair_Sum, + t.BeginTime, + t.EndTime + "); + strSql.Append(" FROM Logistics_Lault_Repair_Statistics t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Statistics_Name"].IsEmpty()) + { + dp.Add("Statistics_Name", "%" + queryParam["Statistics_Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Statistics_Name Like @Statistics_Name "); + } + if (!queryParam["Repair_Sum"].IsEmpty()) + { + dp.Add("Repair_Sum", "%" + queryParam["Repair_Sum"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Repair_Sum Like @Repair_Sum "); + } + if (!queryParam["BeginTime"].IsEmpty()) + { + dp.Add("BeginTime",queryParam["BeginTime"].ToString(), DbType.String); + strSql.Append(" AND t.BeginTime = @BeginTime "); + } + if (!queryParam["EndTime"].IsEmpty()) + { + dp.Add("EndTime",queryParam["EndTime"].ToString(), DbType.String); + strSql.Append(" AND t.EndTime = @EndTime "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Logistics_Lault_Repair_Statistics表实体数据 + /// + /// 主键 + /// + public Logistics_Lault_Repair_StatisticsEntity GetLogistics_Lault_Repair_StatisticsEntity(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(string keyValue, Logistics_Lault_Repair_StatisticsEntity 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/LogisticsManagement/NetworkPracticalRepair/Network_Practical_RepairEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkPracticalRepair/Network_Practical_RepairEntity.cs index f3c334b8d..187200091 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkPracticalRepair/Network_Practical_RepairEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkPracticalRepair/Network_Practical_RepairEntity.cs @@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// Repair_State /// [Column("REPAIR_STATE")] - public int? Repair_State { get; set; } + public string Repair_State { get; set; } /// /// Maintainer /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkRepair/Network_RepairEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkRepair/Network_RepairEntity.cs index 7d28bc5bf..0710d55b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkRepair/Network_RepairEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/NetworkRepair/Network_RepairEntity.cs @@ -43,7 +43,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// Repair_State /// [Column("REPAIR_STATE")] - public int? Repair_State { get; set; } + public string Repair_State { get; set; } /// /// Maintainer /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsBLL.cs new file mode 100644 index 000000000..003c05185 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:31 + /// 描 述:网络实训统计 + /// + public class Network_Practical_Repair_StatisticsBLL : Network_Practical_Repair_StatisticsIBLL + { + private Network_Practical_Repair_StatisticsService network_Practical_Repair_StatisticsService = new Network_Practical_Repair_StatisticsService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return network_Practical_Repair_StatisticsService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Network_Practical_Repair_Statistics表实体数据 + /// + /// 主键 + /// + public Network_Practical_Repair_StatisticsEntity GetNetwork_Practical_Repair_StatisticsEntity(string keyValue) + { + try + { + return network_Practical_Repair_StatisticsService.GetNetwork_Practical_Repair_StatisticsEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + network_Practical_Repair_StatisticsService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Network_Practical_Repair_StatisticsEntity entity) + { + try + { + network_Practical_Repair_StatisticsService.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/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsEntity.cs new file mode 100644 index 000000000..d74ff4412 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsEntity.cs @@ -0,0 +1,93 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:31 + /// 描 述:网络实训统计 + /// + public class Network_Practical_Repair_StatisticsEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// Statistics_Name + /// + [Column("STATISTICS_NAME")] + public string Statistics_Name { get; set; } + /// + /// Repair_Sum + /// + [Column("REPAIR_SUM")] + public int? Repair_Sum { get; set; } + /// + /// TotalMoney + /// + [Column("TOTALMONEY")] + public decimal? TotalMoney { get; set; } + /// + /// BeginTime + /// + [Column("BEGINTIME")] + public DateTime? BeginTime { get; set; } + /// + /// EndTime + /// + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } + /// + /// Createdate + /// + [Column("CREATEDATE")] + public DateTime? Createdate { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// ModifyTime + /// + [Column("MODIFYTIME")] + public DateTime? ModifyTime { get; set; } + /// + /// ModifyUserId + /// + [Column("MODIFYUSERID")] + public string ModifyUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.Createdate = DateTime.Now; + this.ModifyTime = DateTime.Now; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.ModifyTime = DateTime.Now; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsIBLL.cs new file mode 100644 index 000000000..cb3667913 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:31 + /// 描 述:网络实训统计 + /// + public interface Network_Practical_Repair_StatisticsIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Network_Practical_Repair_Statistics表实体数据 + /// + /// 主键 + /// + Network_Practical_Repair_StatisticsEntity GetNetwork_Practical_Repair_StatisticsEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Network_Practical_Repair_StatisticsEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsService.cs new file mode 100644 index 000000000..e94069002 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Practical_Repair_Statistics/Network_Practical_Repair_StatisticsService.cs @@ -0,0 +1,168 @@ +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.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:31 + /// 描 述:网络实训统计 + /// + public class Network_Practical_Repair_StatisticsService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.Statistics_Name, + t.Repair_Sum, + t.BeginTime, + t.EndTime + "); + strSql.Append(" FROM Network_Practical_Repair_Statistics t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Statistics_Name"].IsEmpty()) + { + dp.Add("Statistics_Name", "%" + queryParam["Statistics_Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Statistics_Name Like @Statistics_Name "); + } + if (!queryParam["Repair_Sum"].IsEmpty()) + { + dp.Add("Repair_Sum", "%" + queryParam["Repair_Sum"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Repair_Sum Like @Repair_Sum "); + } + if (!queryParam["BeginTime"].IsEmpty()) + { + dp.Add("BeginTime",queryParam["BeginTime"].ToString(), DbType.String); + strSql.Append(" AND t.BeginTime = @BeginTime "); + } + if (!queryParam["EndTime"].IsEmpty()) + { + dp.Add("EndTime",queryParam["EndTime"].ToString(), DbType.String); + strSql.Append(" AND t.EndTime = @EndTime "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Network_Practical_Repair_Statistics表实体数据 + /// + /// 主键 + /// + public Network_Practical_Repair_StatisticsEntity GetNetwork_Practical_Repair_StatisticsEntity(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(string keyValue, Network_Practical_Repair_StatisticsEntity 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/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsBLL.cs new file mode 100644 index 000000000..9ccd27d58 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:26 + /// 描 述:网络维修统计 + /// + public class Network_Repair_StatisticsBLL : Network_Repair_StatisticsIBLL + { + private Network_Repair_StatisticsService network_Repair_StatisticsService = new Network_Repair_StatisticsService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return network_Repair_StatisticsService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Network_Repair_Statistics表实体数据 + /// + /// 主键 + /// + public Network_Repair_StatisticsEntity GetNetwork_Repair_StatisticsEntity(string keyValue) + { + try + { + return network_Repair_StatisticsService.GetNetwork_Repair_StatisticsEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + network_Repair_StatisticsService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Network_Repair_StatisticsEntity entity) + { + try + { + network_Repair_StatisticsService.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/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsEntity.cs new file mode 100644 index 000000000..f6a7b5b5a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsEntity.cs @@ -0,0 +1,93 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:26 + /// 描 述:网络维修统计 + /// + public class Network_Repair_StatisticsEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// Statistics_Name + /// + [Column("STATISTICS_NAME")] + public string Statistics_Name { get; set; } + /// + /// Repair_Sum + /// + [Column("REPAIR_SUM")] + public int? Repair_Sum { get; set; } + /// + /// TotalMoney + /// + [Column("TOTALMONEY")] + public decimal? TotalMoney { get; set; } + /// + /// BeginTime + /// + [Column("BEGINTIME")] + public DateTime? BeginTime { get; set; } + /// + /// EndTime + /// + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } + /// + /// Createdate + /// + [Column("CREATEDATE")] + public DateTime? Createdate { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// ModifyTime + /// + [Column("MODIFYTIME")] + public DateTime? ModifyTime { get; set; } + /// + /// ModifyUserId + /// + [Column("MODIFYUSERID")] + public string ModifyUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.Createdate = DateTime.Now; + this.ModifyTime = DateTime.Now; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.ModifyTime = DateTime.Now; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsIBLL.cs new file mode 100644 index 000000000..0f9c896e1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:26 + /// 描 述:网络维修统计 + /// + public interface Network_Repair_StatisticsIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Network_Repair_Statistics表实体数据 + /// + /// 主键 + /// + Network_Repair_StatisticsEntity GetNetwork_Repair_StatisticsEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Network_Repair_StatisticsEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsService.cs new file mode 100644 index 000000000..50f510f80 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Network_Repair_Statistics/Network_Repair_StatisticsService.cs @@ -0,0 +1,168 @@ +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.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:26 + /// 描 述:网络维修统计 + /// + public class Network_Repair_StatisticsService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.Statistics_Name, + t.Repair_Sum, + t.BeginTime, + t.EndTime + "); + strSql.Append(" FROM Network_Repair_Statistics t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Statistics_Name"].IsEmpty()) + { + dp.Add("Statistics_Name", "%" + queryParam["Statistics_Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Statistics_Name Like @Statistics_Name "); + } + if (!queryParam["Repair_Sum"].IsEmpty()) + { + dp.Add("Repair_Sum", "%" + queryParam["Repair_Sum"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Repair_Sum Like @Repair_Sum "); + } + if (!queryParam["BeginTime"].IsEmpty()) + { + dp.Add("BeginTime",queryParam["BeginTime"].ToString(), DbType.String); + strSql.Append(" AND t.BeginTime = @BeginTime "); + } + if (!queryParam["EndTime"].IsEmpty()) + { + dp.Add("EndTime",queryParam["EndTime"].ToString(), DbType.String); + strSql.Append(" AND t.EndTime = @EndTime "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Network_Repair_Statistics表实体数据 + /// + /// 主键 + /// + public Network_Repair_StatisticsEntity GetNetwork_Repair_StatisticsEntity(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(string keyValue, Network_Repair_StatisticsEntity 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/LogisticsManagement/QuickRepair/Quick_RepairEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepair/Quick_RepairEntity.cs index 8bb15abac..a6f42406e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepair/Quick_RepairEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepair/Quick_RepairEntity.cs @@ -43,7 +43,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// Repair_State /// [Column("REPAIR_STATE")] - public int? Repair_State { get; set; } + public string Repair_State { get; set; } /// /// Maintainer /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepairStatistics/Quick_Repair_StatisticsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepairStatistics/Quick_Repair_StatisticsEntity.cs index 92205559f..c5b5a7442 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepairStatistics/Quick_Repair_StatisticsEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/QuickRepairStatistics/Quick_Repair_StatisticsEntity.cs @@ -33,7 +33,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// Repair_State /// [Column("REPAIR_STATE")] - public int? Repair_State { get; set; } + public string Repair_State { get; set; } /// /// Repair_State_Sum /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsBLL.cs new file mode 100644 index 000000000..69371ba8d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:42 + /// 描 述:维护采购申请统计 + /// + public class Repair_Purchase_App_StatisticsBLL : Repair_Purchase_App_StatisticsIBLL + { + private Repair_Purchase_App_StatisticsService repair_Purchase_App_StatisticsService = new Repair_Purchase_App_StatisticsService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return repair_Purchase_App_StatisticsService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Repair_Purchase_App_Statistics表实体数据 + /// + /// 主键 + /// + public Repair_Purchase_App_StatisticsEntity GetRepair_Purchase_App_StatisticsEntity(string keyValue) + { + try + { + return repair_Purchase_App_StatisticsService.GetRepair_Purchase_App_StatisticsEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + repair_Purchase_App_StatisticsService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Repair_Purchase_App_StatisticsEntity entity) + { + try + { + repair_Purchase_App_StatisticsService.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/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsEntity.cs new file mode 100644 index 000000000..87bcf52ca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsEntity.cs @@ -0,0 +1,93 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:42 + /// 描 述:维护采购申请统计 + /// + public class Repair_Purchase_App_StatisticsEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// Statistics_Name + /// + [Column("STATISTICS_NAME")] + public string Statistics_Name { get; set; } + /// + /// Repair_Sum + /// + [Column("REPAIR_SUM")] + public int? Repair_Sum { get; set; } + /// + /// TotalMoney + /// + [Column("TOTALMONEY")] + public decimal? TotalMoney { get; set; } + /// + /// BeginTime + /// + [Column("BEGINTIME")] + public DateTime? BeginTime { get; set; } + /// + /// EndTime + /// + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } + /// + /// Createdate + /// + [Column("CREATEDATE")] + public DateTime? Createdate { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// ModifyTime + /// + [Column("MODIFYTIME")] + public DateTime? ModifyTime { get; set; } + /// + /// ModifyUserId + /// + [Column("MODIFYUSERID")] + public string ModifyUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.Createdate = DateTime.Now; + this.ModifyTime = DateTime.Now; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.Createdate = DateTime.Now; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsIBLL.cs new file mode 100644 index 000000000..d71878da3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:42 + /// 描 述:维护采购申请统计 + /// + public interface Repair_Purchase_App_StatisticsIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Repair_Purchase_App_Statistics表实体数据 + /// + /// 主键 + /// + Repair_Purchase_App_StatisticsEntity GetRepair_Purchase_App_StatisticsEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Repair_Purchase_App_StatisticsEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsService.cs new file mode 100644 index 000000000..1696cc79e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Repair_Purchase_App_Statistics/Repair_Purchase_App_StatisticsService.cs @@ -0,0 +1,168 @@ +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.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2023-02-05 22:42 + /// 描 述:维护采购申请统计 + /// + public class Repair_Purchase_App_StatisticsService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.Statistics_Name, + t.Repair_Sum, + t.BeginTime, + t.EndTime + "); + strSql.Append(" FROM Repair_Purchase_App_Statistics t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Statistics_Name"].IsEmpty()) + { + dp.Add("Statistics_Name", "%" + queryParam["Statistics_Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Statistics_Name Like @Statistics_Name "); + } + if (!queryParam["Repair_Sum"].IsEmpty()) + { + dp.Add("Repair_Sum", "%" + queryParam["Repair_Sum"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Repair_Sum Like @Repair_Sum "); + } + if (!queryParam["BeginTime"].IsEmpty()) + { + dp.Add("BeginTime",queryParam["BeginTime"].ToString(), DbType.String); + strSql.Append(" AND t.BeginTime = @BeginTime "); + } + if (!queryParam["EndTime"].IsEmpty()) + { + dp.Add("EndTime",queryParam["EndTime"].ToString(), DbType.String); + strSql.Append(" AND t.EndTime = @EndTime "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Repair_Purchase_App_Statistics表实体数据 + /// + /// 主键 + /// + public Repair_Purchase_App_StatisticsEntity GetRepair_Purchase_App_StatisticsEntity(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(string keyValue, Repair_Purchase_App_StatisticsEntity 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 + + } +}