From 0535e0455efacdb3606e06c542b33648b13e52f9 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 29 Jun 2022 15:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/LessonInfo/Form.cshtml              | 12 +++++++----
 .../Views/LessonInfo/Index.js                 |  2 ++
 .../LessonInfo/LessonInfoEntity.cs            |  7 ++++++-
 .../LessonInfo/LessonInfoService.cs           | 20 +------------------
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml
index 007811b35..dd7d122c2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml	
@@ -43,11 +43,15 @@
         <div class="lr-form-item-title">周实验学时<font face="宋体">*</font></div>
         <input id="WeekPracticeHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+    <div class="col-xs-4 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">每周课时<font face="宋体">*</font></div>
         <input id="TotalStudyHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+    <div class="col-xs-4 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">每周课时<font face="宋体">*</font></div>
+        <input id="TotalHours" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">是否先修</div>
         <div id="HaveBeforeLesson"></div>
     </div>
@@ -60,8 +64,8 @@
         <div id="WhoStudy"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
-        <div class="lr-form-item-title">课程分类</div>
-        <div id="LessonSortNo"></div>
+        <div class="lr-form-item-title">课程分类<font face="宋体">*</font></div>
+        <div id="LessonSortNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">课程分类明细</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js
index 4d1f4d643..9cc59a33a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js	
@@ -189,6 +189,7 @@ var bootstrap = function ($, learun) {
                     { label: "周理论学时", name: "WeekStudyHour", width: 80, align: "left" },
                     { label: "周实验学时", name: "WeekPracticeHour", width: 80, align: "left" },
                     { label: "每周课时", name: "TotalStudyHour", width: 80, align: "left" },
+                    { label: "总课时", name: "TotalHours", width: 80, align: "left" },
                     {
                         label: "是否先修", name: "HaveBeforeLesson", width: 80, align: "left",
                         formatter: function (cellvalue) {
@@ -274,6 +275,7 @@ var bootstrap = function ($, learun) {
                     { label: "周理论学时", name: "WeekStudyHour", width: 80, align: "left" },
                     { label: "周实验学时", name: "WeekPracticeHour", width: 80, align: "left" },
                     { label: "每周课时", name: "TotalStudyHour", width: 80, align: "left" },
+                    { label: "总学时", name: "TotalHours", width: 80, align: "left" },
                     {
                         label: "是否先修", name: "HaveBeforeLesson", width: 80, align: "left",
                         formatter: function (cellvalue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs
index 9c57f9bd0..2e8fa4042 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs	
@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2019-01-24 17:03
     /// 描 述：课程信息管理
     /// </summary>
-    public class LessonInfoEntity 
+    public class LessonInfoEntity
     {
         #region  实体成员
         /// <summary>
@@ -45,6 +45,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("WEEKSTUDYHOUR")]
         public decimal? WeekStudyHour { get; set; }
         /// <summary>
+        /// 总学时
+        /// </summary>
+        [Column("TOTALHOURS")]
+        public decimal? TotalHours { get; set; }
+        /// <summary>
         /// 周实验学时
         /// </summary>
         [Column("WEEKPRACTICEHOUR")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs
index 96e49ebe8..716339fb2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs	
@@ -31,25 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.LessonId,
-                t.LessonNo,
-                t.LessonName,
-                t.TeachDeptNo,
-                t.TeachMajorNo,
-                t.EnName,
-                t.StudyScore,
-                t.WeekStudyHour,
-                t.WeekPracticeHour,
-                t.TotalStudyHour,
-                t.HaveBeforeLesson,
-                t.BeforeLesson,
-                t.WhoStudy,
-                t.LessonSortNo,
-                t.LessonSortDetailNo,
-                t.CheckMark,
-                t.LessonTypeId,t.F_SchoolId
-                ");
+                strSql.Append(@" *   ");
                 strSql.Append("  FROM LessonInfo t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();