feat:示例调整以及bug修复

main_service.py

@@ -460,8 +460,8 @@ def get_history():
     logger.info(f"in main get history {request.args}")
     try:
         user_id = request.args.get("user_id")
-        page_num = int(request.args.get("page_num"))
-        page_size = int(request.args.get("page_size"))
+        page_num = int(request.args.get("page_num",1))
+        page_size = int(request.args.get("page_size",10))
         if page_num < 1:
             page_num = 1
         if page_size < 1 or page_size > 100:
@@ -492,7 +492,7 @@ def get_history():
             #     cvs[info_type] = answer_info.get("error","信息获取失败")
             cvs['answer'] = json.loads(item.answer) if item.answer else None
             cvs['chart_cfg'] = json.loads(item.chart_cfg) if item.chart_cfg else None
-            cvs['user_praise'] = map_list[item.id]
+            cvs['user_praise'] = map_list.get(item.id,0)
             history.append(cvs)
         info["history"] = history
         return jsonify(info)

util/q_a_next.py

@@ -261,6 +261,29 @@ org_and_attend_q_a = [
                   ''',
         "tags": ["员工", "部门", "考勤", "加班"],
         "category": "考勤管理"
-    },
+    },{
+        'question':'xx部有哪些员工',
+        'answer':'''
+                 SELECT p."id"                                                                   AS "id",
+                        p."code"                                                                 AS "工号",
+                        p."name"                                                                 AS "姓名",
+                        o."name"                                                                 AS "单位",
+                        CASE WHEN p."gender" = '1' THEN '男' WHEN p."gender" = '2' THEN '女' END AS "性别",
+                        CASE
+                            WHEN p."person_status" = '1' THEN '草稿'
+                            WHEN p."person_status" = '2' THEN '审批中'
+                            WHEN p."person_status" = '3' THEN '制卡中'
+                            WHEN p."person_status" = '4' THEN '已入库'
+                            WHEN p."person_status" = '5' THEN '停用' END                         AS "人员状态"
+                 FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p
+                          JOIN "IUAP_APDOC_BASEDOC"."org_orgs" o ON p."internal_dept" = o."id"
+                 WHERE 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") AND p."dr" = 0
+                 ORDER BY p."code" ASC LIMIT 1000
+                 ''',
+        "tags": ["员工", "部门",],
+        "category": "员工"
+    }
 
 ]

util/q_and_a_test1.py

@@ -556,7 +556,6 @@ question_and_answer = [
         "answer": '''
                   SELECT DISTINCT p."code"                                              AS "工号",
                                   p."name"                                              AS "姓名",
-                                  p."internal_unit"                                     AS "内部单位",
                                   p."work_unit"                                     AS "工作单位",
                                   CASE
                                       WHEN ps."status" = '1001' THEN '在岗'