From c3edd187f49b04e99e300bb3c4b7bdb0cb23e279 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 21 Jul 2022 15:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E4=B8=AD=E8=80=83=E7=A7=91=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StuEnrollController.cs        |  2 +-
 .../Views/StuEnroll/EnrollForm.js             |  3 ++-
 .../Views/StuEnroll/EnrollFormView.js         |  3 ++-
 .../Learun.Application.Web.csproj             |  1 +
 .../StuEnroll/StuEnrollService.cs             | 22 ++++++++++++++++++-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
index d1adbd88e..cc9770279 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
+++ b/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))
             {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js
index 62b7c668a..611af42e6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js	
+++ b/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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js
index b7f2f7472..70d989ab8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js	
+++ b/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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 703f9b418..f5e0b91ae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -8024,6 +8024,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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
index 709453942..ab7224d02 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs	
+++ b/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)
             {