This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
// --- Create ---
|
||||
export interface CreateRfaDto {
|
||||
/** ID ของโครงการ */
|
||||
projectId: number;
|
||||
/** ID or UUID ของโครงการ */
|
||||
projectId: number | string; // ADR-019: Accept UUID
|
||||
|
||||
/** ประเภท RFA (เช่น DWG, MAT) */
|
||||
rfaTypeId: number;
|
||||
@@ -20,8 +20,11 @@ export interface CreateRfaDto {
|
||||
/** หมายเหตุ */
|
||||
remarks?: string;
|
||||
|
||||
/** Contract UUID (optional) */
|
||||
contractId?: string; // ADR-019: Contract UUID
|
||||
|
||||
/** ส่งถึงใคร (สำหรับ Routing Step 1) */
|
||||
toOrganizationId: number;
|
||||
toOrganizationId: number | string; // ADR-019: Accept UUID
|
||||
|
||||
/** รายละเอียดเพิ่มเติม */
|
||||
description?: string;
|
||||
@@ -41,8 +44,8 @@ export type UpdateRfaDto = Partial<CreateRfaDto>;
|
||||
|
||||
// --- Search ---
|
||||
export interface SearchRfaDto {
|
||||
/** Filter by Project ID (optional to allow cross-project search) */
|
||||
projectId?: number;
|
||||
/** Filter by Project ID or UUID (optional to allow cross-project search) */
|
||||
projectId?: number | string; // ADR-019: Accept UUID
|
||||
|
||||
/** กรองตามประเภท RFA */
|
||||
rfaTypeId?: number;
|
||||
|
||||
@@ -9,12 +9,12 @@ export enum TransmittalPurpose {
|
||||
|
||||
// --- Create ---
|
||||
export interface CreateTransmittalDto {
|
||||
projectId?: number;
|
||||
recipientOrganizationId?: number;
|
||||
projectId?: number | string; // ADR-019: Accept UUID
|
||||
recipientOrganizationId?: number | string; // ADR-019: Accept UUID
|
||||
subject: string;
|
||||
purpose?: string;
|
||||
remarks?: string;
|
||||
correspondenceId: number; // For now linked correspondence
|
||||
correspondenceId: number | string; // ADR-019: Accept UUID
|
||||
items: CreateTransmittalItemDto[];
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ export type UpdateTransmittalDto = Partial<CreateTransmittalDto>;
|
||||
// --- Search ---
|
||||
export interface SearchTransmittalDto {
|
||||
/** บังคับระบุ Project */
|
||||
projectId: number;
|
||||
projectId: number | string; // ADR-019: Accept UUID
|
||||
|
||||
purpose?: TransmittalPurpose;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ export interface CreateUserDto {
|
||||
firstName?: string;
|
||||
lastName?: string;
|
||||
lineId?: string;
|
||||
primaryOrganizationId?: number;
|
||||
primaryOrganizationId?: number | string; // ADR-019: Accept UUID
|
||||
isActive?: boolean;
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,9 @@ export interface RFA {
|
||||
}
|
||||
|
||||
export interface CreateRFADto {
|
||||
projectId: number;
|
||||
projectId: number | string; // ADR-019: Accept UUID
|
||||
contractId?: string; // ADR-019: Contract UUID
|
||||
toOrganizationId?: number | string; // ADR-019: Recipient org UUID
|
||||
rfaTypeId: number;
|
||||
disciplineId?: number;
|
||||
subject: string;
|
||||
|
||||
@@ -20,7 +20,7 @@ export interface User {
|
||||
lastName: string;
|
||||
isActive: boolean;
|
||||
lineId?: string;
|
||||
primaryOrganizationId?: number;
|
||||
primaryOrganizationId?: number | string; // ADR-019: May be INT or UUID
|
||||
organization?: UserOrganization;
|
||||
roles?: Role[];
|
||||
|
||||
@@ -42,7 +42,7 @@ export interface CreateUserDto {
|
||||
password?: string;
|
||||
isActive: boolean;
|
||||
lineId?: string;
|
||||
primaryOrganizationId?: number;
|
||||
primaryOrganizationId?: number | string; // ADR-019: Accept UUID
|
||||
roleIds: number[];
|
||||
}
|
||||
|
||||
@@ -53,5 +53,5 @@ export interface SearchUserDto {
|
||||
limit?: number;
|
||||
search?: string;
|
||||
roleId?: number;
|
||||
primaryOrganizationId?: number;
|
||||
primaryOrganizationId?: number | string; // ADR-019: Accept UUID
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user