Merge branch 'dev' of http://106.13.42.156:33077/lei_y601/sqlbot_agent into dev

main_service.py

@@ -58,9 +58,10 @@ def create_vana():
 def init_vn(vn):
     logger.info("--------------init vana-----connect to datasouce db----")
     connect_database(vn)
-    load_ddl_doc.add_ddl(vn)
+
-    load_ddl_doc.add_documentation(vn)
     if config('IS_FIRST_LOAD', default=False, cast=bool):
+        load_ddl_doc.add_ddl(vn)
+        load_ddl_doc.add_documentation(vn)
         load_train_data_ddl(vn)
     return vn
 

util/q_a_next.py

@@ -120,7 +120,7 @@ org_and_attend_q_a = [
                          COUNT(ps.id) AS "late_count"
                   FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p
                            JOIN "IUAP_APDOC_BASEDOC"."org_orgs" o ON p.internal_dept = o.id
-                           JOIN "YJOA_APPSERVICE_DB"."t_yj_person_status" ps ON p.id = ps.person_id
+                           JOIN "YJOA_APPSERVICE_DB"."t_yj_person_status" ps ON p.code = ps.person_id
                   WHERE p.dr = 0
                     AND ps.dr = 0
                     AND ps.status = '1006'
@@ -217,6 +217,24 @@ org_and_attend_q_a = [
                          ''',
         "tags": ["员工", "部门", "考勤", "迟到","人数","最值"],
         "category": "考勤管理"
-    }
+    },
+    {
+        "question": "XX中心在藏最长时间的人是谁",
+        "answer": '''
+                  SELECT p."name" AS "姓名", p."code" AS "工号", COUNT(ps."id") AS "在藏天数"
+                  FROM YJOA_APPSERVICE_DB."t_yj_person_status" ps
+                           JOIN YJOA_APPSERVICE_DB."t_pr3rl2oj_yj_person_database" p ON ps."person_id" = p."code"
+                  WHERE ps."is_in_tibet" = 1
+                    AND ps."dr" = 0
+                    AND p."dr" = 0
+                    and p.internal_dept in (SELECT "id"
+                                            FROM "IUAP_APDOC_BASEDOC"."org_orgs" START
+                  WITH "name"||"shortname" LIKE '%xx中心%' AND "dr"=0 AND "enable"=1 AND "code" LIKE '%CYJ%'
+                  CONNECT BY PRIOR "id" = "parentid"
+                      )
+                  GROUP BY p."name", p."code"
+                  ORDER BY COUNT (ps."id") DESC LIMIT 1
+                  '''
+    },
 
 ]