Merge remote-tracking branch 'origin/sit' into sit

alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerConsultationOrderVO.java

@@ -246,6 +246,9 @@ public class LawyerConsultationOrderVO implements Serializable {
     @ApiModelProperty(value = "律师接单状态")
     private int orderReceivingStatus;
 
+    @ApiModelProperty(value = "申诉处理状态 0 审核中 1审核通过 2驳回")
+    private String commentStatus;
+
 
     /**
      * 获取执业年限（根据执业开始日期自动计算）

alien-entity/src/main/java/shop/alien/mapper/LawyerConsultationOrderMapper.java

@@ -351,12 +351,15 @@ public interface LawyerConsultationOrderMapper extends BaseMapper<LawyerConsulta
             "        luv.processing_status,\n" +
             "        luv.processing_time,\n" +
             "        lur.user_image,\n" +
+            "        cas.status as commentStatus,\n" +
             "        luv.report_result\n" +
             "        FROM lawyer_consultation_order lco\n" +
             "        LEFT JOIN lawyer_user lu ON lco.lawyer_user_id = lu.id AND lu.delete_flag = 0\n" +
             "        LEFT JOIN law_firm lf on lf.id = lu.firm_id\n" +
             "        left join lawyer_expertise_area lea on lea.id = lu.lawyer_expertise_area_id and lea.delete_flag = 0 " +
             "        left join life_user lur on lur.id = lco.client_user_id " +
+            "        left join lawyer_order_review lor on lor.order_id = lco.id " +
+            "        left join comment_appeals cas on cas.comment_id = lor.id " +
             "        left join lawyer_user_violation luv on luv.order_number = lco.order_number and luv.delete_flag = 0 " +
             " ${ew.customSqlSegment}")
     IPage<LawyerConsultationOrderVO> getLawyerConsultationOrderInfo(