【修改】补考名单查看新：增加学习形式和异动类型；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js

@@ -128,6 +128,29 @@ var bootstrap = function ($, learun) {
                     { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" },
                     { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" },
                     { label: "成绩", name: "Score2", width: 150, align: "left" },
+                    {
+                        label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StudyModality',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "异动类型", name: "MoveType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuChangeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml

@@ -90,9 +90,6 @@
                             <a id="lr_check" class="btn btn-default"><i class="fa fa-lock">&nbsp;提交教务处</i></a>
                             <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-lock">&nbsp;去审核成绩</i></a>
                         </div>
-                        <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                            <a id="lr_export" class="btn btn-default"><i class="fa fa-lock">&nbsp;导出</i></a>
-                        </div>
                     </div>
 
                 </div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs

@@ -344,6 +344,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string Score2 { get; set; }
         public string BKScore { get; set; }
         public string IsSubmit { get; set; }
+        public string MoveType { get; set; }
+        public string StudyModality { get; set; }
     }
 }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs

@@ -176,7 +176,7 @@ else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2,
 case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo)
 else CONVERT(varchar,a.TermEndScore) end as TermEndScore2,
 case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo)
-else CONVERT(varchar,a.Score) end as Score2 ");
+else CONVERT(varchar,a.Score) end as Score2,b.MoveType,b.StudyModality ");
                 strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo ");
                 strSql.Append(
                     @" left join  StuScoreNotPass ssnp  on ssnp.StuNo = a.StuNo and ssnp.lessonno = a.lessonno ");