เพิ่มวันที่แก้ไข

This commit is contained in:
kittapath 2024-08-30 21:02:14 +07:00
parent 218886b3f4
commit ad4efc2b47
28 changed files with 205 additions and 40 deletions

View file

@ -143,6 +143,8 @@ export class PositionController extends Controller {
posDict.createdFullName = request.user.name;
posDict.lastUpdateUserId = request.user.sub;
posDict.lastUpdateFullName = request.user.name;
posDict.createdAt = new Date();
posDict.lastUpdatedAt = new Date();
await this.posDictRepository.save(posDict);
return new HttpSuccess(posDict.id);
}
@ -222,6 +224,8 @@ export class PositionController extends Controller {
posExecutive.createdFullName = request.user.name;
posExecutive.lastUpdateUserId = request.user.sub;
posExecutive.lastUpdateFullName = request.user.name;
posExecutive.createdAt = new Date();
posExecutive.lastUpdatedAt = new Date();
await this.posExecutiveRepository.save(posExecutive);
}
@ -246,6 +250,8 @@ export class PositionController extends Controller {
posDict.createdFullName = request.user.name;
posDict.lastUpdateUserId = request.user.sub;
posDict.lastUpdateFullName = request.user.name;
posDict.createdAt = new Date();
posDict.lastUpdatedAt = new Date();
await this.posDictRepository.save(posDict);
return new HttpSuccess(posDict.id);
}
@ -331,18 +337,19 @@ export class PositionController extends Controller {
Object.assign(posDict, requestBody);
posDict.lastUpdateUserId = request.user.sub;
posDict.lastUpdateFullName = request.user.name;
(posDict.posDictName = requestBody.posDictName),
(posDict.posDictField = requestBody.posDictField),
(posDict.posTypeId = requestBody.posTypeId),
(posDict.posLevelId = requestBody.posLevelId),
(posDict.posExecutiveId = requestBody.posExecutiveId ? requestBody.posExecutiveId : null),
(posDict.posDictExecutiveField = requestBody.posDictExecutiveField
? requestBody.posDictExecutiveField
: ""),
(posDict.posDictArea = requestBody.posDictArea ? requestBody.posDictArea : ""),
(posDict.isSpecial = requestBody.isSpecial),
// this.posDictRepository.merge(posDict, requestBody);
await this.posDictRepository.save(posDict);
posDict.lastUpdatedAt = new Date();
posDict.posDictName = requestBody.posDictName;
posDict.posDictField = requestBody.posDictField;
posDict.posTypeId = requestBody.posTypeId;
posDict.posLevelId = requestBody.posLevelId;
posDict.posExecutiveId = requestBody.posExecutiveId ? requestBody.posExecutiveId : null;
posDict.posDictExecutiveField = requestBody.posDictExecutiveField
? requestBody.posDictExecutiveField
: "";
posDict.posDictArea = requestBody.posDictArea ? requestBody.posDictArea : "";
posDict.isSpecial = requestBody.isSpecial;
// this.posDictRepository.merge(posDict, requestBody);
await this.posDictRepository.save(posDict);
return new HttpSuccess();
}
@ -743,6 +750,8 @@ export class PositionController extends Controller {
posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdatedAt = new Date();
await this.posMasterRepository.save(posMaster);
await Promise.all(
requestBody.positions.map(async (x: any) => {
@ -761,6 +770,8 @@ export class PositionController extends Controller {
position.createdFullName = request.user.name;
position.lastUpdateUserId = request.user.sub;
position.lastUpdateFullName = request.user.name;
position.createdAt = new Date();
position.lastUpdatedAt = new Date();
await this.positionRepository.save(position);
}),
);
@ -948,6 +959,8 @@ export class PositionController extends Controller {
posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdatedAt = new Date();
await this.posMasterRepository.save(posMaster);
await this.positionRepository.delete({ posMasterId: posMaster.id });
@ -970,6 +983,8 @@ export class PositionController extends Controller {
position.createdFullName = request.user.name;
position.lastUpdateUserId = request.user.sub;
position.lastUpdateFullName = request.user.name;
position.createdAt = new Date();
position.lastUpdatedAt = new Date();
await this.positionRepository.save(position);
}),
);
@ -1407,7 +1422,10 @@ export class PositionController extends Controller {
*
*/
@Post("sort")
async Sort(@Body() requestBody: { id: string; type: number; sortId: string[] }, @Request() request: RequestWithUser) {
async Sort(
@Body() requestBody: { id: string; type: number; sortId: string[] },
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_ORG");
switch (requestBody.type) {
case 0: {
@ -2014,6 +2032,8 @@ export class PositionController extends Controller {
posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdatedAt = new Date();
await this.posMasterRepository.save(posMaster);
}
}),
@ -2476,7 +2496,7 @@ export class PositionController extends Controller {
@Post("profile")
async createHolder(
@Body() requestBody: { posMaster: string; position: string; profileId: string; isSit: boolean },
@Request() request: RequestWithUser
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_ORG");
const dataMaster = await this.posMasterRepository.findOne({
@ -2511,7 +2531,7 @@ export class PositionController extends Controller {
*/
@Post("profile/delete/{id}")
async deleteHolder(@Path() id: string, @Request() request: RequestWithUser) {
await new permission().PermissionDelete(request, "SYS_ORG");
await new permission().PermissionDelete(request, "SYS_ORG");
const dataMaster = await this.posMasterRepository.findOne({
where: { id: id },
relations: ["positions"],
@ -2540,8 +2560,11 @@ export class PositionController extends Controller {
*
*/
@Post("dna")
async dna(@Body() requestBody: { draftPositionId: string; publishPositionId: string }, @Request() request: RequestWithUser) {
await new permission().PermissionUpdate(request, "SYS_ORG");
async dna(
@Body() requestBody: { draftPositionId: string; publishPositionId: string },
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_ORG");
const findDraft = await this.orgRevisionRepository.findOne({
where: {
orgRevisionIsDraft: true,