From 2b23adaf388cb2af1f9013acf0aa5e62e2417a31 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 Jan 2022 14:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E3=80=81?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87=E3=80=81=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=8C=96=E5=85=9A=E5=BB=BA=E5=8D=95=E4=BD=8D=E6=9C=AA?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9A=84=E4=B8=8D=E7=BB=99=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcUserDemandRecDao.xml           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 7ea8f22256..02432b91c5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -591,6 +591,7 @@
             a.DEL_FLAG = '0'
             AND a.`STATUS` = 'finished'
             AND a.EVALUATE_FLAG = 1
+            and a.FINISH_RESULT='resolved'
             <if test="null != startTime">
                 AND c.EVALUATE_TIME &gt;= #{startTime}
             </if>
@@ -611,6 +612,7 @@
             a.DEL_FLAG = '0'
             AND a.`STATUS` = 'finished'
             AND a.EVALUATE_FLAG = 1
+            and a.FINISH_RESULT='resolved'
             <if test="null != startTime">
                 AND c.EVALUATE_TIME &gt;= #{startTime}
             </if>
@@ -634,6 +636,7 @@
             a.DEL_FLAG = '0'
             AND a.`STATUS` = 'finished'
             AND a.EVALUATE_FLAG = 1
+            and a.FINISH_RESULT='resolved'
             AND b.CUSTOMER_ID = #{customerId}
         GROUP BY
             b.SERVER_ID