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

update "place" insert (#21)

Browse source
This commit is contained in:
AdisakKanthawilang 2025-10-14 17:59:46 +07:00 • committed by GitHub
parent cd8611d9b6
commit b3c35e6441
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/DevelopmentController.ts
View file

@ -2629,6 +2629,18 @@ export class DevelopmentController extends Controller {
where: { developmentId: id, isDone: false }, where: { developmentId: id, isDone: false },
relations: ["development"], relations: ["development"],
}); });
const developmentAddresss = await this.developmentAddresssRepository.find({
where: { developmentId: id}
})
const places = developmentAddresss
.map(addr =>
`- ${addr.address}, ${addr.addressType === "IN_COUNTRY" ? addr.provinceName : addr.country} (${addr.addressType === "IN_COUNTRY" ? "ภายในประเทศ" : "ภายนอกประเทศ"})`
)
.filter(Boolean)
.join("\n");
await Promise.all( await Promise.all(
getDevelopment.map(async (x) => { getDevelopment.map(async (x) => {
const _data = Object.assign(new DevelopmentHistory(), x); const _data = Object.assign(new DevelopmentHistory(), x);
@ -2639,7 +2651,7 @@ export class DevelopmentController extends Controller {
name: x.development == null ? null : x.development.projectName, name: x.development == null ? null : x.development.projectName,
topic: x.development == null ? null : x.development.topicAcademic, topic: x.development == null ? null : x.development.topicAcademic,
yearly: x.development == null ? null : x.development.year, yearly: x.development == null ? null : x.development.year,
place: x.development == null ? null : x.development.addressAcademic, place: places == null ? null : places,
duration: x.trainingDays, duration: x.trainingDays,
department: x.development == null ? null : x.development.root, department: x.development == null ? null : x.development.root,
numberOrder: x.order, numberOrder: x.order,
@ -2662,7 +2674,7 @@ export class DevelopmentController extends Controller {
name: x.development == null ? null : x.development.projectName, name: x.development == null ? null : x.development.projectName,
topic: x.development == null ? null : x.development.topicAcademic, topic: x.development == null ? null : x.development.topicAcademic,
yearly: x.development == null ? null : x.development.year, yearly: x.development == null ? null : x.development.year,
place: x.development == null ? null : x.development.addressAcademic, place: places == null ? null : places,
duration: x.trainingDays, duration: x.trainingDays,
department: x.development == null ? null : x.development.root, department: x.development == null ? null : x.development.root,
numberOrder: x.order, numberOrder: x.order,