pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!5419 !5418 添加功能

Browse Source 
Merge pull request !5419 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-09-26 07:15:46 +00:00
committed by Gitee
parent 6af735dbb6 cd91abb386
commit cf07c86880
1 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/controllers/applet_attendance.py
+2 -42
View File
@@ -800,7 +800,7 @@ class AppletAttendance(Controller):
'building': '天河商贸大厦',
'floor': floor,
'room': room,
'epitope_values':electric.epitope_values,
'epitope_values':electric.epitope_values_id.name,
'unit_number':electric.unit_number,
'state': electric.state, # 状态 reading unreading
}
@@ -858,7 +858,7 @@ class AppletAttendance(Controller):
'building': building,
'floor': floor,
'room': room,
'epitope_values':water.epitope_values,
'epitope_values':water.epitope_values_id.name,
'unit_number':water.unit_number,
'state': water.state, # 状态 reading unreading
}
@@ -883,46 +883,6 @@ class AppletAttendance(Controller):
'building_list': building_list
})
# 按“楼盘->楼层”分组
# building_floor_map = {}
# for record in all_records:
# building_name = record['building']
# state = record['state']
# floor_name = record['epitope_values']
#
# # 初始化楼盘分组（空楼盘名也作为有效分组）
# if building_name not in building_floor_map:
# building_floor_map[building_name] = {}
#
# # 初始化状态分组
# if state not in building_floor_map[building_name]:
# building_floor_map[building_name][state] = {}
#
# # 初始化楼层分组（空楼层名也作为有效分组）
# if floor_name not in building_floor_map[building_name]:
# building_floor_map[building_name][state][floor_name] = []
#
# # 移除building和floor字段，只保留数据项
# record_data = {k: v for k, v in record.items() if k not in ['building', 'epitope_values']}
# building_floor_map[building_name][state][floor_name].append(record_data)
#
# # 组装最终返回结构
# table_list = []
# # for building, floor_dict in building_floor_map.items():
# # floor_list = [
# # {'floor': floor, 'data_list': data_list}
# # for floor, data_list in floor_dict.items()
# # ]
# # table_list.append({'building': building, 'floor_list': floor_list})
#
# # 三层结构组装
# for building, state_dict in building_floor_map.items():
# state_list = [
# {'state': state, 'floor_list': [{'floor': floor, 'data_list': data_list} for floor, data_list in floor_dict.items()]}
# for state, floor_dict in state_dict.items()
# ]
# table_list.append({'building': building, 'state_list': state_list})
return json.dumps({
'electric': electric_result,
'water': water_result,