提交接口

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateReplyMapper.java

@@ -54,7 +54,7 @@ public interface TabEvaluateReplyMapper {
      */
     int updateByPrimaryKey(TabEvaluateReply record);
 
-    List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId);
+    List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("showStatus") Integer showStatus);
 
     void updateReplyShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateReplyId") Integer evaluateReplyId, @Param("showStatus") Integer showStatus);
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateReplyService.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2019-12-27 9:52
  */
 public interface EvaluateReplyService {
-    List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId);
+    List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId, Integer showStatus);
 
     Integer saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
 

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateReplyServiceImpl.java

@@ -26,8 +26,8 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
     private TabEvaluateReplyMapper tabEvaluateReplyMapper;
 
     @Override
-    public List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId) {
-        return tabEvaluateReplyMapper.listEvaluateReply(enterpriseId, evaluateId);
+    public List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId, Integer showStatus) {
+        return tabEvaluateReplyMapper.listEvaluateReply(enterpriseId, evaluateId, showStatus);
     }
 
     @Override

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateManageApiServiceImpl.java

@@ -83,7 +83,7 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
         evaluateDTO.setImgList(imgList);
 
-        List<TabEvaluateReply> tabReplyList = evaluateReplyService.listEvaluateReply(enterpriseId, evaluateId);
+        List<TabEvaluateReply> tabReplyList = evaluateReplyService.listEvaluateReply(enterpriseId, evaluateId, null);
         List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, tabReplyList);
         for (EvaluateReplyDTO evaluateReplyDTO : replyDTOList) {
             List<TabEvaluateImg> tabEvaluateImgs = evaluateImgService.listImageByEvaluateReplyId(evaluateReplyDTO.getEvaluateReplyId());

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java

@@ -222,7 +222,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已超越评价期限，无法评价");
         }
         // 是否超过次数
-        List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId());
+        List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId(), Constants.OPEN);
         if (CollectionUtils.isNotEmpty(replyList)) {
             if (evaluateOrderConfig.getReviewTimes() <= replyList.size()) {
                 return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已经超过最大追评次数，无法继续追评");
@@ -385,7 +385,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
         evaluateDTO.setImgList(imgList);
         // 追评和回复
-        List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
+        List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), Constants.OPEN);
         List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
         // 追评和回复的图片
         for (EvaluateReplyDTO replyDTO : replyDTOList) {
@@ -430,7 +430,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
                             resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_NOT_SUPPORT.getCode());
                         } else {
                             // 是否追评超过次数
-                            List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId());
+                            List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId(), Constants.OPEN);
                             if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() <= replyList.size()) {
                                 // 追评超过次数
                                 resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());

gic-evaluate-service/src/main/resources/mapper/TabEvaluateReplyMapper.xml

@@ -220,7 +220,9 @@
     where enterprise_id = #{enterpriseId}
     and evaluate_id = #{evaluateId}
     and status = 1
-    and show_status = 1
+    <if test="showStatus != null ">
+        and show_status = #{showStatus}
+    </if>
   </select>
   <update id="updateReplyShowStatus">
     update tab_evaluate_reply set show_status = #{showStatus} where enterprise_id = #{enterpriseId} and evaluate_reply_id = #{evaluateReplyId}