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

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

@@ -385,10 +385,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             var StuEnrollData = stuEnrollIBLL.GetStuEnrollEntity(keyValue);
             //获取中考成绩
             var MidExamScoreData = stuEnrollIBLL.GetMidExamScoreData(keyValue).OrderBy(x => x.sort);
+
             if (string.IsNullOrEmpty(StuEnrollData.CheckInUrl))
             {
                 StuEnrollData.CheckInUrl = Guid.NewGuid().ToString();
-
             }
             if (string.IsNullOrEmpty(StuEnrollData.SubsidizeUrl))
             {

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

@@ -128,9 +128,10 @@ var bootstrap = function ($, learun) {
                     if (!!data.StuEnrollMidExamScore) {
                         $.each(data.StuEnrollMidExamScore,
                             function (i, item) {
+                                var score = item.score > 0 ? item.score : '';
                                 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 += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + score + '" />';
                                 str += '</div>';
                             });
                         $('#scoreDiv').html(str);
@@ -154,8 +155,10 @@ var bootstrap = function ($, learun) {
                 };
                 scoreList.push(entity);
             });
+        var entity = $('body').lrGetFormData();
+        entity.MajorName = $('#MajorNo').lrselectGetText();
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData()),
+            strEntity: JSON.stringify(entity),
             scoreList: JSON.stringify(scoreList)
         };
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollPhone/SaveForm?keyValue=' + keyValue, postData, function (res) {

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

@@ -109,9 +109,10 @@ var bootstrap = function ($, learun) {
                     if (data.StuEnrollMidExamScore) {
                         $.each(data.StuEnrollMidExamScore,
                             function (i, item) {
+                                var score = item.score > 0 ? item.score : '';
                                 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 += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + score + '" />';
                                 str += '</div>';
                             });
                         $('#scoreDiv').html(str);

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

@@ -120,9 +120,22 @@
                             // $('#StuMobile').val(StuMobile);
                             var IsAdmission = data.StuEnroll.IsAdmission;
 
+                            var majorName = '';
+                            //专业
+                            $.ajax({
+                                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + '&where=' + "id='" + data.StuEnroll.MajorNo + "'",
+                                async: false,
+                                success: function (msg) {
+                                    var majorData = $.parseJSON(msg).data.data;
+                                    majorName = majorData[0].MajorName;
+                                },
+                            });
+                            if (!majorName) {
+                                majorName = data.StuEnroll.MajorName;
+                            }
                             if (IsAdmission == 1 || IsAdmission == true) {
                                 var major = data.StuEnroll.MajorName;
-                                $('#IsAdmission').val('恭喜您，已被我校录取' + data.StuEnroll.MajorName + '专业');
+                                $('#IsAdmission').val('恭喜您，已被我校录取' + majorName + '专业');
                                 //查询录取结果
                                 $('#admmsg').show();
                             } else if (IsAdmission === false) {

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

@@ -8029,6 +8029,7 @@
     <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile6.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile7.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
   </ItemGroup>
   <ItemGroup>

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

@@ -1949,7 +1949,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<StuEnrollMidExamScoreEntity>(x => x.StuEnrollId == keyValue);
+                var list = this.BaseRepository("CollegeMIS").FindList<StuEnrollMidExamScoreEntity>(x => x.StuEnrollId == keyValue).ToList();
+                if (list == null || list.Count() <= 0)
+                {
+                    var db = this.BaseRepository("CollegeMIS");
+                    db.BeginTrans();
+                    var dataItem = this.BaseRepository().FindList<DataItemDetailEntity>("select b.* from [dbo].[LR_Base_DataItem] a join [dbo].[LR_Base_DataItemDetail] b on a.f_itemid=b.f_itemid where a.F_ItemCode='MidTermSubject' and b.f_deletemark=0 and b.f_enabledmark=1").OrderBy(x => x.F_SortCode);
+
+                    foreach (var data in dataItem)
+                    {
+                        StuEnrollMidExamScoreEntity entity = new StuEnrollMidExamScoreEntity();
+                        entity.Create();
+                        entity.StuEnrollId = keyValue;
+                        entity.subjectName = data.F_ItemName;
+                        entity.subjectCode = data.F_ItemCode;
+                        entity.sort = data.F_SortCode;
+                        db.Insert(entity);
+                        list.Add(entity);
+                    }
+                    db.Commit();
+                }
+                return list;
             }
             catch (Exception ex)
             {