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 @@ + 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 +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 力软敏捷开发框架 + /// Copyright (c) 2013-2018 上海力软信息技术有限公司 + /// 创 建：超级管理员 + /// 日 期：2019-08-19 17:50 + /// 描 述：教师注册 + /// + + public class MealCardRunTabApi : BaseApi + { + + private MealCardRunTabIBLL mealCardRunTabIBLL = new MealCardRunTabBLL(); + + /// + /// 一卡通接口 + /// + public MealCardRunTabApi() + : base("/Learun/adms/MealCardRunTab") + { + Get["/getlist"] = GetList; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + 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/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs index 8f6791f3d..84ce9608a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs @@ -327,8 +327,9 @@ where l.EPLId='{EPLId}' //排考记录表 var examPlan = db.FindEntity(EPId); //查询当前考试记录所有考试课程 - var lessonList = db.FindList($@"select a.*,b.LessonTypeId,b.MajorNo as TeachMajorNo FROM [dbo].[Exam_ExamPlanLesson] a -left join [dbo].[Exam_ExamLesson] b on a.ELId=b.ELId + var lessonList = db.FindList($@"select a.*,b.MajorNo as TeachMajorNo FROM [dbo].[Exam_ExamPlanLesson] a +left join [dbo].[Exam_ExamPlan] c on c.epid=a.epid +left join [dbo].[Exam_ExamLesson] b on a.lessonno=b.lessonno and b.AcademicYearNo=c.AcademicYearNo and b.Semester=c.Semester and b.Grade=a.Grade where a.EPId='{EPId}'"); foreach (var lesson in lessonList) { 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); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 78032ad68..8de4a6aa1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -814,7 +814,7 @@ "navigationBarTitleText": "监考安排" } }, - + //教师考勤 { "path": "pages/attendance/list", @@ -999,10 +999,10 @@ "navigationBarTitleText": "会议扫码签到" } } - - - ], + + + ], // 全局样式 "globalStyle": { @@ -1027,11 +1027,11 @@ "iconPath": "static/img-bar/tab-home.png", "selectedIconPath": "static/img-bar/tab-home-active.png", "text": "首页" - }, { - "pagePath": "pages/msg", - "iconPath": "static/img-bar/tab-msg.png", - "selectedIconPath": "static/img-bar/tab-msg-active.png", - "text": "消息" + // }, { + // "pagePath": "pages/msg", + // "iconPath": "static/img-bar/tab-msg.png", + // "selectedIconPath": "static/img-bar/tab-msg-active.png", + // "text": "消息" }, { "pagePath": "pages/contact", @@ -1096,7 +1096,7 @@ "u-parse": "@/components/u-parse/u-parse.vue" } } - } +} // "condition" : { //模式配置，仅开发期间生效 // "current": 0, //当前激活的模式(list 的索引项) // "list": [ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue index 5bff4a61e..fb4c21cb9 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue @@ -33,6 +33,7 @@ export default { methods: { // 处理点击用户的场合，跳转到消息页 userClick(item) { + return this.NAV_TO(`/pages/msg/chat?id=${item.id}&name=${item.name}`) } },