Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop

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