评价bug修改

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

@@ -80,34 +80,43 @@
       <if test="endTime != null and endTime != '' ">
         and evaluate_time &lt;= #{endTime}
       </if>
-      and ( 1=0
-      <if test="badEvaluateStatus != null ">
-        or bad_evaluate_status = #{badEvaluateStatus}
-      </if>
-      <if test="goodEvaluateStatus != null ">
-        or good_evaluate_status = #{goodEvaluateStatus}
-      </if>
-      <if test="reviewStatus != null ">
-        or review_status = #{reviewStatus}
-      </if>
-      <if test="topHotStatus != null ">
-        or top_hot_status = #{topHotStatus}
-      </if>
-      <if test="maliciousStatus != null ">
-        or malicious_status = #{maliciousStatus}
-      </if>
-      or ( 1=0
-      <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
-        and goods_score ${goodsCompute} #{goodsScore}
-      </if>
-      <if test="storeCompute != null and storeCompute != '' and storeScore != null ">
-        and store_score ${storeCompute} #{storeScore}
-      </if>
-      <if test="serviceCompute != null and serviceCompute != '' and serviceScore != null ">
-        and service_score ${serviceCompute} #{serviceScore}
+      <if test="badEvaluateStatus != null or goodEvaluateStatus != null or reviewStatus != null or topHotStatus != null or maliciousStatus != null or goodsCompute != null or storeCompute != null or serviceCompute != null ">
+        and (
+        <if test="badEvaluateStatus != null or goodEvaluateStatus != null or reviewStatus != null or topHotStatus != null or maliciousStatus != null">
+          ( 1=0
+          <if test="badEvaluateStatus != null ">
+            or bad_evaluate_status = #{badEvaluateStatus}
+          </if>
+          <if test="goodEvaluateStatus != null ">
+            or good_evaluate_status = #{goodEvaluateStatus}
+          </if>
+          <if test="reviewStatus != null ">
+            or review_status = #{reviewStatus}
+          </if>
+          <if test="topHotStatus != null ">
+            or top_hot_status = #{topHotStatus}
+          </if>
+          <if test="maliciousStatus != null ">
+            or malicious_status = #{maliciousStatus}
+          </if>
+          )
+        </if>
+        <if test="badEvaluateStatus == null and goodEvaluateStatus == null and reviewStatus == null and topHotStatus == null and maliciousStatus == null">
+          1=1
+        </if>
+        or ( 1=0
+        <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
+          and goods_score ${goodsCompute} #{goodsScore}
+        </if>
+        <if test="storeCompute != null and storeCompute != '' and storeScore != null ">
+          and store_score ${storeCompute} #{storeScore}
+        </if>
+        <if test="serviceCompute != null and serviceCompute != '' and serviceScore != null ">
+          and service_score ${serviceCompute} #{serviceScore}
+        </if>
+        )
+        )
       </if>
-      )
-      )
       <if test="replyStatus != null ">
         and reply_status = #{replyStatus}
       </if>

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateManagerController.java

@@ -50,21 +50,21 @@ public class EvaluateManagerController {
             evaluateQO.setEndTime(evaluateQO.getEndTime() + " 23:59:59");
         }
 
-//        if (Constants.CLOSE.equals(evaluateQO.getBadEvaluateStatus())) {
-//            evaluateQO.setBadEvaluateStatus(null);
-//        }
-//        if (Constants.CLOSE.equals(evaluateQO.getGoodEvaluateStatus())) {
-//            evaluateQO.setGoodEvaluateStatus(null);
-//        }
-//        if (Constants.CLOSE.equals(evaluateQO.getReviewStatus())) {
-//            evaluateQO.setReviewStatus(null);
-//        }
-//        if (Constants.CLOSE.equals(evaluateQO.getTopHotStatus())) {
-//            evaluateQO.setTopHotStatus(null);
-//        }
-//        if (Constants.CLOSE.equals(evaluateQO.getMaliciousStatus())) {
-//            evaluateQO.setMaliciousStatus(null);
-//        }
+        if (Constants.CLOSE.equals(evaluateQO.getBadEvaluateStatus())) {
+            evaluateQO.setBadEvaluateStatus(null);
+        }
+        if (Constants.CLOSE.equals(evaluateQO.getGoodEvaluateStatus())) {
+            evaluateQO.setGoodEvaluateStatus(null);
+        }
+        if (Constants.CLOSE.equals(evaluateQO.getReviewStatus())) {
+            evaluateQO.setReviewStatus(null);
+        }
+        if (Constants.CLOSE.equals(evaluateQO.getTopHotStatus())) {
+            evaluateQO.setTopHotStatus(null);
+        }
+        if (Constants.CLOSE.equals(evaluateQO.getMaliciousStatus())) {
+            evaluateQO.setMaliciousStatus(null);
+        }
         ServiceResponse<Page<EvaluateDTO>> serviceResponse = evaluateManageApiService.listEvaluateForManage(evaluateQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }