新增:评论查询接口

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysiscomment/AnalysisCommentController.java

@@ -5,6 +5,7 @@ import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.analysis.AnalysisCommentDescriptionDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
+import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
 import com.energy.manage.service.service.analysiscomment.AnalysisCommentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,13 +30,22 @@ public class AnalysisCommentController extends BaseServiceController {
     @UserLoginToken
     @ApiOperation(value = "富文本类型查询")
     @GetMapping("/analysisCommentTypeList")
-    public ResultResp analysisCommentTypeList(@RequestParam(name = "batchCode",required = true) String batchCode,
-                                              @RequestParam(name = "analysisTypeCode",required = true) String analysisTypeCode)
+    public ResultResp analysisCommentTypeList(@RequestParam(name = "batchCode") String batchCode,
+                                              @RequestParam(name = "analysisTypeCode") String analysisTypeCode)
     {
         return success(analysisCommentService.analysisCommentTypeList(batchCode,analysisTypeCode));
     }
 
     @UserLoginToken
+    @ApiOperation(value = "评论查询")
+    @GetMapping("/analysisCommentDescList")
+    public ResultResp<AnalysisCommentDescriptionVo> analysisCommentDescList(@RequestParam(name = "batchCode", required = false) String batchCode,
+                                                                            @RequestParam(name = "analysisTypeCode", required = false) String analysisTypeCode)
+    {
+        return success(analysisCommentService.analysisCommentDescList(batchCode,analysisTypeCode));
+    }
+
+    @UserLoginToken
     @ApiOperation(value = "富文本类型添加")
     @PostMapping("/addAnalysisCommentType")
     public ResultResp addAnalysisCommentType(@RequestBody AnalysisCommentTypeRelationDto typeRelationDto)

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisCommentDescriptionVo.java

@@ -21,6 +21,11 @@ public class AnalysisCommentDescriptionVo {
     private String batchCode ;
 
     /**
+     * 分析名称
+     */
+    private String analysisName;
+
+    /**
      * 分析类型编号
      */
     private String analysisTypeCode ;

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiscomment/AnalysisCommentService.java

@@ -3,7 +3,7 @@ package com.energy.manage.service.service.analysiscomment;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.analysis.AnalysisCommentDescriptionDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
-import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
+import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo;
 
 import java.util.List;
@@ -45,4 +45,13 @@ public interface AnalysisCommentService {
      * @return
      */
     int analysisCommentEdit(AnalysisCommentDescriptionDto commentDescriptionDto);
+
+
+    /**
+     * 富文本内容查询
+     * @param batchCode
+     * @param analysisTypeCode
+     * @return
+     */
+    List<AnalysisCommentDescriptionVo> analysisCommentDescList(String batchCode, String analysisTypeCode);
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiscomment/impl/AnalysisCommentServiceImpl.java

@@ -3,11 +3,11 @@ package com.energy.manage.service.service.analysiscomment.impl;
 import com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo;
 import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.common.util.BeanTools;
 import com.energy.manage.common.util.UUIDTools;
 import com.energy.manage.service.domain.dto.analysis.AnalysisCommentDescriptionDto;
 import com.energy.manage.service.domain.dto.analysis.AnalysisCommentTypeRelationDto;
 import com.energy.manage.service.domain.dto.analysis.CommentDto;
+import com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisCommentTypeRelationVo;
 import com.energy.manage.service.mappers.analysis.AnalysisCommentDescriptionMapper;
 import com.energy.manage.service.mappers.analysis.AnalysisCommentTypeRelationMapper;
@@ -106,6 +106,17 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
         return count.get();
     }
 
+    /**
+     * 富文本查询
+     * @param batchCode
+     * @param analysisTypeCode
+     * @return
+     */
+    @Override
+    public List<AnalysisCommentDescriptionVo> analysisCommentDescList(String batchCode, String analysisTypeCode) {
+        return commentDescriptionMapper.selecByBatchCodeAndAnalysisTypeCode(batchCode, analysisTypeCode);
+    }
+
 
     /**
      * 评论类型名称查重

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisCommentDescriptionMapper.xml

@@ -25,17 +25,26 @@
 
     <select id="selecByBatchCodeAndAnalysisTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo">
         select acd.batch_code,
+               ar.analysis_name,
                acd.analysis_type_code,
                acd.comment_type_code,
                actr.comment_type_name,
-               acd.comment
+               acd.comment,
+               acd.create_time
         from analysis_comment_description as acd
         left join analysis_comment_type_relation as actr
         on acd.comment_type_code = actr.comment_type_code
-        where acd.batch_code = #{batchCode,jdbcType=VARCHAR}
+        left join analysis_result ar
+        on acd.batch_code = ar.batch_code
+        <where>
+            <if test="batchCode != null and batchCode != ''">
+                acd.batch_code = #{batchCode,jdbcType=VARCHAR}
+            </if>
             <if test="analysisTypeCode != null and analysisTypeCode != ''">
                 and acd.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
             </if>
+        </where>
+        order by acd.update_time , acd.batch_code desc
     </select>
 
     <insert id="insertPoSelective" parameterType="com.energy.manage.common.po.analysis.AnalysisCommentDescriptionPo">