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

# Conflicts:
#	util/load_ddl_doc.py
#	util/train_ddl.py

util/train_ddl.py

@@ -470,6 +470,15 @@ person_database_ddl = """
 
 """
 
+train_document='''
+                语法为达梦数据库语法;
+                查询地址，籍贯，公司，单位时，尽量使用like查询;
+                查询人员信息时,由于数据表字段过多。只需要展示人员关键信息字段，id，工号，姓名，单位以及用户问题中需要查询的字段;
+                表字段信息以及字段枚举信息在values下，注意相关字段枚举值的转换;
+                查询单位时，通过orgs表查询，且需要基于parentID查询单位下的子单位；
+                查询内部单位时，则可以直接查询人员信息表，通过like模糊查询；
+        '''
+
 person_attendance_rule_ddl='''
 {
   "db_name":"YJOA_APPSERVICE_DB",
@@ -627,7 +636,7 @@ user_status_ddl='''
 user_attendance_ddl = '''
 {
   "db_name": "YJOA_APPSERVICE_DB",
-  "table_name": "t_person_attendance_records",
+  "table_name": "t_yj_person_attendance",
   "table_comment": "人员考勤记录表，存储员工的打卡记录、考勤状态和位置信息",
   "columns": [
     {
@@ -682,7 +691,7 @@ user_attendance_ddl = '''
         "2": "休假"
       },
       "role": "dimension",
-      "tags": ["状态标识", "人员在岗状态"]
+      "tags": ["状态标识", "人员在岗状态","枚举"]
     },
     {
       "name": "original_id",
@@ -714,13 +723,7 @@ user_attendance_ddl = '''
       "role": "dimension",
       "tags": ["软删除", "数据状态"]
     },
-    {
-      "name": "create_time",
-      "type": "DATETIME",
-      "comment": "创建时间",
-      "role": "dimension",
-      "tags": ["时间戳", "记录创建时间"]
-    },
+   
     {
       "name": "enter_or_exit",
       "type": "INT",
@@ -739,34 +742,6 @@ user_attendance_ddl = '''
       "role": "dimension",
       "tags": ["门禁位置", "打卡设备点"]
     },
-    {
-      "name": "by_st",
-      "type": "VARCHAR(20)",
-      "comment": "上午打卡时间",
-      "role": "dimension",
-      "tags": ["时间范围", "开始时间"]
-    },
-    {
-      "name": "by_et",
-      "type": "VARCHAR(20)",
-      "comment": "下午打卡时间",
-      "role": "dimension",
-      "tags": ["时间范围", "结束时间"]
-    },
-    {
-      "name": "by_st_field",
-      "type": "VARCHAR(50)",
-      "comment": "午休前打卡时间",
-      "role": "dimension",
-      "tags": ["中间打卡","时间配置"]
-    },
-    {
-      "name": "by_et_field",
-      "type": "VARCHAR(50)",
-      "comment": "午休后打卡时间",
-      "role": "dimension",
-      "tags": ["中间打卡", "时间配置"]
-    },
     {
       "name": "by_go_type",
       "type": "VARCHAR(8)",
@@ -862,8 +837,6 @@ person_rules_ddl = '''
 '''
 
 person_ac_position = '''
-  ],
- 
 {
   "db_name":"YJOA_APPSERVICE_DB",
   "table_name": "t_yj_person_ac_position",
@@ -942,7 +915,7 @@ person_ac_area = '''
     },
   ],
  
-  "tags": ["门禁详情","门禁区域位置","门禁地区信息"]
+  "tags": ["门禁详情","门禁区域位置","门禁地区信息","枚举"]
 }
 '''
 
@@ -959,6 +932,13 @@ org_orgs_ddl = '''
       "comment": "主键ID",
       "role": "dimension",
       "tags": ["主键", "id标识"]
+    },
+     {
+      "name": "parentid",
+      "type": "VARCHAR(36)",
+      "comment": "父级部门ID",
+      "role": "dimension",
+      "tags": ["主键", "id标识"]
     },
     {
       "name": "code",
@@ -985,14 +965,4 @@ org_orgs_ddl = '''
  
   "tags": ["部门id","部门信息","部门名称"]
 }
-'''
-
-train_document = '''
-                语法为达梦数据库语法;
-                查询地址，籍贯，公司，单位时，尽量使用like查询;
-                查询人员信息时,由于数据表字段过多。只需要展示人员关键信息字段，id，工号，姓名，单位以及用户问题中需要查询的字段;
-                表字段信息以及字段枚举信息在values下，注意相关字段枚举值的转换;
-                查询单位信息时，内部单位和外部单位都需要查询，用OR条件查询;
-                
-
-        '''
+'''