From da77f8be6909454c33d9f7de0d267c6612f9b81c Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 25 Jun 2021 18:25:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LR_Desktop/Views/QualityReport/Form.js | 2 - .../LR_Desktop/Views/QualityReport/Index.js | 12 +- .../Views/QualityReport/IndexReport.js | 16 ++- .../DBModel/资产系统.PDM | 115 ++++++++---------- .../QualityReportMainService.cs | 44 +++---- 5 files changed, 87 insertions(+), 102 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js index bb185a4fe..8fde253f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js @@ -27,9 +27,7 @@ var bootstrap = function ($, learun) { return m.Value = $('#' + id).val(); } }); - page.refreshRes(); - }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js index c8fd4ae38..5a87d6e57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js @@ -66,11 +66,11 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList', headData: [ - { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" }, + { label: "核心工作模块", name: "WorderModule", width: 300, align: "left" }, //{ label: "序号", name: "SerialNo", width: 100, align: "center" }, - { label: "项目名称", name: "ProjectName", width: 300, align: "center" }, + { label: "项目名称", name: "ProjectName", width: 300, align: "left" }, { - label: "填报周期", name: "FillingCycle", width: 100, align: "center", + label: "填报周期", name: "FillingCycle", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, @@ -94,7 +94,7 @@ var bootstrap = function ($, learun) { } }, { - label: "填报部门", name: "FillingDept", width: 100, align: "center", + label: "填报部门", name: "FillingDept", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', @@ -107,7 +107,7 @@ var bootstrap = function ($, learun) { } }, { - label: "填报人", name: "FillingPeople", width: 150, align: "center", + label: "填报人", name: "FillingPeople", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', @@ -133,7 +133,7 @@ var bootstrap = function ($, learun) { // } // } //}, - { label: "备注", name: "Demo", width: 300, align: "center" }, + { label: "备注", name: "Demo", width: 300, align: "left" }, ], mainId: 'Id', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js index 685ac95c1..8023e65b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js @@ -98,10 +98,10 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LR_Desktop/QualityReport/GetPageList', headData: [ - { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" }, - { label: "项目名称", name: "ProjectName", width: 300, align: "center" }, + { label: "核心工作模块", name: "WorderModule", width: 300, align: "left" }, + { label: "项目名称", name: "ProjectName", width: 300, align: "left" }, { - label: "填报部门", name: "FillingDept", width: 100, align: "center", + label: "填报部门", name: "FillingDept", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', @@ -114,16 +114,16 @@ var bootstrap = function ($, learun) { } }, { - label: "填报人", name: "CreateUserName", width: 150, align: "center" + label: "填报人", name: "CreateUserName", width: 150, align: "left" }, { - label: "公式计算结果", name: "Result", width: 150, align: "center" + label: "公式计算结果", name: "Result", width: 150, align: "left" }, { - label: "填报时间", name: "ReportTime", width: 150, align: "center" + label: "填报时间", name: "ReportTime", width: 150, align: "left" }, { - label: "状态", name: "Status", width: 150, align: "center", + label: "状态", name: "Status", width: 150, align: "left", formatter: function (cellvalue) { if (cellvalue === 0) { return '草稿'; @@ -140,8 +140,6 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.State = 3; - //param.FillingPeople = learun.clientdata.get(['userinfo']).userId; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM index b6efc97bd..386735805 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM @@ -1,5 +1,5 @@ - + @@ -12310,9 +12310,9 @@ LABL 0 新宋体,8,N 1624437837 -1624438664 +1624526823 -1 -((-132599,41678), (-113701,52763)) +((-132599,45060), (-113701,52763)) 0 12615680 16570034 @@ -49833,7 +49833,7 @@ B9AF QualityReportMain 1585293428 edy -1624437754 +1624526773 edy 上报主表 @@ -49885,6 +49885,30 @@ B9AF int +E39C5E7B-D32A-41BF-95E5-D7DE6CE78EAB +Formula +Formula +1585293515 +edy +1624526792 +edy +公式 +nvarchar(200) +200 + + +FF7099A9-491E-4607-895A-00B6D27074F8 +Result +Result +1585293515 +edy +1624526773 +edy +公式运算结果 +nvarchar(500) +500 + + 36BBDC31-1D43-4181-BCE2-2D4DA1940C51 CreateTime CreateTime @@ -49895,7 +49919,7 @@ B9AF 创建时间 datetime - + 9E220DE0-C5D3-402B-B7F2-56CF1A5C0409 CreateUserId CreateUserId @@ -49907,7 +49931,7 @@ B9AF nvarchar(50) 50 - + CECF27C1-8084-4698-8883-BF321FB306AB CreateUserName CreateUserName @@ -49921,7 +49945,7 @@ B9AF - + 4B012638-F18E-4F4B-8898-40CD8987FFEC Key_1 Key_1 @@ -49935,10 +49959,10 @@ B9AF - + - + @@ -49947,12 +49971,12 @@ B9AF QualityReportChild 1585293428 edy -1624438216 +1624521823 edy 上报子表 - + E12D9C6C-7A72-4032-844B-4A4FA76AA28F Id Id @@ -49964,7 +49988,7 @@ B9AF 50 1 - + F4BBFC0A-78D1-444C-91CC-4EDE1BFC8610 MainId MainId @@ -49976,7 +50000,7 @@ B9AF nvarchar(50) 50 - + 5BE6DE5E-EBA8-4F0A-B26B-FCE44B3EDFCA ProjectId ProjectId @@ -49988,7 +50012,7 @@ B9AF nvarchar(50) 50 - + A747E78F-224D-4857-A689-C2FB1C0D595F Value Value @@ -50000,44 +50024,9 @@ B9AF nvarchar(500) 500 - -FCAA6753-062E-4D3D-BF23-D4830D66422B -CreateTime -CreateTime -1585295304 -edy -1624437837 -edy -创建时间 -datetime - - -0145F75C-F629-4A2E-BACC-A0ABAF85141A -CreateUserId -CreateUserId -1624325491 -edy -1624437837 -edy -创建人 -nvarchar(50) -50 - - -E25348BE-B6C0-4FE9-8ED3-C4F05084EF90 -CreateUserName -CreateUserName -1624325491 -edy -1624437837 -edy -创建人 -nvarchar(50) -50 - - + 9327A4E6-3127-4744-810A-85F9F8FA2B1E Key_1 Key_1 @@ -50046,15 +50035,15 @@ B9AF 1624437837 edy - + - + - + @@ -50079,7 +50068,7 @@ B9AF - + 14D78C43-17A2-48F0-83B4-3DF757D5ABE8 1552635393 l @@ -50114,7 +50103,7 @@ B9AF - + FEAECB7B-8E2A-4492-A530-B0062E1511B8 1552635777 l @@ -50149,7 +50138,7 @@ B9AF - + 81527A47-E565-49C2-AAA7-F0555E81CE72 1553245426 l @@ -50184,7 +50173,7 @@ B9AF - + A3225D9D-069C-4A67-ABF0-43DC2FA55CF0 1553247802 l @@ -50218,7 +50207,7 @@ B9AF - + B458081F-CEE1-4251-9E7A-5E9CC93519D5 1553248376 l @@ -50253,7 +50242,7 @@ B9AF - + 8397C4F6-A728-4D3F-B2F8-FAC56886462B 1553248622 l @@ -50287,7 +50276,7 @@ B9AF - + 2F8BC700-F31E-41CC-9DA8-9505EAC5DA85 1553483161 l @@ -50321,7 +50310,7 @@ B9AF - + 0E2D2049-564F-4247-9F5B-B0AA82F9BE96 1555404296 admin @@ -50338,7 +50327,7 @@ B9AF - + 46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5 PUBLIC PUBLIC @@ -50601,7 +50590,7 @@ B9AF - + B1BAD530-6C69-4A9D-BD41-F62F564CA348 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs index 63b0d0d15..955d3d281 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs @@ -9,22 +9,22 @@ using System.Text; namespace Learun.Application.TwoDevelopment.LR_Desktop { /// -     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 -     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 -     /// 创 建：超级管理员 -     /// 日 期：2021-06-23 17:12 -     /// 描 述：上报主表 -     /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-06-23 17:12 + /// 描 述：上报主表 + /// public class QualityReportMainService : RepositoryFactory { #region 获取数据 /// -         /// 获取页面显示列表数据 -         /// -         /// 查询参数 -         /// 查询参数 -         /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// public IEnumerable GetPageList(Pagination pagination, string queryJson) { try @@ -53,10 +53,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } /// -         /// 获取QualityReportMain表实体数据 -         /// -         /// 主键 -         /// + /// 获取QualityReportMain表实体数据 + /// + /// 主键 + /// public QualityReportMainEntity GetQualityReportMainEntity(string keyValue) { try @@ -81,9 +81,9 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop #region 提交数据 /// -         /// 删除实体数据 -         /// -         /// 主键 + /// 删除实体数据 + /// + /// 主键 public void DeleteEntity(string keyValue) { try @@ -104,10 +104,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } /// -         /// 保存实体数据（新增、修改） -         /// -         /// 主键 -         /// 实体 + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 public void SaveEntity(string keyValue, QualityReportMainEntity entity) { try From 97c2fb5c4a83dae417d438ca8552a8dedf76bb55 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Mon, 28 Jun 2021 10:24:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_Desktop/Views/QualityReport/Index.js | 5 ++--- .../FillinFrom/FillinFromService.cs | 5 +++++ .../QualityReportChild/QualityReportChildService.cs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js index 5a87d6e57..425a80019 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js @@ -67,7 +67,6 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList', headData: [ { label: "核心工作模块", name: "WorderModule", width: 300, align: "left" }, - //{ label: "序号", name: "SerialNo", width: 100, align: "center" }, { label: "项目名称", name: "ProjectName", width: 300, align: "left" }, { label: "填报周期", name: "FillingCycle", width: 100, align: "left", @@ -142,8 +141,8 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.State = 3; - //param.FillingPeople = learun.clientdata.get(['userinfo']).userId; + param.SqlParameter = ' AND (FillingPeople is not null and len(FillingPeople)>0) and (Formula is not null and len(Formula)>0)'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; 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 7c8135b75..6e0bcbd56 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 @@ -86,6 +86,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } //queryParam["userId"].ToString() != "System" && } + //sql条件 + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs index 1407828e7..c185e9b2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs @@ -159,7 +159,7 @@ where a.Id='{keyValue}' order by b.Sort"; { if (DateTime.Now.Day >= 15) { - //return "每月1-15日才可填报！"; + return "每月1-15日才可填报！"; } int mouth = DateTime.Now.Month - 1; From 4ccd32e58292663e384780c8cd12dd7e6dfe6522 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Mon, 28 Jun 2021 10:45:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=88=97=E8=A1=A8=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_Desktop/Views/QualityReport/Index.js | 2 +- .../FillinFrom/FillinFromService.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js index 425a80019..3a2d19a65 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js @@ -142,7 +142,7 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; param.SqlParameter = ' AND (FillingPeople is not null and len(FillingPeople)>0) and (Formula is not null and len(Formula)>0)'; - + param.FillingPeople = learun.clientdata.get(['userinfo']).userId; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; 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 6e0bcbd56..04befb2db 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 @@ -70,8 +70,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["FillingPeople"].IsEmpty()) { - dp.Add("FillingPeople", queryParam["FillingPeople"].ToString(), DbType.String); - strSql.Append(" AND t.FillingPeople = @FillingPeople "); + if (queryParam["FillingPeople"].ToString() != "System") + { + dp.Add("FillingPeople", queryParam["FillingPeople"].ToString(), DbType.String); + strSql.Append(" AND t.FillingPeople = @FillingPeople "); + } } if (!queryParam["IsFlag"].IsEmpty()) {