新生成绩管理加状态条件查询，修改审核功能

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

@@ -156,7 +156,7 @@ var bootstrap = function ($, learun) {
                 scoreList.push(entity);
             });
         var entity = $('body').lrGetFormData();
-        entity.MajorName = $('#MajorNo').lrselectGetText();
+        //entity.MajorName = $('#MajorNo').lrselectGetText();
         var postData = {
             strEntity: JSON.stringify(entity),
             scoreList: JSON.stringify(scoreList)

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

@@ -68,6 +68,9 @@
                         <div class="lr-layout-tool-item">
                             <div id="SubjectId" type="lrselect" class="lr-select"></div>
                         </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="Status" type="lrselect" class="lr-select"></div>
+                        </div>
                         <div class="lr-layout-tool-item">
                             <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
                         </div>

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

@@ -335,6 +335,13 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            //状态
+            $('#Status').lrselect({
+                placeholder: "请选择状态",
+                data: [{ value: "1", text: "已审核" }, { value: "0", text: "未审核" }],
+                value: 'value',
+                text: 'text'
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({

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

@@ -8030,6 +8030,7 @@
     <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile6.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile7.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile8.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

@@ -2192,6 +2192,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 db.BeginTrans();
+                var sql = $" select top 1 [year] as year,Majorname from CdMajor where ID='{entity.MajorNo}'";
+                var majorData = db.FindTable(sql);
+                entity.MajorName = majorData.Rows[0]["Majorname"].ToString();
+                entity.Year = majorData.Rows[0]["year"].ToString();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
@@ -2201,10 +2205,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     entity.Create();
                     entity.EnrollStatus = 0;
-                    var sql = $" select top 1 [year] as year,Majorname from CdMajor where ID='{entity.MajorNo}'";
-                    var majorData = db.FindTable(sql);
-                    entity.MajorName = majorData.Rows[0]["Majorname"].ToString();
-                    entity.Year = majorData.Rows[0]["year"].ToString();
+                    
                     db.Insert(entity);
                 }
 

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

@@ -63,6 +63,18 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
                     dp.Add("SubjectId", queryParam["SubjectId"].ToString(), DbType.String);
                 }
 
+                if (!queryParam["Status"].IsEmpty())
+                {
+                    if (queryParam["Status"].ToString() == "1")
+                    {
+                        strSql.Append(" and t.Status=1 ");
+                    }
+                    else
+                    {
+                        strSql.Append(" and t.Status<>1 ");
+                    }
+                }
+
                 return this.BaseRepository("CollegeMIS").FindList<StuEnrollScoreEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)
@@ -175,6 +187,17 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
                     strSql.Append(" and t.SubjectId=@SubjectId ");
                     dp.Add("SubjectId", queryParam["SubjectId"].ToString(), DbType.String);
                 }
+                if (!queryParam["Status"].IsEmpty())
+                {
+                    if (queryParam["Status"].ToString() == "1")
+                    {
+                        strSql.Append(" and t.Status=1 ");
+                    }
+                    else
+                    {
+                        strSql.Append(" and t.Status<>1 ");
+                    }
+                }
 
                 return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollScoreEntity>(strSql.ToString(), dp);
             }
@@ -605,22 +628,23 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
                 var Year = queryParam["Year"].ToString();
                 //考试科目
                 var SubjectId = queryParam["SubjectId"].ToString();
+                var statuswhere = queryParam["Status"].ToString();
 
-                db.ExecuteBySql($"update StuEnrollScore set Status='{Status}' where YearNo='{Year}' and SubjectId='{SubjectId}' ");
+                db.ExecuteBySql($"update StuEnrollScore set Status='{Status}' where YearNo='{Year}' and SubjectId='{SubjectId}' and Status='{statuswhere}'");
 
                 //已审核  记录学生总分
-                if (Status == 1)
-                {
-                    var list = db.FindList<StuEnrollScoreEntity>(x => x.YearNo == Year && x.SubjectId == SubjectId).Select(x => x.StuId);
-                    foreach (var item in list)
-                    {
-                        var stuEnrollEntity = db.FindEntity<StuEnrollEntity>(x => x.StuId == item);
-                        stuEnrollEntity.ExamScore =
-                            db.FindList<StuEnrollScoreEntity>(x => x.YearNo == Year && x.StuId == item)
-                                .Sum(x => x.Score);
-                        db.Update(stuEnrollEntity);
-                    }
-                }
+                //if (Status == 1)
+                //{
+                //    var list = db.FindList<StuEnrollScoreEntity>(x => x.YearNo == Year && x.SubjectId == SubjectId).Select(x => x.StuId);
+                //    foreach (var item in list)
+                //    {
+                //        var stuEnrollEntity = db.FindEntity<StuEnrollEntity>(x => x.StuId == item);
+                //        stuEnrollEntity.ExamScore =
+                //            db.FindList<StuEnrollScoreEntity>(x => x.YearNo == Year && x.StuId == item)
+                //                .Sum(x => x.Score);
+                //        db.Update(stuEnrollEntity);
+                //    }
+                //}
 
                 db.Commit();
             }