diff --git a/service/cus_vanna_srevice.py b/service/cus_vanna_srevice.py index 4a59999..db94799 100644 --- a/service/cus_vanna_srevice.py +++ b/service/cus_vanna_srevice.py @@ -209,7 +209,7 @@ class OpenAICompatibleLLM(VannaBase): logger.info("Start to generate_sql_2 in cus_vanna_srevice") question_sql_list = self.get_similar_question_sql(question, **kwargs) if question_sql_list and len(question_sql_list)>2: - question_sql_list=question_sql_list[:1] + question_sql_list=question_sql_list[:2] ddl_list = self.get_related_ddl(question, **kwargs) #doc_list = self.get_related_documentation(question, **kwargs) diff --git a/util/q_and_a_dict.py b/util/q_and_a_dict.py index 40837b1..b62efbd 100644 --- a/util/q_and_a_dict.py +++ b/util/q_and_a_dict.py @@ -190,11 +190,11 @@ question_and_answer = [ WHEN a."enter_or_exit" = 1 THEN '出' END AS "进出类型", CASE - WHEN b."region" = 1 THEN '水科院大厦' + WHEN b."region" = 1 THEN '北京' WHEN b."region" = 2 THEN '成都' WHEN b."region" = 3 THEN '秭归' WHEN b."region" = 5 THEN '林芝' END AS "地区", - a."access_control_point" AS "门禁点" + AS "门禁点" FROM "YJOA_APPSERVICE_DB"."t_yj_person_attendance" a JOIN "YJOA_APPSERVICE_DB"."t_yj_person_ac_area" b ON a."access_control_point" = b."ac_point" WHERE a."person_name" = '张三' @@ -261,6 +261,18 @@ question_and_answer = [ GROUP BY o.name ORDER BY "人数" DESC LIMIT 1000 ''' + },{ + "question": "张三9月在林芝多少天", + "answer": ''' + SELECT count(distinct (TO_CHAR(a."attendance_time", 'yyyy-MM-dd'))) as count + FROM "YJOA_APPSERVICE_DB"."t_yj_person_attendance" a LEFT JOIN "YJOA_APPSERVICE_DB"."t_yj_person_ac_area" b + ON a."access_control_point" = b."ac_point" + WHERE a."person_name" = '张三' + AND a."attendance_time" >= '2025-09-01' + AND a."attendance_time" + < '2025-10-01' + AND a."dr" = 0 LIMIT 1000 + ''' } ]