|
|
@@ -1414,8 +1414,8 @@ async def duty_by_day(
|
|
|
"id": d.id,
|
|
|
"start_time": d.start_time.strftime('%Y-%m-%d %H:%M:%S') if d.start_time else '',
|
|
|
"end_time": d.end_time.strftime('%Y-%m-%d %H:%M:%S') if d.end_time else '',
|
|
|
- "duty_date": d.duty_date,
|
|
|
- "shift_type": d.shift_type,
|
|
|
+ "duty_date": get_date_str(d.duty_date),
|
|
|
+ "shift_type": (get_dict_data_info(db, "schedule_time", d.shift_type)).dict_label,
|
|
|
"duty_unit": d.duty_unit,
|
|
|
"duty_type": d.duty_type,
|
|
|
"createTime": d.create_time.strftime('%Y-%m-%d %H:%M:%S') if d.create_time else '',
|
|
|
@@ -1425,11 +1425,9 @@ async def duty_by_day(
|
|
|
"deputy_class":"、".join(deputy_class),
|
|
|
"prepare_class":"、".join(prepare_class)
|
|
|
})
|
|
|
+ print(data_list)
|
|
|
|
|
|
- data['users']["user1"] = "、".join(class_leader)
|
|
|
- data['users']["user2"] = "、".join(main_class)
|
|
|
- data['users']["user3"] = "、".join(deputy_class)
|
|
|
- data['users']["user4"] = "、".join(prepare_class)
|
|
|
+ data['users'] = data_list
|
|
|
|
|
|
# 提醒事项
|
|
|
where = and_(DutyNotify.del_flag == '0', DutyNotify.notify_type == '1', DutyNotify.shift_id.in_(duty_id))
|
