From d7981ab0c47a943e7f185bd16ad90906a579232f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E9=9B=A8?= Date: Fri, 28 Nov 2025 16:03:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=8E=BB=E6=8E=89=E5=86=85=E9=83=A8?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util/q_and_a_test1.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/util/q_and_a_test1.py b/util/q_and_a_test1.py index cd037d3..0292f75 100644 --- a/util/q_and_a_test1.py +++ b/util/q_and_a_test1.py @@ -8,7 +8,6 @@ question_and_answer = [ SELECT "id" AS "ID", "code" AS "工号", "name" AS "姓名", - "internal_unit" AS "内部单位", "work_unit" AS "工作单位", "phone_number" AS "手机号", "email" AS "邮箱", @@ -473,7 +472,6 @@ question_and_answer = [ SELECT p."id" AS "id", p."code" AS "工号", p."name" AS "姓名", - p."internal_unit" AS "内部单位", p."work_unit" AS "工作单位", CASE WHEN ps."status" = '1003' THEN '休假,请假' ELSE ps."status" END AS "状态" FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p @@ -497,7 +495,6 @@ question_and_answer = [ SELECT p."id" AS "id", p."code" AS "工号", p."name" AS "姓名", - p."internal_unit" AS "内部单位", p."work_unit" AS "工作单位", CASE WHEN ps."status" = '1006' THEN '迟到早退' @@ -531,7 +528,6 @@ question_and_answer = [ SELECT DISTINCT p."id" AS "id", p."code" AS "工号", p."name" AS "姓名", - p."internal_unit" AS "内部单位", p."work_unit" AS "工作单位", CASE WHEN ps."status" = '1008' THEN '加班' ELSE '其他' From 85bd57f1f2768bdffb444b02bbb629474be2c433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E9=9B=A8?= Date: Fri, 28 Nov 2025 16:40:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E7=A4=BA=E4=BE=8B=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A5=E5=8F=8Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main_service.py | 6 +++--- util/q_a_next.py | 25 ++++++++++++++++++++++++- util/q_and_a_test1.py | 1 - 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/main_service.py b/main_service.py index 5f7dfaa..826190e 100644 --- a/main_service.py +++ b/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) diff --git a/util/q_a_next.py b/util/q_a_next.py index b22ec83..9b5ff71 100644 --- a/util/q_a_next.py +++ b/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": "员工" + } ] diff --git a/util/q_and_a_test1.py b/util/q_and_a_test1.py index 0292f75..d546843 100644 --- a/util/q_and_a_test1.py +++ b/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 '在岗'