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;