แก้ วันที่ update
This commit is contained in:
parent
6d36c9b05f
commit
218886b3f4
83 changed files with 1671 additions and 3483 deletions
|
|
@ -2,7 +2,6 @@ import {
|
|||
Body,
|
||||
Controller,
|
||||
Delete,
|
||||
Example,
|
||||
Get,
|
||||
Patch,
|
||||
Path,
|
||||
|
|
@ -41,6 +40,7 @@ export class ProfileAbilityController extends Controller {
|
|||
}
|
||||
const getProfileAbilityId = await this.profileAbilityRepo.find({
|
||||
where: { profileId: profile.id },
|
||||
order: { createdAt: "ASC" },
|
||||
});
|
||||
if (!getProfileAbilityId) {
|
||||
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
|
|
@ -49,31 +49,12 @@ export class ProfileAbilityController extends Controller {
|
|||
}
|
||||
|
||||
@Get("{profileId}")
|
||||
@Example({
|
||||
status: 200,
|
||||
message: "สำเร็จ",
|
||||
result: [
|
||||
{
|
||||
id: "ad7d0955-7bcd-4ed0-911c-2edceba12579",
|
||||
createdAt: "2024-03-12T21:37:35.037Z",
|
||||
createdUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
|
||||
lastUpdatedAt: "2024-03-12T21:37:35.037Z",
|
||||
lastUpdateUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
|
||||
createdFullName: "test bar",
|
||||
lastUpdateFullName: "test bar",
|
||||
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
|
||||
remark: "ต้องส่งให้ทันก่อนวันที่ 15 มีนาคม",
|
||||
detail: "-",
|
||||
reference: "-",
|
||||
dateStart: "2024-03-13T04:36:06.000Z",
|
||||
dateEnd: "2024-03-13T04:36:06.000Z",
|
||||
field: "ความมั่นคง",
|
||||
},
|
||||
],
|
||||
})
|
||||
public async detailProfileAbility(@Path() profileId: string, @Request() req: RequestWithUser) {
|
||||
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
|
||||
const getProfileAbilityId = await this.profileAbilityRepo.findBy({ profileId });
|
||||
const getProfileAbilityId = await this.profileAbilityRepo.find({
|
||||
where: { profileId: profileId },
|
||||
order: { createdAt: "ASC" },
|
||||
});
|
||||
if (!getProfileAbilityId) {
|
||||
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
}
|
||||
|
|
@ -81,44 +62,6 @@ export class ProfileAbilityController extends Controller {
|
|||
}
|
||||
|
||||
@Get("history/{abilityId}")
|
||||
@Example({
|
||||
status: 200,
|
||||
message: "สำเร็จ",
|
||||
result: [
|
||||
{
|
||||
id: "1c92cd8a-e176-48af-ac00-c018fb4c9895",
|
||||
createdAt: "2024-03-12T21:38:56.342Z",
|
||||
createdUserId: "00000000-0000-0000-0000-000000000000",
|
||||
lastUpdatedAt: "2024-03-12T21:38:56.342Z",
|
||||
lastUpdateUserId: "00000000-0000-0000-0000-000000000000",
|
||||
createdFullName: "string",
|
||||
lastUpdateFullName: "test bar",
|
||||
remark: "ต้องส่งให้ทันก่อนวันที่ 15 มีนาคม",
|
||||
detail: "ด่วน",
|
||||
reference: "-",
|
||||
dateStart: "2024-03-13T04:36:06.000Z",
|
||||
dateEnd: "2024-03-13T04:36:06.000Z",
|
||||
field: "ความมั่นคง",
|
||||
profileAbilityId: "ad7d0955-7bcd-4ed0-911c-2edceba12579",
|
||||
},
|
||||
{
|
||||
id: "2fb95768-cb62-40a3-9540-5a561d640959",
|
||||
createdAt: "2024-03-12T21:39:06.094Z",
|
||||
createdUserId: "00000000-0000-0000-0000-000000000000",
|
||||
lastUpdatedAt: "2024-03-12T21:39:06.094Z",
|
||||
lastUpdateUserId: "00000000-0000-0000-0000-000000000000",
|
||||
createdFullName: "string",
|
||||
lastUpdateFullName: "test bar",
|
||||
remark: "ต้องส่งให้ทันก่อนวันที่ 15 มีนาคม",
|
||||
detail: "ด่วนมากสุด",
|
||||
reference: "-",
|
||||
dateStart: "2024-03-13T04:36:06.000Z",
|
||||
dateEnd: "2024-03-13T04:36:06.000Z",
|
||||
field: "ความมั่นคง",
|
||||
profileAbilityId: "ad7d0955-7bcd-4ed0-911c-2edceba12579",
|
||||
},
|
||||
],
|
||||
})
|
||||
public async getProfileAbilityHistory(
|
||||
@Path() abilityId: string,
|
||||
@Request() req: RequestWithUser,
|
||||
|
|
@ -130,8 +73,8 @@ export class ProfileAbilityController extends Controller {
|
|||
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
|
||||
}
|
||||
const record = await this.profileAbilityHistoryRepo.find({
|
||||
relations: ["histories"],
|
||||
where: { profileAbilityId: abilityId },
|
||||
order: { createdAt: "DESC" },
|
||||
});
|
||||
|
||||
if (!record) {
|
||||
|
|
@ -161,6 +104,8 @@ export class ProfileAbilityController extends Controller {
|
|||
createdFullName: req.user.name,
|
||||
lastUpdateUserId: req.user.sub,
|
||||
lastUpdateFullName: req.user.name,
|
||||
createdAt: new Date(),
|
||||
lastUpdatedAt: new Date(),
|
||||
};
|
||||
|
||||
Object.assign(data, { ...body, ...meta });
|
||||
|
|
@ -187,15 +132,18 @@ export class ProfileAbilityController extends Controller {
|
|||
const history = new ProfileAbilityHistory();
|
||||
|
||||
Object.assign(record, body);
|
||||
Object.assign(history, body);
|
||||
Object.assign(history, { ...body, id: undefined });
|
||||
|
||||
history.profileAbilityId = abilityId;
|
||||
record.lastUpdateUserId = req.user.sub;
|
||||
record.lastUpdateFullName = req.user.name;
|
||||
record.lastUpdatedAt = new Date();
|
||||
history.lastUpdateUserId = req.user.sub;
|
||||
history.lastUpdateFullName = req.user.name;
|
||||
history.createdUserId = req.user.sub;
|
||||
history.createdFullName = req.user.name;
|
||||
history.createdAt = new Date();
|
||||
history.lastUpdatedAt = new Date();
|
||||
|
||||
await Promise.all([
|
||||
this.profileAbilityRepo.save(record),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue