v6ole
a580eefd14
1. 用户管理页 UX 优化: - 表格内「解绑」按钮移入编辑弹窗(clearable 输入框) - 新增「需要填写周报」el-switch 开关 - 新增「填报」列显示是否计入统计 2. require_report 字段 (DB + API + 联动): - users 表新增 require_report BOOLEAN DEFAULT TRUE - 调度器/仪表盘进度/立即检查 均排除 require_report=false - UserOut schema + UpdateUserRoleRequest 同步更新 3. 拜访联动客户 last_visit: - customers 表新增 last_visit_date / last_visit_manager_id - 创建拜访记录时自动更新对应客户的最后拜访信息 - 亮灯表可据此精确判断客户拜访状态 Co-Authored-By: Claude <noreply@anthropic.com>
125 lines
3.8 KiB
Python
125 lines
3.8 KiB
Python
import uuid
|
|
from typing import Optional
|
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
from pydantic import BaseModel
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy import select
|
|
from app.database import get_db
|
|
from app.middleware.auth import get_current_user, require_director
|
|
from app.models.user import User
|
|
from app.schemas.customer import UserOut
|
|
|
|
router = APIRouter(prefix="/users", tags=["Users"])
|
|
|
|
|
|
class UpdateUserRoleRequest(BaseModel):
|
|
role: str # manager / director / leader
|
|
department: str = ""
|
|
require_report: bool = True
|
|
|
|
|
|
@router.get("/", response_model=list[UserOut])
|
|
async def list_users(
|
|
role: Optional[str] = Query(None),
|
|
current_user: dict = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
"""List all users. Used for companion selection, assignment, etc."""
|
|
query = select(User)
|
|
if role:
|
|
query = query.where(User.role == role)
|
|
query = query.order_by(User.name)
|
|
result = await db.execute(query)
|
|
return result.scalars().all()
|
|
|
|
|
|
@router.get("/me")
|
|
async def get_current_user_info(
|
|
current_user: dict = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
"""Get current user's full profile."""
|
|
result = await db.execute(select(User).where(User.id == uuid.UUID(current_user["user_id"])))
|
|
user = result.scalar_one_or_none()
|
|
if not user:
|
|
raise HTTPException(status_code=404, detail="User not found")
|
|
return {
|
|
"id": str(user.id),
|
|
"casdoor_id": user.casdoor_id,
|
|
"name": user.name,
|
|
"role": user.role,
|
|
"department": user.department,
|
|
"wecom_userid": user.wecom_userid,
|
|
}
|
|
|
|
|
|
@router.put("/{user_id}/role")
|
|
async def update_user_role(
|
|
user_id: str,
|
|
data: UpdateUserRoleRequest,
|
|
current_user: dict = Depends(require_director),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
"""Director updates a user's role. Only director can do this."""
|
|
if data.role not in ("manager", "director", "leader"):
|
|
raise HTTPException(status_code=400, detail="Invalid role. Must be manager/director/leader")
|
|
|
|
result = await db.execute(select(User).where(User.id == uuid.UUID(user_id)))
|
|
user = result.scalar_one_or_none()
|
|
if not user:
|
|
raise HTTPException(status_code=404, detail="User not found")
|
|
|
|
user.role = data.role
|
|
if data.department:
|
|
user.department = data.department
|
|
user.require_report = data.require_report
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
|
|
return {
|
|
"id": str(user.id),
|
|
"name": user.name,
|
|
"role": user.role,
|
|
"department": user.department,
|
|
"require_report": user.require_report,
|
|
}
|
|
|
|
|
|
class UpdateWecomRequest(BaseModel):
|
|
wecom_userid: Optional[str] = None # None or "" to unbind
|
|
|
|
|
|
@router.put("/{user_id}/wecom")
|
|
async def update_user_wecom(
|
|
user_id: str,
|
|
data: UpdateWecomRequest,
|
|
current_user: dict = Depends(require_director),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
"""Director binds or unbinds a user's WeChat Work account."""
|
|
result = await db.execute(select(User).where(User.id == uuid.UUID(user_id)))
|
|
user = result.scalar_one_or_none()
|
|
if not user:
|
|
raise HTTPException(status_code=404, detail="User not found")
|
|
|
|
new_id = (data.wecom_userid or "").strip()
|
|
|
|
# Check duplicate
|
|
if new_id:
|
|
dup = await db.execute(
|
|
select(User).where(User.wecom_userid == new_id, User.id != uuid.UUID(user_id))
|
|
)
|
|
existing = dup.scalar_one_or_none()
|
|
if existing:
|
|
raise HTTPException(status_code=400, detail=f"该企微ID已被「{existing.name}」绑定")
|
|
|
|
user.wecom_userid = new_id if new_id else None
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
|
|
return {
|
|
"id": str(user.id),
|
|
"name": user.name,
|
|
"wecom_userid": user.wecom_userid,
|
|
}
|