报修优化去掉角色关联查询

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) });
         }
     };

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) });
         }
     };

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<RepairReport_StudentEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

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<RepairReport_TeacherEntity>(strSql.ToString(), dp, pagination);
             }