考试科目调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs

@@ -200,16 +200,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 return Fail("不能修改关联学科");
             }
             cdMajorIBLL.SaveEntity(keyValue, entity);
-            #region 给关联表添加科目
-            MajorAndSubjectEntity majorAndSubjectEntity = new MajorAndSubjectEntity();
-            string[] SubNo = entity.SubjectNo.Split(',');
-            for (int i = 0; i < SubNo.Length; i++)
-            {
-                majorAndSubjectEntity.MajorId = entity.ID;//关联专业主键
-                majorAndSubjectEntity.SubId = SubNo[i];//考试科目的主键
-                majorAndSubjectIBLL.SaveEntity("", majorAndSubjectEntity);
-            }
-            #endregion
+            //#region 给关联表添加科目
+            //MajorAndSubjectEntity majorAndSubjectEntity = new MajorAndSubjectEntity();
+            //string[] SubNo = entity.SubjectNo.Split(',');
+            //for (int i = 0; i < SubNo.Length; i++)
+            //{
+            //    majorAndSubjectEntity.MajorId = entity.ID;//关联专业主键
+            //    majorAndSubjectEntity.SubId = SubNo[i];//考试科目的主键
+            //    majorAndSubjectIBLL.SaveEntity("", majorAndSubjectEntity);
+            //}
+            //#endregion
             return Success("保存成功！");
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs

@@ -948,6 +948,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         public ActionResult UpdateEnrollStatus(string keyValue, string strEntity)
         {
+            var StuEnrollData = stuEnrollIBLL.GetStuEnrollEntity(keyValue);
+            if (string.IsNullOrEmpty(StuEnrollData.SubjectNo) )
+            {
+                return Fail("考试科目不能为空！");
+            }
+
             stuEnrollIBLL.UpdateEnrollStatus(keyValue, 2);
             return Success("保存成功");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs

@@ -73,7 +73,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             List<StuEnrollMidExamScoreEntity> scoreData = scoreList.ToObject<List<StuEnrollMidExamScoreEntity>>();
             if (string.IsNullOrEmpty(keyValue))
             {
-                var model = stuEnrollIBLL.GetEntityByPersonalData(entity.IDCard, entity.StuMobile);
+                var model = stuEnrollIBLL.GetEntityByPersonalData(entity.IDCard, entity.StuName);
                 if (model != null)
                 {
                     return Fail("您已报名，请耐心等待结果！");

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

@@ -23,11 +23,12 @@
         <div class="lr-form-item-title">校区<font face="宋体">*</font></div>
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
-        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
-        <input id="SubjectName" type="hidden" />
-    </div>
+    @*考试科目在报名管理下维护
+            <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+            <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+            <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
+            <input id="SubjectName" type="hidden" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
         <div id="Year" isvalid="yes" checkexpession="Num"></div>
@@ -45,13 +46,13 @@
         <div id="DeptNo"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">名称缩写</div>
-        <input id="MajorNameBrief" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">英文名称</div>
-        <input id="MajorNameEn" type="text" class="form-control" />
-    </div>*@
+            <div class="lr-form-item-title">名称缩写</div>
+            <input id="MajorNameBrief" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+            <div class="lr-form-item-title">英文名称</div>
+            <input id="MajorNameEn" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">教委专业代码</div>
         <input id="GovMajorNo" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.cshtml

@@ -47,22 +47,25 @@
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">县区<font face="宋体">*</font></div>
         <div id="County" isvalid="yes" checkexpession="NotNull"></div>
-       @* <input id="County" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
+    <div class="col-xs-6 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证正面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证正面照<font face="宋体">*</font></div>
         <div id="IdCardPto1"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证反面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证反面照<font face="宋体">*</font></div>
         <div id="IdCardPto2"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">初中毕业证照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">初中毕业证照<font face="宋体">*</font></div>
         <div id="MidDiplomaPto"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js

@@ -23,7 +23,13 @@ var bootstrap = function ($, learun) {
             $('#MidAchievementPto').lrUploader();
             $('#Gender').lrDataItemSelect({ code: 'usersexbit' });
             $('#Nationals').lrDataItemSelect({ code: 'National' });
-
+            $('#SubjectNo').lrselect({
+                type: 'multiple',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                value: 'subjectno',
+                text: 'subjectname',
+                maxHeight: 200
+            });
             //地市
             $('#City').lrselect({
                 allowSearch: true,
@@ -58,42 +64,33 @@ var bootstrap = function ($, learun) {
                 value: "acode",
                 text: "aname",
                 maxHeight: 200,
-                select: function (item) {
-                    if (item) {
-                        var countyCode = $("#County").lrselectGet();
+                //select: function (item) {
+                //    if (item) {
+                //        var countyCode = $("#County").lrselectGet();
 
-                        //专业
-                        $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl +
-                                '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: {
-                                //strWhere: "1=1 and Area='" + countyCode + "'"
-                                strWhere: "1=1"
-                            },
-                            value: "id",
-                            text: "majorname",
-                            maxHeight: 200,
-                        });
-                        if (MajorNo) {
-                            $('#MajorNo').lrselectSet(MajorNo);
-                            MajorNo = '';
-                        }
-                    }
+                //        //专业
+                //        $('#MajorNo').lrselectRefresh({
+                //            url: top.$.rootUrl +
+                //                '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                //            param: {
+                //                //strWhere: "1=1 and Area='" + countyCode + "'"
+                //                strWhere: "1=1"
+                //            },
+                //            value: "id",
+                //            text: "majorname",
+                //            maxHeight: 200,
+                //        });
+                //        if (MajorNo) {
+                //            $('#MajorNo').lrselectSet(MajorNo);
+                //            MajorNo = '';
+                //        }
+                //    }
 
-                }
+                //}
             });
             //专业
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            //$('#MajorNo').lrselectRefresh({
-            //    url: top.$.rootUrl +
-            //        '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-            //    param: {
-            //        strWhere: "1=1"
-            //    },
-            //    value: "id",
-            //    text: "majorname",
-            //    maxHeight: 200,
-            //});
+
 
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
 
@@ -146,7 +143,8 @@ var bootstrap = function ($, learun) {
     acceptClick = function (callBack) {
         if (!$('body').lrValidform()) {
             return false;
-        } var scoreList = [];
+        }
+        var scoreList = [];
 
         $.each($("#scoreDiv .SEMidExamScore"),
             function (i, item) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml

@@ -57,20 +57,24 @@
         <div class="lr-form-item-title">县区<font face="宋体">*</font></div>
         <div id="County" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
+    <div class="col-xs-6 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证正面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证正面照<font face="宋体">*</font></div>
         <div id="IdCardPto1"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证反面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证反面照<font face="宋体">*</font></div>
         <div id="IdCardPto2"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">初中毕业证照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">初中毕业证照<font face="宋体">*</font></div>
         <div id="MidDiplomaPto"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js

@@ -32,6 +32,13 @@ var bootstrap = function ($, learun) {
             $('#Nationals').lrDataItemSelect({ code: 'National' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            $('#SubjectNo').lrselect({
+                type: 'multiple',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                value: 'subjectno',
+                text: 'subjectname',
+                maxHeight: 200
+            });
             //地市
             $('#City').lrselect({
                 allowSearch: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js

@@ -89,7 +89,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollFormView?keyValue=' + keyValue,
-                        width: 800,
+                        width: 900,
                         height: 700,
                         btn: null
                     });
@@ -108,7 +108,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '审核',
                         url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollSH?keyValue=' + keyValue,
-                        width: 700,
+                        width: 900,
                         height: 700,
                         btn: ['确认审核', '取消'],
                         callBack: function (id) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.cshtml

@@ -40,6 +40,7 @@
         <div class="lr-form-item-title">中考总分<font face="宋体">*</font></div>
         <input id="MidTermExam" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div id="scoreDiv"></div>
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">毕业学校<font face="宋体">*</font></div>
         <input id="FromSchool" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -56,9 +57,13 @@
         <div class="lr-form-item-title">县区<font face="宋体">*</font></div>
         <div id="County" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
+    <div class="col-xs-6 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">身份证正面照片<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.js

@@ -22,6 +22,13 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'YesOrNoBit',
             });
+            $('#SubjectNo').lrselect({
+                type: 'multiple',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                value: 'subjectno',
+                text: 'subjectname',
+                maxHeight: 200
+            });
             $('#IdCardPto1').lrUploader();
             $('#IdCardPto2').lrUploader();
             $('#MidDiplomaPto').lrUploader();
@@ -96,6 +103,17 @@ var bootstrap = function ($, learun) {
                         }
                     }
                     MajorNo = data.StuEnroll.MajorNo;
+                    var str = '';
+                    if (!!data.StuEnrollMidExamScore) {
+                        $.each(data.StuEnrollMidExamScore,
+                            function (i, item) {
+                                str += '<div class="col-xs-6 lr-form-item" data-table="StuEnrollMidExamScore">';
+                                str += '<div class="lr-form-item-title">' + item.subjectName + '</div>';
+                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + item.score + '" />';
+                                str += '</div>';
+                            });
+                        $('#scoreDiv').html(str);
+                    }
                 });
                 learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetExamDataByStuId?keyValue=' + keyValue, function (res) {
                     var html = '';

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml

@@ -51,7 +51,7 @@
                             <input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly">
                         </div>
                         <div id="admmsg">
-                            <span style="font-size: 12px; color: red;" id="msg">&nbsp;&nbsp;&nbsp;&nbsp;注：录取成功，请手机截屏，保存结果图片，报名时出示此图片！</span>
+                            <span style="font-size: 12px; color: red;" id="msg">&nbsp;&nbsp;&nbsp;&nbsp;注：请手机截屏录取成功，保存结果图片，报名时出示此图片换取录取通知书！</span>
                             <br /> 
                             <div id="fileDownLoad"><a alt="点击下载" style="color: blue;text-decoration: underline;margin-left: 30px;">入学须知</a></div>
                         </div>

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

@@ -54,7 +54,7 @@ var bootstrap = function ($, learun) {
                         learun.clientdata.getAsync('custmerData', {
                             url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
                             key: value,
-                            keyId: 'id',
+                            keyId: 'subjectno',
                             callback: function (_data) {
                                 callback(_data['subjectname']);
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs

@@ -200,11 +200,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile)
+        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName)
         {
             try
             {
-                return stuEnrollService.GetEntityByPersonalData(IDCard, StuMobile);
+                return stuEnrollService.GetEntityByPersonalData(IDCard, StuName);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs

@@ -495,8 +495,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("YEAR")]
         public string Year { get; set; }
+
+        /// <summary>
+        /// 考试科目
+        /// </summary>
+        [Column("SUBJECTNO")]
+        public string SubjectNo { get; set; }
         #endregion
-        
+
 
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs

@@ -35,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         StuEnrollEntity GetStuEnrollEntity(string keyValue);
         IEnumerable<StuEnrollMidExamScoreEntity> GetMidExamScoreData(string keyValue);
-        StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile);
+        StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName);
         StuEnrollEntity SearchForm(int type, StuEnrollEntity strEntity);
         IEnumerable<ExamSubjectEntity> GetExamDataByStuId(string keyValue);
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

@@ -1969,12 +1969,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name=""></param>
         /// <summary>
         /// <returns></returns>
-        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile)
+        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName)
         {
             try
             {
                 var year = DateTime.Now.Year;
-                return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => (x.IDCard == IDCard || x.StuMobile == StuMobile) && x.AddTime.Value.Year == year);
+                return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => (x.IDCard == IDCard && x.StuName == StuName.Trim()) && x.AddTime.Value.Year == year);
             }
             catch (Exception ex)
             {
@@ -2021,16 +2021,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                string sql = $"select majorno  from stuenroll where stuid='{keyValue}'";
-                var majorId = "";
-                var majorDt = this.BaseRepository("CollegeMIS").FindTable(sql);
-                if (majorDt != null)
-                {
-                    majorId = majorDt.Rows[0]["majorno"].ToString();
-                }
-
-                string subSql =
-                    $"select s.* from [dbo].[MajorAndSubject] m join ExamSubject s on m.SubId=s.Id where m.Majorid='{majorId}' and s.IsFlag=1 ";
+                string subSql = $"select * from ExamSubject where SubjectNo in (select SubjectNo from StuEnroll where stuid='{keyValue}')";
                 return this.BaseRepository("CollegeMIS").FindList<ExamSubjectEntity>(subSql);
             }
             catch (Exception ex)
@@ -2517,17 +2508,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         if (list.Where(x => x.YearNo == enrollData.Year && x.StuId == enrollData.StuId).Count() <= 0)
                         {
                             //新生成绩表不存在当前新生  添加
-                            //循环报名的专业所关联的学科
-                            //专业学科关联表
-                            var MajorAndSubjectList = db.FindList<MajorAndSubjectEntity>(x => x.MajorId == enrollData.MajorNo);
-                            foreach (var sub in MajorAndSubjectList)
+                            var subNos = enrollData.SubjectNo.Split(',').ToList();
+                            foreach (var subno in subNos)
                             {
                                 StuEnrollScoreEntity model = new StuEnrollScoreEntity();
                                 model.Create();
                                 model.YearNo = enrollData.Year;
                                 model.MajorId = enrollData.MajorNo;
                                 model.StuId = enrollData.StuId;
-                                model.SubjectId = sub.SubId;
+                                model.SubjectId = subno;
                                 model.Score = 0;
                                 db.Insert(model);
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs

@@ -47,10 +47,10 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
 
                 var queryParam = queryJson.ToJObject();
                 var dp = new DynamicParameters(new { });
-                if (!queryParam["YearNo"].IsEmpty())
+                if (!queryParam["Year"].IsEmpty())
                 {
-                    strSql.Append(" and t.YearNo=@YearNo ");
-                    dp.Add("YearNo", queryParam["YearNo"].ToString(), DbType.String);
+                    strSql.Append(" and t.YearNo=@Year ");
+                    dp.Add("Year", queryParam["Year"].ToString(), DbType.String);
                 }
                 if (!queryParam["MajorId"].IsEmpty())
                 {
@@ -86,7 +86,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
         {
             try
             {
-                string sql = $"select a.Score,b.SubjectName from StuEnrollScore a left join ExamSubject b on a.subjectId=b.Id where  a.stuid='{stuid}' ";
+                string sql = $"select a.Score,b.SubjectName from StuEnrollScore a left join ExamSubject b on a.subjectId=b.subjectNo where  a.stuid='{stuid}' ";
 
                 return this.BaseRepository("CollegeMIS").FindList<StuEnrollScoreEntity>(sql);
             }
@@ -284,7 +284,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
         {
             try
             {
-                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>("select distinct s.subjectId as value,a.SubjectName as text from StuEnrollScore s left join ExamSubject a on s.subjectId=a.id");
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>("select distinct s.subjectId as value,a.SubjectName as text from StuEnrollScore s left join ExamSubject a on s.subjectId=a.SubjectNo");
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;
             }