|
@@ -79,7 +79,7 @@ class sqlCollect():
|
|
|
|
|
|
@classmethod
|
|
|
def get_feed_count(cls, channel):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where channel = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where channel = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
|
|
|
count = MysqlHelper.get_values(sql, (str(channel)))
|
|
|
return count
|
|
|
|
|
@@ -98,43 +98,43 @@ class sqlCollect():
|
|
|
|
|
|
@classmethod
|
|
|
def get_bygj_count(cls, name):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
|
|
|
count = MysqlHelper.get_values(sql, (str(name)))
|
|
|
return count
|
|
|
|
|
|
@classmethod
|
|
|
def get_bygj_all_count(cls):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where task_mark = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where task_mark = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
|
|
|
count = MysqlHelper.get_values(sql, (str("搬运工具")))
|
|
|
return count
|
|
|
|
|
|
@classmethod
|
|
|
def get_ytd_bygj_count(cls, name):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time < CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where name = %s and task_mark = "搬运工具" and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time <= CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
|
|
|
count = MysqlHelper.get_values(sql, (str(name)))
|
|
|
return count
|
|
|
|
|
|
@classmethod
|
|
|
def get_channel_count(cls, channel, name):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
|
|
|
count = MysqlHelper.get_values(sql, (str(channel),name))
|
|
|
return count
|
|
|
|
|
|
@classmethod
|
|
|
def get_ytd_channel_count(cls, channel, name):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time < CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where channel = %s and name = %s and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time <= CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
|
|
|
count = MysqlHelper.get_values(sql, (str(channel), name))
|
|
|
return count
|
|
|
|
|
|
@classmethod
|
|
|
def get_name_count(cls, name):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where name = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) < HOUR(NOW());"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where name = %s and DATE(data_time) = CURRENT_DATE AND HOUR(data_time) <= HOUR(NOW());"""
|
|
|
count = MysqlHelper.get_values(sql, (str(name)))
|
|
|
return count
|
|
|
|
|
|
@classmethod
|
|
|
def get_ytd_name_count(cls, name):
|
|
|
- sql = """SELECT count(0) FROM machine_making_data where name = %s and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time < CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
|
|
|
+ sql = """SELECT count(0) FROM machine_making_data where name = %s and data_time >= CURRENT_DATE - INTERVAL 1 DAY AND data_time <= CURRENT_DATE - INTERVAL 1 DAY + INTERVAL HOUR(NOW()) HOUR;"""
|
|
|
count = MysqlHelper.get_values(sql, (str(name)))
|
|
|
return count
|
|
|
|