251225:1703 On going update to 1.7.0: Refoctory drawing Module not finish

backend/src/modules/document-numbering/controllers/document-numbering.controller.ts

@@ -90,8 +90,8 @@ export class DocumentNumberingController {
   async previewNumber(@Body() dto: PreviewNumberDto) {
     return this.numberingService.previewNumber({
       projectId: dto.projectId,
-      originatorOrganizationId: dto.originatorId,
-      typeId: dto.typeId,
+      originatorOrganizationId: dto.originatorOrganizationId,
+      typeId: dto.correspondenceTypeId,
       subTypeId: dto.subTypeId,
       rfaTypeId: dto.rfaTypeId,
       disciplineId: dto.disciplineId,

backend/src/modules/document-numbering/dto/preview-number.dto.ts

@@ -12,12 +12,12 @@ export class PreviewNumberDto {
   @ApiProperty({ description: 'Originator organization ID' })
   @IsInt()
   @Type(() => Number)
-  originatorId!: number;
+  originatorOrganizationId!: number;
 
   @ApiProperty({ description: 'Correspondence type ID' })
   @IsInt()
   @Type(() => Number)
-  typeId!: number;
+  correspondenceTypeId!: number;
 
   @ApiPropertyOptional({ description: 'Sub type ID (for TRANSMITTAL)' })
   @IsOptional()

backend/src/modules/document-numbering/services/format.service.ts

@@ -108,8 +108,8 @@ export class FormatService {
       '{ORG}': orgCode,
       '{RECIPIENT}': recipientCode,
       '{DISCIPLINE}': disciplineCode,
-      '{YEAR}': year.toString().substring(2),
-      '{YEAR:BE}': (year + 543).toString().substring(2),
+      '{YEAR}': year.toString(),
+      '{YEAR:BE}': (year + 543).toString(),
       '{REV}': '0',
     };
   }