Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

danger-manage-system/src/main/java/com/zehong/system/domain/TTrainCourse.java

@@ -28,6 +28,8 @@ public class TTrainCourse extends BaseEntity
     @Excel(name = "课程类型", readConverterExp = "培=训计划")
     private Long courseType;
 
+    private String planName;
+
     /** 课程内容 */
     @Excel(name = "课程内容")
     private String courseConent;
@@ -65,7 +67,15 @@ public class TTrainCourse extends BaseEntity
     @Excel(name = "0未删除 1已删除")
     private Integer isDel;
 
-    public void setCourseId(Long courseId) 
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+    }
+
+    public void setCourseId(Long courseId)
     {
         this.courseId = courseId;
     }

danger-manage-system/src/main/resources/mapper/system/TTrainCourseMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId"    column="course_id"    />
         <result property="courseName"    column="course_name"    />
         <result property="courseType"    column="course_type"    />
+        <result property="planName"    column="plan_name"    />
         <result property="courseConent"    column="course_conent"    />
         <result property="status"    column="status"    />
         <result property="releaseTime"    column="release_time"    />
@@ -25,18 +26,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTTrainCourseList" parameterType="TTrainCourse" resultMap="TTrainCourseResult">
-        <include refid="selectTTrainCourseVo"/>
+        select c.*,p.plan_name from t_train_course c
+        LEFT JOIN t_train_plan p on p.plan_id = c.course_type
+
         <where>  
-            <if test="courseName != null  and courseName != ''"> and course_name like concat('%', #{courseName}, '%')</if>
-            <if test="courseType != null "> and course_type = #{courseType}</if>
-            <if test="courseConent != null  and courseConent != ''"> and course_conent = #{courseConent}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="enclosure != null  and enclosure != ''"> and enclosure = #{enclosure}</if>
-            <if test="video != null  and video != ''"> and video = #{video}</if>
-            <if test="qualifiedNum != null "> and qualified_num = #{qualifiedNum}</if>
-            <if test="topicNum != null "> and topic_num = #{topicNum}</if>
-            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
-            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="courseName != null  and courseName != ''"> and c.course_name like concat('%', #{courseName}, '%')</if>
+            <if test="courseType != null "> and c.course_type = #{courseType}</if>
+            <if test="courseConent != null  and courseConent != ''"> and c.course_conent = #{courseConent}</if>
+            <if test="status != null "> and c.status = #{status}</if>
+            <if test="enclosure != null  and enclosure != ''"> and c.enclosure = #{enclosure}</if>
+            <if test="video != null  and video != ''"> and c.video = #{video}</if>
+            <if test="qualifiedNum != null "> and c.qualified_num = #{qualifiedNum}</if>
+            <if test="topicNum != null "> and c.topic_num = #{topicNum}</if>
+            <if test="createUser != null  and createUser != ''"> and c.create_user = #{createUser}</if>
+            <if test="isDel != null "> and c.is_del = #{isDel}</if>
         </where>
     </select>
     

danger-manage-web/src/views/educationPlanExam/lessonsProgram/index.vue

@@ -73,8 +73,7 @@
       <el-table-column
         label="课程类别"
         align="center"
-        prop="courseType"
-        :formatter="formatter"
+        prop="planName"
       />
       <el-table-column label="课程状态" align="center" prop="status">
         <template v-slot="scope">