Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -35,25 +35,14 @@
 
     topic.ID AS topicID,
     topic.STATUS,
-    topic.SHIFT_ISSUE,
-    <choose>
-        <when test="null != targetDate">
+    CASE WHEN log.CREATED_TIME IS NULL THEN 0 ELSE 1 END AS 'SHIFT_ISSUE',
     (CASE WHEN
-
         topic.CREATED_TIME <![CDATA[>=]]> #{targetDate} AND topic.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
-            THEN '1'
-            ELSE '0' END ) AS incrFlag
-
-        </when>
-        <otherwise>
-            (CASE WHEN
-            topic.CREATED_TIME <![CDATA[<]]>  CURDATE( ) AND topic.CREATED_TIME <![CDATA[>=]]> DATE_SUB( CURDATE( ), INTERVAL 1 DAY )
-            THEN '1'
-            ELSE '0' END ) AS incrFlag
-        </otherwise>
-    </choose>
-
-    FROM RESI_GROUP groupp LEFT JOIN RESI_TOPIC topic ON groupp.ID = topic.GROUP_ID AND topic.DEL_FLAG = '0'
+            THEN '1' ELSE '0' END ) AS incrFlag
+    FROM
+        RESI_GROUP groupp
+        LEFT JOIN RESI_TOPIC topic ON groupp.ID = topic.GROUP_ID AND topic.DEL_FLAG = '0'
+        LEFT JOIN resi_topic_operation log ON log.TOPIC_ID = topic.ID AND log.DEL_FLAG = '0' AND log.OPERATION_TYPE = 'shift_issue' AND log.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY )
     WHERE groupp.DEL_FLAG = '0'
     <if test='null != customerId and "" != customerId'>
         AND groupp.CUSTOMER_ID = #{customerId}