bf1942
8938ce2708
- 统一移除手动创建的数据库session，统一使用models模块中的db.session - 修正项目创建接口，增加开始和结束日期的格式验证与处理 - 更新导入项目接口，使用枚举类型校验项目类型并优化异常处理 - 更新统计接口，避免多次查询假期数据，优化日期字符串处理 - 删除回滚前多余的session关闭调用，改为使用db.session.rollback() - app.py中重构数据库初始化：统一配置SQLAlchemy，动态创建数据库路径和表 - 项目模型新增开始日期和结束日期字段支持 - 添加导入批次历史记录模型支持 - 优化工具函数中日期类型提示，移除无用导入 - 更新requirements.txt依赖版本回退，确保兼容性 - 前端菜单添加导入历史导航入口，实现页面访问路由绑定
182 lines
7.0 KiB
Python
182 lines
7.0 KiB
Python
from flask import Blueprint, request, jsonify
|
|
from sqlalchemy import and_
|
|
from models.models import db, TimeRecord, Project, Holiday
|
|
from models.utils import *
|
|
from datetime import datetime, date
|
|
import json
|
|
|
|
timerecords_bp = Blueprint('timerecords', __name__)
|
|
|
|
@timerecords_bp.route('/api/timerecords', methods=['GET'])
|
|
def get_timerecords():
|
|
"""获取工时记录列表"""
|
|
try:
|
|
# 获取查询参数
|
|
start_date = request.args.get('start_date')
|
|
end_date = request.args.get('end_date')
|
|
project_id = request.args.get('project_id')
|
|
|
|
query = db.session.query(TimeRecord).options(db.joinedload(TimeRecord.project))
|
|
|
|
# 应用筛选条件
|
|
if start_date:
|
|
query = query.filter(TimeRecord.date >= datetime.strptime(start_date, '%Y-%m-%d').date())
|
|
if end_date:
|
|
query = query.filter(TimeRecord.date <= datetime.strptime(end_date, '%Y-%m-%d').date())
|
|
if project_id:
|
|
query = query.filter(TimeRecord.project_id == int(project_id))
|
|
|
|
records = query.order_by(TimeRecord.date.desc()).all()
|
|
|
|
result = []
|
|
for record in records:
|
|
record_dict = record.to_dict()
|
|
# 添加星期几信息
|
|
if record.date:
|
|
record_dict['day_of_week'] = get_day_of_week_chinese(record.date)
|
|
result.append(record_dict)
|
|
|
|
return jsonify({'success': True, 'data': result})
|
|
|
|
except Exception as e:
|
|
return jsonify({'success': False, 'error': str(e)}), 500
|
|
|
|
@timerecords_bp.route('/api/timerecords', methods=['POST'])
|
|
def create_timerecord():
|
|
"""创建工时记录"""
|
|
try:
|
|
data = request.json
|
|
|
|
# 验证必填字段
|
|
if not data.get('date'):
|
|
return jsonify({'success': False, 'error': '日期为必填项'}), 400
|
|
|
|
record_date = datetime.strptime(data['date'], '%Y-%m-%d').date()
|
|
|
|
# 检查是否为休息日
|
|
holidays = db.session.query(Holiday).all()
|
|
holiday_info = is_holiday(record_date, holidays)
|
|
|
|
# 计算工时
|
|
hours = data.get('hours', '')
|
|
if not hours and data.get('start_time') and data.get('end_time'):
|
|
hours = calculate_hours(data['start_time'], data['end_time'], holiday_info['is_holiday'])
|
|
elif not hours:
|
|
hours = '0:00' if holiday_info['is_holiday'] else '-'
|
|
|
|
# 获取周信息
|
|
week_info = get_week_info(record_date)
|
|
|
|
# 创建记录
|
|
record = TimeRecord(
|
|
date=record_date,
|
|
event_description=data.get('event_description', ''),
|
|
project_id=data.get('project_id') if data.get('project_id') else None,
|
|
start_time=datetime.strptime(data['start_time'], '%H:%M').time() if data.get('start_time') and data['start_time'] != '-' else None,
|
|
end_time=datetime.strptime(data['end_time'], '%H:%M').time() if data.get('end_time') and data['end_time'] != '-' else None,
|
|
activity_num=data.get('activity_num', ''),
|
|
hours=hours,
|
|
is_holiday=holiday_info['is_holiday'],
|
|
is_working_on_holiday=holiday_info['is_holiday'] and hours not in ['-', '0:00'],
|
|
holiday_type=holiday_info['holiday_type'],
|
|
week_info=week_info
|
|
)
|
|
|
|
db.session.add(record)
|
|
db.session.commit()
|
|
|
|
result = record.to_dict()
|
|
if record.date:
|
|
result['day_of_week'] = get_day_of_week_chinese(record.date)
|
|
|
|
return jsonify({'success': True, 'data': result})
|
|
|
|
except Exception as e:
|
|
db.session.rollback()
|
|
return jsonify({'success': False, 'error': str(e)}), 500
|
|
|
|
@timerecords_bp.route('/api/timerecords/<int:record_id>', methods=['PUT'])
|
|
def update_timerecord(record_id):
|
|
"""更新工时记录"""
|
|
try:
|
|
data = request.json
|
|
|
|
record = db.session.query(TimeRecord).get(record_id)
|
|
if not record:
|
|
return jsonify({'success': False, 'error': '记录不存在'}), 404
|
|
|
|
# 更新字段
|
|
if 'event_description' in data:
|
|
record.event_description = data['event_description']
|
|
if 'project_id' in data:
|
|
record.project_id = data['project_id'] if data['project_id'] else None
|
|
if 'activity_num' in data:
|
|
record.activity_num = data['activity_num']
|
|
|
|
# 更新时间相关字段
|
|
if 'start_time' in data:
|
|
record.start_time = datetime.strptime(data['start_time'], '%H:%M').time() if data['start_time'] and data['start_time'] != '-' else None
|
|
if 'end_time' in data:
|
|
record.end_time = datetime.strptime(data['end_time'], '%H:%M').time() if data['end_time'] and data['end_time'] != '-' else None
|
|
|
|
# 重新计算工时
|
|
if 'hours' in data:
|
|
record.hours = data['hours']
|
|
elif record.start_time and record.end_time:
|
|
start_str = record.start_time.strftime('%H:%M')
|
|
end_str = record.end_time.strftime('%H:%M')
|
|
record.hours = calculate_hours(start_str, end_str, record.is_holiday)
|
|
|
|
# 更新工作日状态
|
|
record.is_working_on_holiday = record.is_holiday and record.hours not in ['-', '0:00']
|
|
|
|
db.session.commit()
|
|
|
|
result = record.to_dict()
|
|
if record.date:
|
|
result['day_of_week'] = get_day_of_week_chinese(record.date)
|
|
|
|
return jsonify({'success': True, 'data': result})
|
|
|
|
except Exception as e:
|
|
db.session.rollback()
|
|
return jsonify({'success': False, 'error': str(e)}), 500
|
|
|
|
@timerecords_bp.route('/api/timerecords/<int:record_id>', methods=['DELETE'])
|
|
def delete_timerecord(record_id):
|
|
"""删除工时记录"""
|
|
try:
|
|
record = db.session.query(TimeRecord).get(record_id)
|
|
if not record:
|
|
return jsonify({'success': False, 'error': '记录不存在'}), 404
|
|
|
|
db.session.delete(record)
|
|
db.session.commit()
|
|
|
|
return jsonify({'success': True, 'message': '记录已删除'})
|
|
|
|
except Exception as e:
|
|
db.session.rollback()
|
|
return jsonify({'success': False, 'error': str(e)}), 500
|
|
|
|
@timerecords_bp.route('/api/timerecords/check_holiday/<string:date_str>', methods=['GET'])
|
|
def check_holiday(date_str):
|
|
"""检查指定日期是否为休息日"""
|
|
try:
|
|
check_date = datetime.strptime(date_str, '%Y-%m-%d').date()
|
|
holidays = db.session.query(Holiday).all()
|
|
holiday_info = is_holiday(check_date, holidays)
|
|
|
|
result = {
|
|
'date': date_str,
|
|
'is_holiday': holiday_info['is_holiday'],
|
|
'holiday_type': holiday_info['holiday_type'],
|
|
'holiday_name': holiday_info['holiday_name'],
|
|
'day_of_week': get_day_of_week_chinese(check_date),
|
|
'week_info': get_week_info(check_date)
|
|
}
|
|
|
|
return jsonify({'success': True, 'data': result})
|
|
|
|
except Exception as e:
|
|
return jsonify({'success': False, 'error': str(e)}), 500 |