update sort date

This commit is contained in:
mamoss 2025-05-13 13:56:01 +07:00
parent 0266dab4ac
commit c1e7ee2542
4 changed files with 32 additions and 28 deletions

View file

@ -309,6 +309,7 @@ export class InsigniaController extends Controller {
}); });
const sortLevel = insignia.map((data) => ({ const sortLevel = insignia.map((data) => ({
...data,
id: data.id, id: data.id,
level: requestBody.id.indexOf(data.id) + 1, level: requestBody.id.indexOf(data.id) + 1,
})); }));

View file

@ -12,7 +12,7 @@ import {
Patch, Patch,
Put, Put,
} from "tsoa"; } from "tsoa";
import { Not } from "typeorm" import { Not } from "typeorm";
import HttpSuccess from "../interfaces/http-success"; import HttpSuccess from "../interfaces/http-success";
import HttpError from "../interfaces/http-error"; import HttpError from "../interfaces/http-error";
import HttpStatus from "../interfaces/http-status"; import HttpStatus from "../interfaces/http-status";
@ -119,14 +119,14 @@ export class ProfileEducationsController extends Controller {
await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", profile.id); await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", profile.id);
if (body.isEducation) { if (body.isEducation) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileId: body.profileId, isEducation: true }, { profileId: body.profileId, isEducation: true },
{ isEducation: false } { isEducation: false },
); );
} }
if (body.isHigh) { if (body.isHigh) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileId: body.profileId, isHigh: true }, { profileId: body.profileId, isHigh: true },
{ isHigh: false } { isHigh: false },
); );
} }
const before = null; const before = null;
@ -170,14 +170,14 @@ export class ProfileEducationsController extends Controller {
await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", record.profileId); await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", record.profileId);
if (body.isEducation) { if (body.isEducation) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileId: record.profileId, isEducation: true, id: Not(educationId) }, { profileId: record.profileId, isEducation: true, id: Not(educationId) },
{ isEducation: false } { isEducation: false },
); );
} }
if (body.isHigh) { if (body.isHigh) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileId: record.profileId, isHigh: true, id: Not(educationId) }, { profileId: record.profileId, isHigh: true, id: Not(educationId) },
{ isHigh: false } { isHigh: false },
); );
} }
const before = structuredClone(record); const before = structuredClone(record);
@ -265,6 +265,7 @@ export class ProfileEducationsController extends Controller {
}); });
const sortLevel = education.map((data) => ({ const sortLevel = education.map((data) => ({
...data,
id: data.id, id: data.id,
level: requestBody.data.findIndex((x) => x.id == data.id) + 1, level: requestBody.data.findIndex((x) => x.id == data.id) + 1,
isUse: requestBody.data.find((x) => x.id == data.id)?.isUse ?? false, isUse: requestBody.data.find((x) => x.id == data.id)?.isUse ?? false,

View file

@ -12,7 +12,7 @@ import {
Patch, Patch,
Put, Put,
} from "tsoa"; } from "tsoa";
import { Not } from "typeorm" import { Not } from "typeorm";
import HttpSuccess from "../interfaces/http-success"; import HttpSuccess from "../interfaces/http-success";
import HttpError from "../interfaces/http-error"; import HttpError from "../interfaces/http-error";
import HttpStatus from "../interfaces/http-status"; import HttpStatus from "../interfaces/http-status";
@ -127,14 +127,14 @@ export class ProfileEducationsEmployeeController extends Controller {
await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_EMP", profile.id); await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_EMP", profile.id);
if (body.isEducation) { if (body.isEducation) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: body.profileEmployeeId, isEducation: true }, { profileEmployeeId: body.profileEmployeeId, isEducation: true },
{ isEducation: false } { isEducation: false },
); );
} }
if (body.isHigh) { if (body.isHigh) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: body.profileEmployeeId, isHigh: true }, { profileEmployeeId: body.profileEmployeeId, isHigh: true },
{ isHigh: false } { isHigh: false },
); );
} }
const before = null; const before = null;
@ -182,14 +182,14 @@ export class ProfileEducationsEmployeeController extends Controller {
); );
if (body.isEducation) { if (body.isEducation) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: record.profileEmployeeId, isEducation: true, id: Not(educationId) }, { profileEmployeeId: record.profileEmployeeId, isEducation: true, id: Not(educationId) },
{ isEducation: false } { isEducation: false },
); );
} }
if (body.isHigh) { if (body.isHigh) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: record.profileEmployeeId, isHigh: true, id: Not(educationId) }, { profileEmployeeId: record.profileEmployeeId, isHigh: true, id: Not(educationId) },
{ isHigh: false } { isHigh: false },
); );
} }
const before = structuredClone(record); const before = structuredClone(record);
@ -283,6 +283,7 @@ export class ProfileEducationsEmployeeController extends Controller {
}); });
const sortLevel = education.map((data) => ({ const sortLevel = education.map((data) => ({
...data,
id: data.id, id: data.id,
level: requestBody.data.findIndex((x) => x.id == data.id) + 1, level: requestBody.data.findIndex((x) => x.id == data.id) + 1,
isUse: requestBody.data.find((x) => x.id == data.id)?.isUse ?? false, isUse: requestBody.data.find((x) => x.id == data.id)?.isUse ?? false,

View file

@ -12,7 +12,7 @@ import {
Patch, Patch,
Put, Put,
} from "tsoa"; } from "tsoa";
import { Not } from "typeorm" import { Not } from "typeorm";
import HttpSuccess from "../interfaces/http-success"; import HttpSuccess from "../interfaces/http-success";
import HttpError from "../interfaces/http-error"; import HttpError from "../interfaces/http-error";
import HttpStatus from "../interfaces/http-status"; import HttpStatus from "../interfaces/http-status";
@ -117,18 +117,18 @@ export class ProfileEducationsEmployeeTempController extends Controller {
} }
if (body.isEducation) { if (body.isEducation) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: body.profileEmployeeId, isEducation: true }, { profileEmployeeId: body.profileEmployeeId, isEducation: true },
{ isEducation: false } { isEducation: false },
); );
} }
if (body.isHigh) { if (body.isHigh) {
const existing = await this.profileEducationRepo.find({ const existing = await this.profileEducationRepo.find({
where: { profileId: body.profileEmployeeId, isHigh: true }, where: { profileId: body.profileEmployeeId, isHigh: true },
}); });
console.log("isHigh ",existing) console.log("isHigh ", existing);
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: body.profileEmployeeId, isHigh: true }, { profileEmployeeId: body.profileEmployeeId, isHigh: true },
{ isHigh: false } { isHigh: false },
); );
} }
const before = null; const before = null;
@ -172,14 +172,14 @@ export class ProfileEducationsEmployeeTempController extends Controller {
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
if (body.isEducation) { if (body.isEducation) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: record.profileEmployeeId, isEducation: true, id: Not(educationId) }, { profileEmployeeId: record.profileEmployeeId, isEducation: true, id: Not(educationId) },
{ isEducation: false } { isEducation: false },
); );
} }
if (body.isHigh) { if (body.isHigh) {
await this.profileEducationRepo.update( await this.profileEducationRepo.update(
{ profileEmployeeId: record.profileEmployeeId, isHigh: true, id: Not(educationId) }, { profileEmployeeId: record.profileEmployeeId, isHigh: true, id: Not(educationId) },
{ isHigh: false } { isHigh: false },
); );
} }
const before = structuredClone(record); const before = structuredClone(record);
@ -266,6 +266,7 @@ export class ProfileEducationsEmployeeTempController extends Controller {
}); });
const sortLevel = education.map((data) => ({ const sortLevel = education.map((data) => ({
...data,
id: data.id, id: data.id,
level: requestBody.data.findIndex((x) => x.id == data.id) + 1, level: requestBody.data.findIndex((x) => x.id == data.id) + 1,
isUse: requestBody.data.find((x) => x.id == data.id)?.isUse ?? false, isUse: requestBody.data.find((x) => x.id == data.id)?.isUse ?? false,