From 772e712e186d5c9ac35ecd63505d29bf2e1e8ea3 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Wed, 27 Nov 2024 14:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/LessonInfo/Form.cshtml              | 56 +++++++++++++++++--
 .../Views/LessonInfo/Form.js                  |  5 +-
 .../Views/LessonInfo/Index.js                 | 43 +++++++++++++-
 .../LessonInfo/LessonInfoEntity.cs            | 45 +++++++++++++++
 .../LessonInfo/LessonInfoService.cs           |  5 +-
 5 files changed, 145 insertions(+), 9 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 aceea3a11..cb5b60c6b 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	
@@ -2,7 +2,15 @@
     ViewBag.Title = "课程信息管理";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-<div class="lr-form-wrap" >
+<style>
+    .lr-form-item-title{
+        width:130px;
+    }
+    .lr-form-item{
+        padding-left:130px;
+    }
+</style>
+<div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">课程编号<font face="宋体">*</font></div>
         <input id="LessonNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -29,23 +37,23 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">课程简称</div>
-        <input id="EnName" type="text" class="form-control"/>
+        <input id="EnName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">学分</div>
-        <input id="StudyScore" type="text" class="form-control"/>
+        <input id="StudyScore" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">周理论学时</div>
-        <input id="WeekStudyHour" type="text" class="form-control"/>
+        <input id="WeekStudyHour" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">周实验学时</div>
-        <input id="WeekPracticeHour" type="text" class="form-control"/>
+        <input id="WeekPracticeHour" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">每周课时</div>
-        <input id="TotalStudyHour" type="text" class="form-control"/>
+        <input id="TotalStudyHour" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">是否先修</div>
@@ -67,6 +75,42 @@
         <div class="lr-form-item-title">课程分类明细</div>
         <div id="LessonSortDetailNo"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">课程类别</div>
+        <div id="LessonCategory"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">学科类别</div>
+        <div id="SubjectCategory"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">是否有线上课程</div>
+        <div id="IsOnlineLesson"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">线上课程网址</div>
+        <input id="OnlineLessonAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">是否课程思政示范</div>
+        <div id="IsLessonDemonstrate"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">虚拟仿真实训课时数</div>
+        <input id="VirtualHour" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">主要开设实验项目名称</div>
+        <input id="MainExperimentName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">主要开设实训项目名称</div>
+        <input id="MainTrainName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
+        <div class="lr-form-item-title">主要开设实习项目名称</div>
+        <input id="MainPracticeName" type="text" class="form-control" />
+    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">课程简介</div>
         <script id="editor" type="text/plain" style="height:270px;">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js
index f3ee7e259..822450c12 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js	
@@ -57,7 +57,10 @@ var bootstrap = function ($, learun) {
             $('#WhoStudy').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
             $('#LessonSortNo').lrDataSourceSelect({ code: 'CdLessonSort', value: 'lessonsortno', text: 'lessonsortname' });
             $('#LessonSortDetailNo').lrDataSourceSelect({ code: 'CdLessonSortDetail', value: 'lessonsortdetailno', text: 'lessonsortdetailname' });
-
+            $('#LessonCategory').lrDataItemSelect({ code: 'LessonCategory' });
+            $('#SubjectCategory').lrDataItemSelect({ code: 'SubjectCategory' });
+            $('#IsOnlineLesson').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsLessonDemonstrate').lrDataItemSelect({ code: 'YesOrNoBit' });
             //内容编辑器
             ue = UE.getEditor('editor');
         },
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 0f8da1553..ee98a6ff5 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	
@@ -252,7 +252,48 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
-                    }
+                    },
+                    {
+                        label: "课程类别", name: "LessonCategory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LessonCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学科类别", name: "SubjectCategory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'SubjectCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "是否有线上课程", name: "IsOnlineLesson", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: "线上课程网址", name: "OnlineLessonAddress", width: 100, align: "left" },
+                    {
+                        label: "是否课程思政示范", name: "IsLessonDemonstrate", width: 120, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: "虚拟仿真实训课时数", name: "VirtualHour", width: 120, align: "left" },
+                    { label: "主要开设实验项目名称", name: "MainExperimentName", width: 130, align: "left" },
+                    { label: "主要开设实训项目名称", name: "MainTrainName", width: 130, align: "left" },
+                    { label: "主要开设实习项目名称", name: "MainPracticeName", width: 130, align: "left" },
                 ],
                 mainId: 'LessonId',
                 isPage: true,
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..672ac717f 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	
@@ -164,6 +164,51 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("SYNCFLAG")]
         public bool? SyncFlag { get; set; }
+        /// <summary>
+        /// 课程类别
+        /// </summary>
+        [Column("LESSONCATEGORY")]
+        public string LessonCategory { get; set; }
+        /// <summary>
+        /// 学科类别
+        /// </summary>
+        [Column("SUBJECTCATEGORY")]
+        public string SubjectCategory { get; set; }
+        /// <summary>
+        /// 是否有线上课程
+        /// </summary>
+        [Column("ISONLINELESSON")]
+        public bool? IsOnlineLesson { get; set; }
+        /// <summary>
+        /// 线上课程网址
+        /// </summary>
+        [Column("ONLINELESSONADDRESS")]
+        public string OnlineLessonAddress { get; set; }
+        /// <summary>
+        /// 是否课程思政示范
+        /// </summary>
+        [Column("ISLESSONDEMONSTRATE")]
+        public bool? IsLessonDemonstrate { get; set; }
+        /// <summary>
+        /// 虚拟仿真实训课时数
+        /// </summary>
+        [Column("VIRTUALHOUR")]
+        public decimal? VirtualHour { get; set; }
+        /// <summary>
+        /// 主要开设实验项目名称
+        /// </summary>
+        [Column("MAINEXPERIMENTNAME")]
+        public string MainExperimentName { get; set; }
+        /// <summary>
+        /// 主要开设实训项目名称
+        /// </summary>
+        [Column("MAINTRAINNAME")]
+        public string MainTrainName { get; set; }
+        /// <summary>
+        /// 主要开设实习项目名称
+        /// </summary>
+        [Column("MAINPRACTICENAME")]
+        public string MainPracticeName { get; set; }
         #endregion
 
         #region  扩展操作
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 9583c26cf..e9bf8e6ae 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	
@@ -48,7 +48,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.LessonSortNo,
                 t.LessonSortDetailNo,
                 t.CheckMark,
-                t.LessonTypeId,t.F_SchoolId
+                t.LessonTypeId,t.F_SchoolId,
+                t.LessonCategory,t.SubjectCategory,t.IsOnlineLesson,t.OnlineLessonAddress,
+                t.IsLessonDemonstrate,t.VirtualHour,t.MainExperimentName,
+                t.MainTrainName,t.MainPracticeName
                 ");
                 strSql.Append("  FROM LessonInfo t ");
                 strSql.Append("  WHERE 1=1 ");