页面修改

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -52,13 +52,33 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.Type), query.Type);
                 }
+                //部门主管审核
                 if (query.AuditType == 1)
                 {
-                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorStatus=0 AND  A.DirectorId={0} ",Common.Config.StudyAbroadDirectorId);
+                    //待审核
+                    if (query.AuditState == 1)
+                    {
+                        builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorStatus=0 AND  A.DirectorId={0} ", query.AuditManId);
+                    }
+                    //已审核
+                    else
+                    {
+                        builder.AppendFormat(" AND A.DirectorStatus>0 AND A.DirectorId={0} ", query.AuditManId);
+                    }
                 }
+                //部门负责人审核
                 else if (query.AuditType == 2)
                 {
-                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 AND A.ManagerId={0} ",Common.Config.StudyAbroadManagerId);
+                    //待审核
+                    if (query.AuditState == 1)
+                    {
+                        builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 AND A.ManagerId={0} ", query.AuditManId);
+                    }
+                    //已审核
+                    else
+                    {
+                        builder.AppendFormat("  AND A.ManagerStatus>0 AND A.ManagerId={0} ", query.AuditManId);
+                    }
                 }
                 if (query.SaleState > 0)
                 {

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -191,8 +191,10 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 SupplierId = base.ParmJObj.GetInt("SupplierId"),
                 IsQPrice = base.ParmJObj.GetInt("IsQPrice"),
                 AuditType=base.ParmJObj.GetInt("AuditType"),
-                SaleState=(SaleStateEnum)base.ParmJObj.GetInt("SaleState")
+                SaleState=(SaleStateEnum)base.ParmJObj.GetInt("SaleState"),
+                AuditState=base.ParmJObj.GetInt("AuditState"),
             };
+            query.AuditManId = base.UserInfo.Id;
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
             var list = studyAbroadModule.GetStudyAbroadPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);

Edu.WebApi/publish.cmd

+@echo off
+    dotnet publish -o F:\վ\edu_publish -c realease
+exit
\ No newline at end of file