Merge branch 'dev' into 'master'

我的评论增加关联业务ID和名称

See merge request !6

cloud-training-project-api/src/main/java/com/yizhi/training/application/vo/manage/PageCommentVo.java

@@ -57,5 +57,9 @@ public class PageCommentVo {
     @ApiModelProperty(value = "关联业务类型:1活动服务;2新闻资讯；3培训测试；4培训资讯")
     @ApiModelProperty(value = "关联业务类型:1活动服务;2新闻资讯；3培训测试；4培训资讯")
     private Integer bizType;
     private Integer bizType;
 
 
+    @ApiModelProperty(value = "关联业务ID")
+    private Long trainingProjectId;
     
     
+    @ApiModelProperty(value = "关联业务名称")
+    private String trainingProjectName;
 }
 }

cloud-training-project-service/src/main/java/com/yizhi/training/application/mapper/TpCommentMapper.xml

@@ -49,6 +49,8 @@
         <id column="thumbsUp" property="thumbsUps"/>
         <id column="thumbsUp" property="thumbsUps"/>
         <id column="state" property="state"/>
         <id column="state" property="state"/>
         <result column="biz_type" property="bizType"/>
         <result column="biz_type" property="bizType"/>
+        <result column="training_project_id" property="trainingProjectId"/>
+        <result column="trainingProjectName" property="trainingProjectName"/>
     </resultMap>
     </resultMap>
 
 
     <!-- 培训项目 评论分页  -->
     <!-- 培训项目 评论分页  -->
@@ -64,7 +66,9 @@
             a. STATUS,
             a. STATUS,
             COUNT(r.id) AS replys,
             COUNT(r.id) AS replys,
             a.state,
             a.state,
-            a.biz_type
+            a.biz_type,
+            a.training_project_id,
+            a.trainingProjectName
         FROM
         FROM
             (
             (
                 SELECT
                 SELECT
@@ -77,7 +81,9 @@
                     COUNT(tu.id) AS thumbsUp,
                     COUNT(tu.id) AS thumbsUp,
                     b. STATUS,
                     b. STATUS,
                     b.state,
                     b.state,
-                    b.biz_type
+                    b.biz_type,
+                    b.training_project_id,
+                    b.trainingProjectName
                 FROM
                 FROM
                     (
                     (
                         SELECT
                         SELECT
@@ -96,11 +102,16 @@
                                 END
                                 END
                             ) AS STATUS,
                             ) AS STATUS,
                             c.state,
                             c.state,
-                            c.biz_type
+                            c.biz_type,
+                            c.training_project_id,
+                            CASE WHEN c.biz_type=1 THEN project.name ELSE CASE WHEN c.biz_type IN(2,4) THEN news.file_name ELSE CASE WHEN c.biz_type=3 THEN ex.name ELSE '' END END END trainingProjectName
                         FROM
                         FROM
                             tp_comment c
                             tp_comment c
                         LEFT JOIN tp_comment_thumbs_up tuu ON c.`id` = tuu.`tp_comment_id`
                         LEFT JOIN tp_comment_thumbs_up tuu ON c.`id` = tuu.`tp_comment_id`
                         AND tuu.`account_id` = #{accountId}
                         AND tuu.`account_id` = #{accountId}
+                        LEFT JOIN training_project project ON c.training_project_id=project.id
+                        LEFT JOIN cloud_portal.information news ON c.training_project_id=news.id
+                        LEFT JOIN cloud_exam.exam ex ON c.training_project_id=ex.id
                         WHERE c.`audit_status` = 0
                         WHERE c.`audit_status` = 0
                             <if test="trainingProjectId != null">
                             <if test="trainingProjectId != null">
                                 AND c.`training_project_id` = #{trainingProjectId}
                                 AND c.`training_project_id` = #{trainingProjectId}
@@ -211,7 +222,9 @@
             a. STATUS,
             a. STATUS,
             COUNT(r.id) AS replys,
             COUNT(r.id) AS replys,
             a.state,
             a.state,
-            a.biz_type
+            a.biz_type,
+            a.training_project_id,
+            a.trainingProjectName
         FROM
         FROM
             (
             (
                 SELECT
                 SELECT
@@ -224,7 +237,9 @@
                     COUNT(tu.id) AS thumbsUp,
                     COUNT(tu.id) AS thumbsUp,
                     b. STATUS,
                     b. STATUS,
                     b.state,
                     b.state,
-                    b.biz_type
+                    b.biz_type,
+                    b.training_project_id,
+                    b.trainingProjectName
                 FROM
                 FROM
                     (
                     (
                         SELECT
                         SELECT
@@ -243,11 +258,16 @@
                                 END
                                 END
                             ) AS STATUS,
                             ) AS STATUS,
                             c.state,
                             c.state,
-                            c.biz_type
+                            c.biz_type,
+                            c.training_project_id,
+                            CASE WHEN c.biz_type=1 THEN project.name ELSE CASE WHEN c.biz_type IN(2,4) THEN news.file_name ELSE CASE WHEN c.biz_type=3 THEN ex.name ELSE '' END END END trainingProjectName
                         FROM
                         FROM
                             tp_comment c
                             tp_comment c
                         LEFT JOIN tp_comment_thumbs_up tuu ON c.`id` = tuu.`tp_comment_id`
                         LEFT JOIN tp_comment_thumbs_up tuu ON c.`id` = tuu.`tp_comment_id`
                         AND tuu.`account_id` = #{accountId}
                         AND tuu.`account_id` = #{accountId}
+                        LEFT JOIN training_project project ON c.training_project_id=project.id
+                        LEFT JOIN cloud_portal.information news ON c.training_project_id=news.id
+                        LEFT JOIN cloud_exam.exam ex ON c.training_project_id=ex.id
                         WHERE c.`audit_status` = 0
                         WHERE c.`audit_status` = 0
                             <if test="trainingProjectId != null">
                             <if test="trainingProjectId != null">
                                 AND c.`training_project_id` = #{trainingProjectId}
                                 AND c.`training_project_id` = #{trainingProjectId}