From 56dcb09ff6d69e75b321fbc1bec8746463ee7af5 Mon Sep 17 00:00:00 2001 From: edy Date: Tue, 29 Jun 2021 16:42:40 +0800 Subject: [PATCH] --- .../Controllers/FillinFromController.cs | 15 ++- .../Views/FillinFrom/Form.cshtml | 4 - .../Views/FillinFrom/Form.js | 11 +- .../Views/FillinFrom/FormPeople.cshtml | 12 ++- .../Views/FillinFrom/FormPeople.js | 14 +++ .../Views/FillinFrom/Formula.cshtml | 59 ----------- .../Views/FillinFrom/Formula.js | 100 ------------------ .../Views/FillinFrom/FormulaIndex.cshtml | 55 ---------- .../Views/FillinFrom/FormulaIndex.js | 75 ------------- .../Views/FillinFrom/Index.js | 88 ++++++++------- .../FillinFrom/FillinFromEntity.cs | 5 - .../FillinFrom/FillinFromService.cs | 3 +- 12 files changed, 88 insertions(+), 353 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs index 56872406c..1f044b9b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Collections.Generic; using System.Linq; using Learun.Application.Organization; +using Learun.Application.TwoDevelopment.LR_Desktop; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -19,6 +20,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private FillinFromIBLL fillinFromIBLL = new FillinFromBLL(); private DepartmentBLL departmentIBLL = new DepartmentBLL(); + private QualityReportMainIBLL fualityReportMainIBLL = new QualityReportMainBLL(); #region 视图功能 /// @@ -140,10 +142,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var Model = fillinFromIBLL.GetFillInNo(keyValue); if (Model != null) { - //重新填写 - Model.IsDel = 1; + Model.State = -1; + fualityReportMainIBLL.DelProjectByFId(keyValue); } - fillinFromIBLL.SaveEntity(keyValue, Model); return Success("作废成功！"); } @@ -168,6 +169,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers entity.State = 2; } #endregion + fualityReportMainIBLL.EditProjectByFId(keyValue); + } fillinFromIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); @@ -189,7 +192,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (Model != null) { //重新填写 - Model.State = 2; + Model.State = 1; } fillinFromIBLL.SaveEntity(keyValue, Model); return Success("保存成功！"); @@ -233,8 +236,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (Model != null) { //重新填写 - Model.State = 3; + Model.State = 0; + Model.FillingPeople = ""; } + fualityReportMainIBLL.EditProjectByFId(keyValue); fillinFromIBLL.SaveEntity(keyValue, Model); return Success("保存成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml index 00d205c31..5b66f8c15 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml @@ -51,9 +51,5 @@
隐藏/显示
- @Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js index 1daf31626..4e3dadd27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js @@ -15,17 +15,17 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#Formula').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' }); + $('#Formula').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' }); $('#Formula').lrGirdSelect({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain', selectWord: 'name', value: 'id', text: 'name', headData: - [ - { label: "公式", name: "result", width: 300, align: "left" }, - { label: "公式名称", name: "name", width: 300, align: "left" } - ], + [ + { label: "公式", name: "result", width: 300, align: "left" }, + { label: "公式名称", name: "name", width: 300, align: "left" } + ], select: function (item) { } }); @@ -63,7 +63,6 @@ var bootstrap = function ($, learun) { } $('#State').val('0'); $('#IsFlag').val('0'); - $('#IsDel').val('0'); } }; // 保存数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.cshtml index 5f8aed7df..5af2b7d4f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.cshtml @@ -12,7 +12,7 @@
-
序      号*
+
序       号*
@@ -20,7 +20,7 @@
-
填报周期
+
填报周期*
@@ -28,8 +28,12 @@
-
填报人*
-
+
填  报  人*
+
+
+
+
公      式*
+
备      注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.js index 82016407d..35bd75372 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.js @@ -15,6 +15,20 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#Formula').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' }); + $('#Formula').lrGirdSelect({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain', + selectWord: 'name', + value: 'id', + text: 'name', + headData: + [ + { label: "公式", name: "result", width: 300, align: "left" }, + { label: "公式名称", name: "name", width: 300, align: "left" } + ], + select: function (item) { + } + }); $('#lrPeople')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName); $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.cshtml deleted file mode 100644 index d92b9bd34..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.cshtml +++ /dev/null @@ -1,59 +0,0 @@ -@{ - ViewBag.Title = "质量目标管理体系指标模块"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
工作模块*
- -
-
-
项目名称*
- -
-
-
序      号*
- -
-
-
填报部门*
-
-
-
-
填报周期
-
-
-
-
填报时间
-
-
-
-
填报人*
-
-
-
-
设置公式*
-
-
-
-
备      注
- -
- - - - -
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/Formula.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.js deleted file mode 100644 index 8fe150275..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.js +++ /dev/null @@ -1,100 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2021-06-21 18:39 - * 描 述：质量目标管理体系指标模块 - */ -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 () { - $('#Formula').lrGirdSelect({ - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain', - selectWord: 'name', - value: 'id', - text: 'name', - headData: - [ - { label: "公式", name: "result", width: 300, align: "left" }, - { label: "公式名称", name: "name", width: 300, align: "left" } - ], - select: function (item) { - } - }); - $('#lrPeople')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; - $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName); - $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); - $('#FillingDept').lrDataSourceSelect({ - code: 'classdata', - value: 'id', - text: 'name', - select: function (item) { - var DeptCode = $('#FillingDept').lrselectGet(); - if (DeptCode != null && DeptCode != "" && DeptCode != undefined) { - $('#FillingPeople').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata', - value: 'f_userid', - text: 'f_realname', - param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" }, - maxHeight: 200 - }); - } - } - }); - $("#FillingPeople").lrselect(); - //设置周期 - $('#FillingCycle').lrDataItemSelect({ - code: 'ThisCycle', - select: function (item) { - var Cycles = $("#FillingCycle").lrselectGet(); - if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) { - $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' }); - } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) { - $('#FillingTime').lrDataItemSelect({ code: 'undefined' }); - } else { - $('#FillingTime').lrDataItemSelect({ code: 'undefined' }); - } - } - }); - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/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]); - } - } - }); - } - $('#State').val('0'); - $('#IsFlag').val('0'); - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('body').lrValidform()) { - return false; - } - var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) - }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.cshtml deleted file mode 100644 index ee19c338f..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.cshtml +++ /dev/null @@ -1,55 +0,0 @@ -@{ - ViewBag.Title = "质量目标管理体系指标模块"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
工作模块*
- -
-
-
项目名称*
- -
-
-
序      号*
- -
-
-
填报部门*
-
-
-
-
填报周期*
-
-
-
-
填报时间
-
-
- @*
-
填报人*
-
-
*@ -
-
备      注
- -
- - - - -
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.js deleted file mode 100644 index 9230a6b74..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.js +++ /dev/null @@ -1,75 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2021-06-21 18:39 - * 描 述：质量目标管理体系指标模块 - */ -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 () { - $('#lrPeople')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; - $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName); - $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); - $('#FillingDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); - //$('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }); - $('#FillingCycle').lrDataItemSelect({ - code: 'ThisCycle', - select: function (item) { - var Cycles = $("#FillingCycle").lrselectGet(); - if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) { - $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' }); - } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) { - //$('#FillingTime').lrselect({ - // code: 'CycleTime', value: 'id', text: 'name', - // maxHeight: 200, - // select: function (item) { } - //}) - $('#FillingTime').lrDataItemSelect({ code: 'undefined' }); - } else { - $('#FillingTime').lrDataItemSelect({ code: 'undefined' }); - } - } - }); - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/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]); - } - } - }); - } - $('#State').val('0'); - $('#IsFlag').val('0'); - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('body').lrValidform()) { - return false; - } - var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) - }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js index 53389e82a..d7c24c1c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js @@ -28,30 +28,38 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form', - width: 500, + width: 600, height: 400, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } }); }); - //提交 + // 提交 $('#lr_submit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { var State = $('#gridtable').jfGridValue('State'); - if (State == 0) { - learun.alert.warning("当前项已提交,不能重复提交！"); + var IsFlag = $('#gridtable').jfGridValue('IsFlag'); + if (State >= 1) { + learun.alert.warning("当前项已提交,请勿重复提交！"); + return false; + } else if (State == -1) { + learun.alert.warning("当前项已作废,不能提交！"); + return false; + } + if (IsFlag == 1) { + learun.alert.warning("当前项已作废,不能提交！"); return false; } - learun.layerConfirm('是否确认提交该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/Submit', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/Submit', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); }); // 编辑 $('#lr_edit').on('click', function () { @@ -62,16 +70,22 @@ var bootstrap = function ($, learun) { learun.alert.warning("当前项目已提交不能修改！"); return; } - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); + learun.layerConfirm('是否确认修改该项,修改成后会影响数据！', function (res) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + learun.layerConfirm('确定要修改当前项吗！', function (res) { + if (res) { + return top[id].acceptClick(refreshGirdData); + } + }) + } + }); + }) } }); //作废 @@ -79,11 +93,11 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { var State = $('#gridtable').jfGridValue('State'); - if (State !== 0) { - learun.alert.warning("当前项目已提交不能删除！"); - return; + if (State == -1) { + learun.alert.warning("当前项已作废,请勿重复操作 ！"); + return false; } - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认作废该项,此操作将改变数据！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); @@ -97,9 +111,9 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { var State = $('#gridtable').jfGridValue('State'); - if (State <= 3) { - learun.alert.warning("当前项未执行到此处,不能测回！"); - return false; + if (State <= 0) { + learun.alert.warning("当前项已撤回或作废,请勿重复操作！"); + return; } learun.layerConfirm('是否确认撤回该项！', function (res) { if (res) { @@ -124,7 +138,7 @@ var bootstrap = function ($, learun) { title: '设置填报人', url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormPeople?keyValue=' + keyValue, width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -154,7 +168,7 @@ var bootstrap = function ($, learun) { { label: "序号", name: "SerialNo", width: 100, align: "center" }, { label: "项目名称", name: "ProjectName", width: 250, align: "center" }, { - label: "填报周期", name: "FillingCycle", width: 100, align: "center", + label: "填报周期", name: "FillingCycle", width: 80, align: "center", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, @@ -219,22 +233,20 @@ var bootstrap = function ($, learun) { { label: "状态", name: "State", width: 150, align: "center", formatter: function (cellvalue) { - if (cellvalue === 0) { + if (cellvalue === -1) { + return '作废'; + } else if (cellvalue === 0) { return '草稿'; } else if (cellvalue === 1) { return '待设置填报人'; } else if (cellvalue === 2) { - return '待设置公式'; - } else if (cellvalue === 3) { - return '待填报'; - } else { - return '已完成'; + return '待填报'; } } }, - { label: "备注", name: "Demo", width: 250, align: "center" }, + { label: "备注", name: "Demo", width: 240, align: "center" }, { - label: "隐藏/显示", name: "IsFlag", width: 150, align: "center", + label: "隐藏/显示", name: "IsFlag", width: 100, align: "center", formatter: function (cellvalue) { if (cellvalue === 0) { return '显示'; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs index 04042f691..d51b643cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs @@ -89,11 +89,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ///
[Column("ISFLAG")] public int? IsFlag { get; set; } - /// - /// 是否作废 0 否 1 是 - /// - [Column("ISDEL")] - public int? IsDel { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs index b57313356..b5ab775ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs @@ -46,8 +46,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.State, t.lrPeople, t.lrTime, - t.IsFlag, - t.IsDel + t.IsFlag "); strSql.Append(" FROM FillinFrom t "); strSql.Append(" WHERE 1=1 ");