diff --git a/app.py b/app.py index e9d27e0..38d9a54 100644 --- a/app.py +++ b/app.py @@ -179,8 +179,8 @@ def copy_config(config_id): # 插入新配置 execute_insert( '''INSERT INTO t_daily_report_config - (id, config_name, split_type, split_value, split_name, selected_fields, sum_fields, is_active, sort_order, create_time, update_time) - VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, NOW(), NOW())''', + (id, config_name, split_type, split_value, split_name, selected_fields, sum_fields, time_periods, is_active, sort_order, create_time, update_time) + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, NOW(), NOW())''', ( new_id, new_name, @@ -189,6 +189,7 @@ def copy_config(config_id): original['split_name'], original['selected_fields'], original.get('sum_fields', ''), + original.get('time_periods', ''), original['is_active'], sort_order ) @@ -280,23 +281,23 @@ def get_entities(): offset = (page - 1) * page_size if entity_type == 'company': - # 获取企业列表 + # 获取企业列表 (company_state=0 表示启用) if search: companies = execute_query( - 'SELECT id AS company_id, company_name FROM t_company WHERE company_state = "1" AND company_name LIKE %s ORDER BY company_name LIMIT %s OFFSET %s', + 'SELECT id AS company_id, company_name FROM t_company WHERE company_state = 0 AND company_name LIKE %s ORDER BY company_name LIMIT %s OFFSET %s', (f'%{search}%', page_size, offset) ) total_result = execute_query( - 'SELECT COUNT(*) as total FROM t_company WHERE company_state = "1" AND company_name LIKE %s', + 'SELECT COUNT(*) as total FROM t_company WHERE company_state = 0 AND company_name LIKE %s', (f'%{search}%',) ) else: companies = execute_query( - 'SELECT id AS company_id, company_name FROM t_company WHERE company_state = "1" ORDER BY company_name LIMIT %s OFFSET %s', + 'SELECT id AS company_id, company_name FROM t_company WHERE company_state = 0 ORDER BY company_name LIMIT %s OFFSET %s', (page_size, offset) ) total_result = execute_query( - 'SELECT COUNT(*) as total FROM t_company WHERE company_state = "1"' + 'SELECT COUNT(*) as total FROM t_company WHERE company_state = 0' ) total = total_result[0]['total'] if total_result else 0 return jsonify({'success': True, 'data': companies, 'total': total, 'page': page, 'page_size': page_size})