Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Acc_DormitoryChange/FormView.cshtml

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="HisDormitory" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="HisUnit" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="HisFloor" isvalid="yes" checkexpession="NotNull"readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="HisRId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">原因<font face="宋体">*</font></div>
+        <textarea id="Reason" class="form-control" style="height:50px;" isvalid="yes" checkexpession="NotNull" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Acc_DormitoryChange/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Acc_DormitoryChange/FormView.js

@@ -0,0 +1,191 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-11 14:34
+ * 描  述：宿舍调换申请
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#HisDormitory').lrDataSourceSelect({
+                code: 'Acc_DormitoryData', value: 'id', text: 'name', select: function (item) {
+                    if (item) {
+                        $('#HisUnit').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_UnitData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#HisUnit').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#HisFloor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_FloorData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#HisFloor').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#HisRId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+
+            $('#HisRId').lrselect({
+                text: 'name',
+                value: 'id',
+                allowSearch: true
+            })
+            $('#Dormitory').lrDataSourceSelect({
+                code: 'Acc_DormitoryData', value: 'id', text: 'name', select: function (item) {
+                    if (item) {
+                        $('#Unit').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_UnitData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#Unit').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#Floor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_FloorData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#Floor').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#RId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+
+            $('#RId').lrselect({
+                text: 'name',
+                value: 'id',
+                allowSearch: true
+            })
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Acc_DormitoryChange' && data[id]) {
+                            keyValue = data[id].ID;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        //判断是否是学生
+        var IdentityName = learun.clientdata.get(['userinfo']).Description;
+        if (IdentityName != "学生") {
+            learun.alert.warning("当前提交者非学生!!!");
+            return false;
+        }
+        var formData = $('#form').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js

@@ -670,7 +670,7 @@ var bootstrap = function ($, learun) {
                     //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     //{ label: "余额", name: "Balance", width: 100, align: "left" },
                     {
-                        label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
+                        label: "异动状态", name: "MoveStatus", width: 80, align: "center",
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js

@@ -415,7 +415,6 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.AbmormityMoveMark = 1;
             param.ClassNo = ClassNo;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Form.cshtml

@@ -181,7 +181,7 @@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">异动标志<font face="宋体">*</font></div>
-        <input id="AbmormityMoveMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="MoveStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">奖励标志<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js

@@ -126,7 +126,7 @@ var bootstrap = function ($, learun) {
                     { label: "余额", name: "Balance", width: 100, align: "left" },
                     { label: "通信地址", name: "MailAddress", width: 100, align: "left" },
                     {
-                        label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
+                        label: "异动状态", name: "MoveStatus", width: 80, align: "center",
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -963,6 +963,7 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_UserChangeInfo\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\Index.js" />
@@ -8016,6 +8017,7 @@
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs

@@ -343,7 +343,7 @@ from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo
   join (select l.lessonno,l.LessonTypeId,lt.ltorder from Exam_ExamLesson l left join CdLessonType lt on l.LessonTypeId=lt.ltid where l.elenabled=1 and  l.AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and l.Semester='{exam_ExamPlan.Semester}' ) t on a.lessonno=t.lessonno
 --left join (select l.lessonno,l.LessonTypeId,lt.ltorder from lessoninfo l left join CdLessonType lt on l.LessonTypeId=lt.ltid ) t on a.lessonno=t.lessonno
 where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) 
- and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) 
+ and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) 
 and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan.Semester}'
   and a.LessonNo not in (select LessonNo from Exam_ExamPlanLesson where EPId='{EPId}')
  group by t.ltorder,a.LessonNo,a.lessonname,t.LessonTypeId,b.Grade";
@@ -358,7 +358,7 @@ and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan
   join (select l.lessonno,l.LessonTypeId,lt.ltorder from Exam_ExamLesson l left join CdLessonType lt on l.LessonTypeId=lt.ltid where l.elenabled=1 and  l.AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and l.Semester='{exam_ExamPlan.Semester}' ) t on a.lessonno=t.lessonno
 --left join (select l.lessonno,l.LessonTypeId,lt.ltorder from lessoninfo l left join CdLessonType lt on l.LessonTypeId=lt.ltid ) t on a.lessonno=t.lessonno
  where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10))
-  and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null)
+  and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null)
 and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan.Semester}'
    and LessonNo not in (select LessonNo from Exam_ExamPlanLesson where EPId='{EPId}')
  group by  t.ltorder,a.LessonNo,a.lessonname,t.LessonTypeId,b.Grade ";

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs

@@ -379,7 +379,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     strSql.Append(@" a left join StuInfoBasic b on b.StuNo=a.StuNo
                     where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10))   ");
                     strSql.Append("  and a.AcademicYearNo ='" + AcademicYearNo + "' and a.Semester ='" + Semester + "' ");
-                    strSql.Append("  and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
+                    strSql.Append("  and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) ");
                     strSql.Append($@"  and a.stuno not in (select stuno from Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ESType='{ESType}'  union
  select StuNo from StuInfoBasicChange where StuChangeType in ('04','05','06') and CheckStatus='1' ) ");
                     strSql.Append(" group by a.stuno,a.stuname,a.classno,b.Grade");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -267,7 +267,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("INSCHOOLTELEPHONE")]
         public string InSchoolTelephone { get; set; }
         /// <summary>
-        /// 当前异动类别
+        /// 当前异动类别【旧异动字段，暂不使用】
         /// </summary>
         [Column("ABMORMITYMOVEMARK")]
         public string AbmormityMoveMark { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -88,10 +88,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Remark Like @Remark ");
                 }
-                if (!queryParam["AbmormityMoveMark"].IsEmpty())
-                {
-                    strSql.Append(" AND t.stuno not in(select stuno from StuInfoBasicChange where StuChangeType in('04','05','06') and checkstatus=1) ");
-                }
+                //旧
+                //if (!queryParam["AbmormityMoveMark"].IsEmpty())
+                //{
+                //    strSql.Append(" AND t.stuno not in(select stuno from StuInfoBasicChange where StuChangeType in('04','05','06') and checkstatus=1) ");
+                //}
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs

@@ -162,7 +162,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}',MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' ");
                         }
                     }
-                    else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
+                    else if (entity.StuChangeType == "04" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //退学、休学、转校
                     {
                         //改信息；不显示成绩；
                         db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1,MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' ");
@@ -213,7 +213,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}',MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");
                         }
                     }
-                    else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
+                    else if (entity.StuChangeType == "04" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //退学、休学、转校
                     {
                         //改信息；显示成绩；
                         db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null,MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs

@@ -279,7 +279,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("INSCHOOLTELEPHONE")]
         public string InSchoolTelephone { get; set; }
         /// <summary>
-        /// 异动标志
+        /// 异动标志【旧异动字段，暂不使用】
         /// </summary>
         /// <returns></returns>
         [Column("ABMORMITYMOVEMARK")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -1422,7 +1422,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 strSql.Append(" ,case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end as ScoreFormat ");
                 strSql.Append(" from ( ");
                 strSql.Append($" select s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
-                strSql.Append(" where 1=1 and s.LessonSortNo='1' ");
+                strSql.Append(" where 1=1 and s.LessonSortNo='1' and s.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1) ");
                 if (!queryParam["AcademicYearNo"].IsEmpty())
                 {
                     dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);

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

@@ -461,7 +461,7 @@ and (b.EduSystem is null or b.EduSystem != '6') ");
 				select a.* from 
 StuScore a 
 left join StuInfoBasic b on b.StuNo=a.StuNo
-where a.LessonSortNo='1' and (b.AbmormityMoveMark is null or len(b.AbmormityMoveMark)=0  or b.AbmormityMoveMark <> '1') 
+where a.LessonSortNo='1' and (b.ChangeStatus is null or len(b.ChangeStatus)=0  or b.ChangeStatus <> '1') 
 and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) 
 and a.StuNo not in (
 select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

@@ -406,8 +406,8 @@ else CONVERT(varchar,a.Score) end as Score2 ");
                 {
                     strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'");
                 }
-
-                strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
+                //旧
+                //strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
                 return this.BaseRepository("CollegeMIS").FindList<NotPassEntity>(strSql.ToString(), pagination);
             }
             catch (Exception ex)
@@ -512,7 +512,7 @@ else CONVERT(varchar,a.Score) end as Score2 ");
 				select a.* from 
 StuScoreNotPass a 
 left join StuInfoBasic b on b.StuNo=a.StuNo
-where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1'
+where a.LessonSortNo='1' and (b.ChangeStatus is null or len(b.ChangeStatus)=0  or b.ChangeStatus <> '1')
 and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) 
 and a.StuNo not in (
 select StuNo from StuScoreNotPassTwo p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo