Merge remote-tracking branch 'origin/dev_graph' into dev_graph

This commit is contained in:
yujj128
2025-11-28 17:15:24 +08:00
3 changed files with 27 additions and 9 deletions

View File

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

View File

@@ -261,6 +261,29 @@ org_and_attend_q_a = [
''', ''',
"tags": ["员工", "部门", "考勤", "加班"], "tags": ["员工", "部门", "考勤", "加班"],
"category": "考勤管理" "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": "员工"
}
] ]

View File

@@ -8,7 +8,6 @@ question_and_answer = [
SELECT "id" AS "ID", SELECT "id" AS "ID",
"code" AS "工号", "code" AS "工号",
"name" AS "姓名", "name" AS "姓名",
"internal_unit" AS "内部单位",
"work_unit" AS "工作单位", "work_unit" AS "工作单位",
"phone_number" AS "手机号", "phone_number" AS "手机号",
"email" AS "邮箱", "email" AS "邮箱",
@@ -473,7 +472,6 @@ question_and_answer = [
SELECT p."id" AS "id", SELECT p."id" AS "id",
p."code" AS "工号", p."code" AS "工号",
p."name" AS "姓名", p."name" AS "姓名",
p."internal_unit" AS "内部单位",
p."work_unit" AS "工作单位", p."work_unit" AS "工作单位",
CASE WHEN ps."status" = '1003' THEN '休假,请假' ELSE ps."status" END AS "状态" CASE WHEN ps."status" = '1003' THEN '休假,请假' ELSE ps."status" END AS "状态"
FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p
@@ -497,7 +495,6 @@ question_and_answer = [
SELECT p."id" AS "id", SELECT p."id" AS "id",
p."code" AS "工号", p."code" AS "工号",
p."name" AS "姓名", p."name" AS "姓名",
p."internal_unit" AS "内部单位",
p."work_unit" AS "工作单位", p."work_unit" AS "工作单位",
CASE CASE
WHEN ps."status" = '1006' THEN '迟到早退' WHEN ps."status" = '1006' THEN '迟到早退'
@@ -531,7 +528,6 @@ question_and_answer = [
SELECT DISTINCT p."id" AS "id", SELECT DISTINCT p."id" AS "id",
p."code" AS "工号", p."code" AS "工号",
p."name" AS "姓名", p."name" AS "姓名",
p."internal_unit" AS "内部单位",
p."work_unit" AS "工作单位", p."work_unit" AS "工作单位",
CASE WHEN ps."status" = '1008' THEN '加班' CASE WHEN ps."status" = '1008' THEN '加班'
ELSE '其他' ELSE '其他'
@@ -560,7 +556,6 @@ question_and_answer = [
"answer": ''' "answer": '''
SELECT DISTINCT p."code" AS "工号", SELECT DISTINCT p."code" AS "工号",
p."name" AS "姓名", p."name" AS "姓名",
p."internal_unit" AS "内部单位",
p."work_unit" AS "工作单位", p."work_unit" AS "工作单位",
CASE CASE
WHEN ps."status" = '1001' THEN '在岗' WHEN ps."status" = '1001' THEN '在岗'