hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix OrgController

Browse source
This commit is contained in:
AdisakKanthawilang 2024-01-26 15:54:07 +07:00
parent 22324853db
commit e05d4f8d8e
10 changed files with 58 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/controllers/OrgChild2Controller.ts
View file

@ -64,20 +64,12 @@ export class OrgChild2Controller extends Controller {
}
if (orgChild1) {
orgChild2.orgChild2Name = requestBody.orgChild2Name;
orgChild2.orgChild2ShortName = requestBody.orgChild2ShortName;
orgChild2.orgChild2Code = requestBody.orgChild2Code;
// orgChild2.orgChild2Order = requestBody.orgChild2Order;
orgChild2.orgChild2PhoneEx = requestBody.orgChild2PhoneEx;
orgChild2.orgChild2PhoneIn = requestBody.orgChild2PhoneIn;
orgChild2.orgChild2Fax = requestBody.orgChild2Fax;
orgChild2.orgChild2IsNormal = requestBody.orgChild2IsNormal;
orgChild2.orgRootId = orgChild1.orgRootId;
orgChild2.orgChild1Id = orgChild1.id;
orgChild2.createdUserId = request.user.sub;
orgChild2.createdFullName = request.user.name;
orgChild2.createdAt = new Date();
orgChild2.lastUpdateUserId = request.user.sub;
orgChild2.lastUpdateFullName = request.user.name;
orgChild2.lastUpdatedAt = new Date();
await this.orgChild2Repository.save(orgChild2);
} else {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลไอดีโครงสร้างระดับ1");
@ -126,16 +118,9 @@ export class OrgChild2Controller extends Controller {
}
if (orgChild1) {
orgChild2.orgChild2Name = requestBody.orgChild2Name;
orgChild2.orgChild2ShortName = requestBody.orgChild2ShortName;
orgChild2.orgChild2Code = requestBody.orgChild2Code;
// orgChild2.orgChild2Order = requestBody.orgChild2Order;
orgChild2.orgChild2PhoneEx = requestBody.orgChild2PhoneEx;
orgChild2.orgChild2PhoneIn = requestBody.orgChild2PhoneIn;
orgChild2.orgChild2Fax = requestBody.orgChild2Fax;
orgChild2.orgChild2IsNormal = requestBody.orgChild2IsNormal;
orgChild2.lastUpdateUserId = request.user.sub;
orgChild2.lastUpdateFullName = request.user.name;
orgChild2.lastUpdatedAt = new Date();
await this.orgChild2Repository.save(orgChild2);
} else {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลไอดีโครงสร้างระดับ1");

4
src/controllers/OrgChild4Controller.ts
View file

@ -70,7 +70,7 @@ export class OrgChild4Controller extends Controller {
orgChild4.orgChild4PhoneEx = requestBody.orgChild4PhoneEx;
orgChild4.orgChild4PhoneIn = requestBody.orgChild4PhoneIn;
orgChild4.orgChild4Fax = requestBody.orgChild4Fax;
orgChild4.orgChild4IsNormal = requestBody.orgChild4IsNormal;
// orgChild4.orgChild4IsNormal = requestBody.orgChild4IsNormal;
orgChild4.orgRootId = orgChild3.orgRootId;
orgChild4.orgChild1Id = orgChild3.orgChild1Id;
orgChild4.orgChild2Id = orgChild3.orgChild2Id;
@ -134,7 +134,7 @@ export class OrgChild4Controller extends Controller {
orgChild4.orgChild4PhoneEx = requestBody.orgChild4PhoneEx;
orgChild4.orgChild4PhoneIn = requestBody.orgChild4PhoneIn;
orgChild4.orgChild4Fax = requestBody.orgChild4Fax;
orgChild4.orgChild4IsNormal = requestBody.orgChild4IsNormal;
// orgChild4.orgChild4IsNormal = requestBody.orgChild4IsNormal;
orgChild4.lastUpdateUserId = request.user.sub;
orgChild4.lastUpdateFullName = request.user.name;
await this.orgChild4Repository.save(orgChild4);

46
src/controllers/OrgRootController.ts
View file

@ -19,6 +19,7 @@ import HttpSuccess from "../interfaces/http-success";
import { CreateOrgChild1, OrgChild1 } from "../entities/OrgChild1";
import HttpError from "../interfaces/http-error";
import HttpStatusCode from "../interfaces/http-status";
import { OrgRevision } from "../entities/OrgRevision";
@Route("organization")
@Tags("OrgRoot")
@ -26,6 +27,7 @@ import HttpStatusCode from "../interfaces/http-status";
export class OrgRootController extends Controller {
private orgRootRepository = AppDataSource.getRepository(OrgRoot);
private orgChild1Repository = AppDataSource.getRepository(OrgChild1);
private orgRevisionRepository = AppDataSource.getRepository(OrgRevision);
/**
* สร้างโครงสร้างระดับ Root
@ -39,7 +41,6 @@ export class OrgRootController extends Controller {
orgRootName: "string", //ชื่อหน่วยงาน
orgRootShortName: "string", //อักษรย่อ
orgRootCode: "string", //รหัสหน่วยงาน
// orgRootOrder: "number", //ลำดับที่ของหน่วยงาน
orgRootPhoneEx: "string", //หมายเลขโทรศัพท์ที่ติดต่อจากภายนอก
orgRootPhoneIn: "string", //หมายเลขโทรศัพท์ที่ติดต่อจากภายใน
orgRootFax: "string", //หมายเลขโทรสาร
@ -53,6 +54,10 @@ export class OrgRootController extends Controller {
@Request() request: { user: Record<string, any> },
) {
try {
const orgRevision = await this.orgRevisionRepository.findOne({
where: { id: requestBody.orgRevisionId },
});
const orgRoot = Object.assign(new OrgRoot(), requestBody);
if (!orgRoot) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
@ -64,19 +69,17 @@ export class OrgRootController extends Controller {
if (chkCode != null) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว");
}
orgRoot.orgRootName = requestBody.orgRootName;
orgRoot.orgRootShortName = requestBody.orgRootShortName;
orgRoot.orgRootCode = requestBody.orgRootCode;
// orgRoot.orgRootOrder = requestBody.orgRootOrder;
orgRoot.orgRootPhoneEx = requestBody.orgRootPhoneEx;
orgRoot.orgRootPhoneIn = requestBody.orgRootPhoneIn;
orgRoot.orgRootFax = requestBody.orgRootFax;
orgRoot.orgRootIsNormal = requestBody.orgRootIsNormal;
orgRoot.createdUserId = request.user.sub;
orgRoot.createdFullName = request.user.name;
orgRoot.lastUpdateUserId = request.user.sub;
orgRoot.lastUpdateFullName = request.user.name;
await this.orgRootRepository.save(orgRoot);
if (orgRevision) {
orgRoot.createdUserId = request.user.sub;
orgRoot.createdFullName = request.user.name;
orgRoot.createdAt = new Date();
orgRoot.lastUpdateUserId = request.user.sub;
orgRoot.lastUpdateFullName = request.user.name;
orgRoot.lastUpdatedAt = new Date();
await this.orgRootRepository.save(orgRoot);
}else{
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลไอดี Revision");
}
return new HttpSuccess();
} catch (error) {
@ -97,7 +100,6 @@ export class OrgRootController extends Controller {
orgRootName: "string", //ชื่อหน่วยงาน
orgRootShortName: "string", //อักษรย่อ
orgRootCode: "string", //รหัสหน่วยงาน
// orgRootOrder: "number", //ลำดับที่ของหน่วยงาน
orgRootPhoneEx: "string", //หมายเลขโทรศัพท์ที่ติดต่อจากภายนอก
orgRootPhoneIn: "string", //หมายเลขโทรศัพท์ที่ติดต่อจากภายใน
orgRootFax: "string", //หมายเลขโทรสาร
@ -119,20 +121,14 @@ export class OrgRootController extends Controller {
const chkCode = await this.orgRootRepository.findOne({
where: { orgRootCode: requestBody.orgRootCode },
});
if (chkCode?.id != id && chkCode != null ) {
if (chkCode?.id != id && chkCode != null) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว");
}
orgRoot.orgRootName = requestBody.orgRootName;
orgRoot.orgRootShortName = requestBody.orgRootShortName;
orgRoot.orgRootCode = requestBody.orgRootCode;
// orgRoot.orgRootOrder = requestBody.orgRootOrder;
orgRoot.orgRootPhoneEx = requestBody.orgRootPhoneEx;
orgRoot.orgRootPhoneIn = requestBody.orgRootPhoneIn;
orgRoot.orgRootFax = requestBody.orgRootFax;
orgRoot.orgRootIsNormal = requestBody.orgRootIsNormal;
orgRoot.lastUpdateUserId = request.user.sub;
orgRoot.lastUpdateFullName = request.user.name;
orgRoot.lastUpdatedAt = new Date();
this.orgRootRepository.merge(orgRoot, requestBody);
await this.orgRootRepository.save(orgRoot);
return new HttpSuccess();