1

chuanyi_server/src/main/resources/mapper/RawDataDao.xml

@@ -133,8 +133,8 @@
         t_raw_data${remainder}
         WHERE
         item_group_id = #{itemGroupId}
-        AND item_name = #{itemName}
         AND data_source_id = #{dataSourceId}
+        AND item_name = #{itemName}
         AND date_format( create_time, '%Y-%m-%d' )= date_format( now(), '%Y-%m-%d' )
         AND date_format( create_time, '%Y-%m-%d %H' ) <= concat( date_format( now(), '%Y-%m-%d ' ), '07' )
         GROUP BY
@@ -148,8 +148,8 @@
         t_raw_data${remainder}
         WHERE
         item_group_id = #{itemGroupId}
-        AND item_name = #{itemName}
         AND data_source_id = #{dataSourceId}
+        AND item_name = #{itemName}
         AND date_format( create_time, '%Y-%m-%d' )= date_format( CURRENT_DATE ()- 1, '%Y-%m-%d' )
         AND date_format( create_time, '%Y-%m-%d %H' ) >= concat( date_format( CURRENT_DATE ()- 1, '%Y-%m-%d ' ), '08' )
         GROUP BY