移动端掌上评教课程列表新增选修课显示

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs

@@ -70,17 +70,25 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
                 //取库名
                 var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database;
                 var queryParam = queryJson.ToJObject();
+                //必修
                 var strSql = new StringBuilder();
                 strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a ");
                 strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "' and a.StuNo not in (select StuNo from " + misdbname + ".dbo.StuInfoBasic where ChangeStatus=1) ) aa ");
                 strSql.Append("left join  (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b  on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
                 strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
+                //选修
+                var strSql_Elective = new StringBuilder();
+                strSql_Elective.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName+'（选）' as LessonName from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonListOfElective a ");
+                strSql_Elective.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "' and a.StuNo not in (select StuNo from " + misdbname + ".dbo.StuInfoBasic where ChangeStatus=1) ) aa ");
+                strSql_Elective.Append("left join  (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b  on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
+                strSql_Elective.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
+
                 if (pagination != null)
                 {
-                    return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString(), pagination);
+                    return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString(), pagination).Union(this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql_Elective.ToString(), pagination));
                 }
                 else
-                    return BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString());
+                    return BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString()).Union(BaseRepository().FindList<Eval_QuestionResultEntity>(strSql_Elective.ToString()));
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -16,10 +16,10 @@ export default {
   //   "http://localhost:8088/"
   // ],
   "apiHost": [
-	  "http://192.168.10.58:8011/"
+	  "http://218.84.232.3:9003/"
     // "/api/",
   ],
-  "webHost":"http://192.168.10.31:8031/",
+  "webHost":"http://218.84.232.3:8000/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
     { username: "system", password: "www.qj.com" }