기능 추가 — 신고 상황종료 처리
- DB: reports 테이블에 closure_type, closure_note, closed_at, closed_by 컬럼 추가
- 백엔드: PATCH /reports/{id}/close 엔드포인트 (사유 4종: natural/remote_reset/false_alarm/other)
- 신고상세: 승인대기 상태에서 [상황종료] 버튼 추가, 인라인 패널에서 사유 선택
- 상황종료 후 상세 화면에 사유·메모·처리자·일시 표시
- 엑셀 AS신고목록에 상황종료 4개 컬럼 추가
- 신고목록 필터·지도 상태 목록에 closed 추가, CSS 뱃지 추가
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -59,10 +59,15 @@ class Report(Base):
|
||||
source = Column(String(20), default="qr") # qr | admin
|
||||
reported_by = Column(Integer, ForeignKey("users.id"), nullable=True)
|
||||
reported_at = Column(TIMESTAMP, server_default=func.now())
|
||||
closure_type = Column(String(30)) # natural|remote_reset|false_alarm|other
|
||||
closure_note = Column(Text)
|
||||
closed_at = Column(TIMESTAMP)
|
||||
closed_by = Column(Integer, ForeignKey("users.id"), nullable=True)
|
||||
charger = relationship("Charger", back_populates="reports")
|
||||
photos = relationship("ReportPhoto", back_populates="report", cascade="all, delete-orphan")
|
||||
repair_links = relationship("RepairReport", back_populates="report")
|
||||
reporter = relationship("User", foreign_keys=[reported_by])
|
||||
closer = relationship("User", foreign_keys=[closed_by])
|
||||
|
||||
class ReportPhoto(Base):
|
||||
__tablename__ = "report_photos"
|
||||
|
||||
@@ -74,6 +74,12 @@ def export_reports(db: Session = Depends(get_db), _=Depends(require_admin)):
|
||||
ws.title = "AS신고목록"
|
||||
ws.freeze_panes = "A2"
|
||||
|
||||
CLOSURE_LABEL = {
|
||||
"natural": "증상자연소거",
|
||||
"remote_reset": "원격리셋후증상소거",
|
||||
"false_alarm": "인지오류",
|
||||
"other": "기타",
|
||||
}
|
||||
headers = [
|
||||
"접수번호","충전기ID","충전기종류","충전기명","충전소명","CPO명","설치일",
|
||||
"신고위치(위도)","신고위치(경도)","문제유형","에러코드","상세설명",
|
||||
@@ -81,12 +87,14 @@ def export_reports(db: Session = Depends(get_db), _=Depends(require_admin)):
|
||||
"담당정비사","정비사소속","조치유형","조치내용",
|
||||
"조치시작","조치완료","작업소요시간","신고→완료소요시간",
|
||||
"문제원인(관리자)","비고","출장비부담주체","출장비금액(원)","출장비상태",
|
||||
"처리담당자","처리일시","연결개선항목번호"
|
||||
"처리담당자","처리일시","연결개선항목번호",
|
||||
"상황종료사유","상황종료메모","상황종료일시","상황종료처리자"
|
||||
]
|
||||
style_header(ws, headers)
|
||||
|
||||
col_widths = [10,14,14,14,18,14,12,12,12,22,12,24,14,16,16,10,16,12,
|
||||
12,14,16,24,16,16,12,18,24,24,16,12,12,12,16,18]
|
||||
12,14,16,24,16,16,12,18,24,24,16,12,12,12,16,18,
|
||||
18,24,16,14]
|
||||
for i, w in enumerate(col_widths, 1):
|
||||
ws.column_dimensions[ws.cell(1, i).column_letter].width = w
|
||||
|
||||
@@ -136,6 +144,10 @@ def export_reports(db: Session = Depends(get_db), _=Depends(require_admin)):
|
||||
cost.reviewer.name if cost and cost.reviewer else "",
|
||||
fmt_dt(cost.reviewed_at) if cost else "",
|
||||
", ".join(str(i) for i in imp_ids) if imp_ids else "",
|
||||
CLOSURE_LABEL.get(r.closure_type, "") if r.closure_type else "",
|
||||
r.closure_note or "",
|
||||
fmt_dt(r.closed_at),
|
||||
r.closer.name if r.closer else "",
|
||||
]
|
||||
for col, val in enumerate(row_data, 1):
|
||||
ws.cell(row=row_num, column=col, value=val)
|
||||
|
||||
@@ -45,6 +45,10 @@ def _fmt_report(r: models.Report, db: Session):
|
||||
"repair_id": repair_id,
|
||||
"mechanic_name": mechanic_name,
|
||||
"mechanic_company": mechanic_company,
|
||||
"closure_type": r.closure_type,
|
||||
"closure_note": r.closure_note,
|
||||
"closed_at": r.closed_at.isoformat() if r.closed_at else None,
|
||||
"closed_by_name": r.closer.name if r.closer else None,
|
||||
}
|
||||
|
||||
@router.post("")
|
||||
@@ -321,6 +325,29 @@ def approve_report(report_id: int, db: Session = Depends(get_db), _=Depends(requ
|
||||
r.status = "pending"; db.commit()
|
||||
return {"ok": True}
|
||||
|
||||
CLOSURE_TYPES = {"natural", "remote_reset", "false_alarm", "other"}
|
||||
|
||||
@router.patch("/{report_id}/close")
|
||||
def close_report(
|
||||
report_id: int,
|
||||
closure_type: str = Form(...),
|
||||
closure_note: str = Form(""),
|
||||
db: Session = Depends(get_db),
|
||||
current_user: models.User = Depends(require_admin)
|
||||
):
|
||||
if closure_type not in CLOSURE_TYPES:
|
||||
raise HTTPException(400, "유효하지 않은 상황종료 사유입니다.")
|
||||
r = db.query(models.Report).filter_by(id=report_id).first()
|
||||
if not r: raise HTTPException(404)
|
||||
from datetime import datetime
|
||||
r.status = "closed"
|
||||
r.closure_type = closure_type
|
||||
r.closure_note = closure_note.strip() or None
|
||||
r.closed_at = datetime.now()
|
||||
r.closed_by = current_user.id
|
||||
db.commit()
|
||||
return {"ok": True}
|
||||
|
||||
@router.patch("/{report_id}/status")
|
||||
def update_status(report_id: int, status: str = Form(...),
|
||||
db: Session = Depends(get_db), _=Depends(require_admin)):
|
||||
|
||||
Reference in New Issue
Block a user