Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js

@@ -13,8 +13,8 @@
             learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
 					//辅导员
-					$('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
-					$('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
+                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
+                    $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassTutorMobile);
 					
                     //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
                     var entity = data["StuInfoFreshEntity"];

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -128,12 +128,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                     for (int i = 0; i < Model.Count(); i++)
                     {
-                        var IspayList = this.BaseRepository("IsPay").ExecuteBySql($" select * from View_JFdd WHERE XH ='{Model[i].StuNo}' ").ToString().ToList();
-                        if (IspayList.Count > 0)
+                        //var IspayList = this.BaseRepository("IsPay").ExecuteBySql($" select * from View_JFdd WHERE XH ='{Model[i].StuNo}' ").ToString().ToList();
+                        //if (IspayList.Count > 0)
+                        //{
+                        //    Model[i].PayFeeStatus = "1";
+                        //    ListStuInfo.Add(Model[i]);
+                        //}
+                        var IspayList = this.BaseRepository("IsPay").FindTable($" select * from View_JFdd WHERE XH ='{Model[i].StuNo}' ");
+                        if (IspayList.Rows.Count > 0)
                         {
                             Model[i].PayFeeStatus = "1";
                             ListStuInfo.Add(Model[i]);
                         }
+                        else
+                        {
+                            Model[i].PayFeeStatus = "0";
+                            ListStuInfo.Add(Model[i]);
+                        }
                     }
                     this.BaseRepository("CollegeMIS").Update(ListStuInfo);
                 }