From 5b198ec2b7e74ffcfb573f2d0d3e11a78a61ba9b Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 12 Aug 2022 14:58:11 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E4=B8=80=E5=8D=A1=E9=80=9A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.WebApi.csproj          |  1 +
 .../Modules/MealCardRunTabApi.cs              | 64 +++++++++++++++++++
 .../MealCardRunTab/MealCardRunTabService.cs   | 12 ++++
 3 files changed, 77 insertions(+)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
index 193b772cd..e23e11586 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj	
@@ -209,6 +209,7 @@
     <Compile Include="Modules\ListenClassRecordApi.cs" />
     <Compile Include="Modules\MpManagementApi.cs" />
     <Compile Include="Modules\PersonnelManagement\EpidemicSituationCopyApi.cs" />
+    <Compile Include="Modules\MealCardRunTabApi.cs" />
     <Compile Include="Modules\StuScoreApi.cs" />
     <Compile Include="Modules\StuInfoBasicApi.cs" />
     <Compile Include="Modules\StatisticsApi.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs
new file mode 100644
index 000000000..cfb5eaa8a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs	
@@ -0,0 +1,64 @@
+using Nancy;
+using Learun.Util;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using static Learun.Application.WebApi.Modules.StuInfoFreshApi;
+using System;
+using System.IO;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.OA;
+using Learun.Application.OA.File.FileInfo;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Application.WorkFlow;
+using Microsoft.Ajax.Utilities;
+
+namespace Learun.Application.WebApi
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架  
+    /// Copyright (c) 2013-2018 上海力软信息技术有限公司  
+    /// 创 建：超级管理员 
+    /// 日 期：2019-08-19 17:50 
+    /// 描 述：教师注册 
+    /// </summary>
+
+    public class MealCardRunTabApi : BaseApi
+    {
+
+        private MealCardRunTabIBLL mealCardRunTabIBLL = new MealCardRunTabBLL();
+
+        /// <summary> 
+        /// 一卡通接口
+        /// <summary> 
+        public MealCardRunTabApi()
+            : base("/Learun/adms/MealCardRunTab")
+        {
+            Get["/getlist"] = GetList;
+        }
+        #region  获取数据 
+
+        /// <summary> 
+        /// 获取页面显示列表分页数据 
+        /// <summary> 
+        /// <param name="_"></param> 
+        /// <returns></returns> 
+        public Response GetList(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = mealCardRunTabIBLL.GetPageList(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            return Success(jsonData);
+        }
+
+        #endregion
+    }
+
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs
index 80808978d..04187986f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs	
@@ -182,6 +182,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("identiName", queryParam["identiName"].ToString(), DbType.String);
                     strSql.Append(" AND t.identiName = @identiName ");
                 }
+                if (!queryParam["IsStuOrTeach"].IsEmpty())
+                {
+                    var IsStuOrTeach = queryParam["IsStuOrTeach"].ToString();
+                    if (IsStuOrTeach == "0")
+                    {
+                        strSql.Append(" AND t.identiName = '教师' ");
+                    }
+                    else if (IsStuOrTeach == "1")
+                    {
+                        strSql.Append(" AND t.identiName = '学生' ");
+                    }
+                }
                 if (!queryParam["flowtype"].IsEmpty())
                 {
                     dp.Add("flowtype", queryParam["flowtype"].ToString(), DbType.String);