From 5f5bdfb36bc904155848852ca47b890c27ab9484 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 30 Aug 2023 16:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E4=BC=98=E5=8C=96=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepairReportStudent/statisticIndex.js | 1 + .../RepairReportTeacher/statisticIndex.js | 1 + .../RepairReportStudentService.cs | 26 +++++++++++-------- .../RepairReportTeacherService.cs | 25 ++++++++++-------- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/statisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/statisticIndex.js index 6847a10b5..60178f4e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/statisticIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/statisticIndex.js @@ -173,6 +173,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = startTime; param.EndTime = endTime; + param.Status = '3' $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/statisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/statisticIndex.js index 65972518c..dba0bbf70 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/statisticIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/statisticIndex.js @@ -136,6 +136,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = startTime; param.EndTime = endTime; + param.Status = '3' $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReportStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReportStudentService.cs index 5e0024a80..194f3f33b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReportStudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReportStudentService.cs @@ -46,21 +46,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } if (!queryParam["Status"].IsEmpty()) { - strSql.Append(" AND t.Status !=0 "); + if (queryParam["Status"].ToString() == "3") + { + strSql.Append($" AND t.Status = 3"); + } + else + { + strSql.Append($" AND t.Status !=0"); + } } - var userLogin = LoginUserInfo.Get(); - //按角色查询是否有查看的权限 - var MaintainRoleId = Config.GetValue("MaintainRoleId"); - var loginInfoRoleIds = LoginUserInfo.Get().roleIds; - if (!userLogin.Description.Contains("管理员") && !loginInfoRoleIds.Split(',').Contains(MaintainRoleId)) + // 啥也不传自己看自己 传1 教师保修处理 不看草稿 传3 统计不草稿 + else { + var userLogin = LoginUserInfo.Get(); + //按角色查询是否有查看的权限 + //if (!userLogin.Description.Contains("管理员")) + //{ strSql.Append(" AND t.Creator = '" + userLogin.userId + "' "); + //} } - //else - //{ - // dp.Add("Creator", queryParam["Creator"].ToString(), DbType.String); - // strSql.Append(" AND t.Creator = @Creator "); - //} 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/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs index f50362a52..37b4209b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs @@ -46,20 +46,23 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } if (!queryParam["Status"].IsEmpty()) { - strSql.Append(" AND t.Status !=0 "); + if (queryParam["Status"].ToString() == "3") + { + strSql.Append($" AND t.Status =3"); + } + else + { + strSql.Append($" AND t.Status !=0"); + } } - var userLogin = LoginUserInfo.Get(); - //按角色查询是否有查看的权限 - var MaintainRoleId = Config.GetValue("MaintainRoleId"); - var loginInfoRoleIds = LoginUserInfo.Get().roleIds; - if (!userLogin.Description.Contains("管理员") && !loginInfoRoleIds.Split(',').Contains(MaintainRoleId)) + else { + var userLogin = LoginUserInfo.Get(); + //按角色查询是否有查看的权限 + //if (!userLogin.Description.Contains("管理员")) + //{ strSql.Append(" AND t.Creator = '" + userLogin.userId + "' "); - } - if (!queryParam["Status"].IsEmpty()) - { - //dp.Add("Status", queryParam["Status"].ToString(), DbType.String); - strSql.Append(" AND t.Status !=0 "); + //} } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); }