แก้ฟิวขอทุน
This commit is contained in:
Kittapath
parent
7e9aa4e0fa
commit
de746486d1
5 changed files with 451 additions and 410 deletions
|
|
@ -13,16 +13,15 @@ import {
|
|||
Query,
|
||||
} from "tsoa";
|
||||
import { AppDataSource } from "../database/data-source";
|
||||
import { Brackets, Not } from "typeorm";
|
||||
import { Brackets } from "typeorm";
|
||||
import HttpSuccess from "../interfaces/http-success";
|
||||
import HttpError from "../interfaces/http-error";
|
||||
import HttpStatusCode from "../interfaces/http-status";
|
||||
import { Development } from "../entities/Development";
|
||||
import {
|
||||
CreateDevelopmentHistory,
|
||||
DevelopmentHistory,
|
||||
UpdateDevelopmentHistory,
|
||||
} from "../entities/DevelopmentHistory";
|
||||
CreateDevelopmentScholarship,
|
||||
DevelopmentScholarship,
|
||||
UpdateDevelopmentScholarship,
|
||||
} from "../entities/DevelopmentScholarship";
|
||||
import { PosType } from "../entities/PosType";
|
||||
import { PosLevel } from "../entities/PosLevel";
|
||||
|
||||
|
|
@ -30,298 +29,223 @@ import { PosLevel } from "../entities/PosLevel";
|
|||
@Tags("DevelopmentScholarship")
|
||||
@Security("bearerAuth")
|
||||
export class DevelopmentScholarshipController extends Controller {
|
||||
private developmentHistoryRepository = AppDataSource.getRepository(DevelopmentHistory);
|
||||
private developmentRepository = AppDataSource.getRepository(Development);
|
||||
private developmentScholarshipRepository = AppDataSource.getRepository(DevelopmentScholarship);
|
||||
private posTypeRepository = AppDataSource.getRepository(PosType);
|
||||
private posLevelRepository = AppDataSource.getRepository(PosLevel);
|
||||
|
||||
// /**
|
||||
// * API เพิ่มประวัติการฝึกอบรม/ดูงาน
|
||||
// *
|
||||
// * @summary DEV_006 - เพิ่มประวัติการฝึกอบรม/ดูงาน#6
|
||||
// *
|
||||
// */
|
||||
// @Post()
|
||||
// async CreateDevelopmentHistory(
|
||||
// @Body() requestBody: CreateDevelopmentHistory,
|
||||
// @Request() request: { user: Record<string, any> },
|
||||
// ) {
|
||||
// const type = "OFFICER";
|
||||
// const chk_name = await this.developmentHistoryRepository.find({
|
||||
// where: {
|
||||
// citizenId: requestBody.citizenId,
|
||||
// developmentId: requestBody.developmentId,
|
||||
// type: type,
|
||||
// },
|
||||
// });
|
||||
// if (chk_name.length > 0) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ประวัติการฝึกอบรม/ดูงาน มีอยู่ในระบบแล้ว");
|
||||
// }
|
||||
/**
|
||||
* API เพิ่มทุนการศึกษา/ฝึกอบรม
|
||||
*
|
||||
* @summary DEV_011 - เพิ่มทุนการศึกษา/ฝึกอบรม#11
|
||||
*
|
||||
*/
|
||||
@Post()
|
||||
async CreateDevelopmentScholarship(
|
||||
@Body() requestBody: CreateDevelopmentScholarship,
|
||||
@Request() request: { user: Record<string, any> },
|
||||
) {
|
||||
if (requestBody.posTypeId != null) {
|
||||
const checkId = await this.posTypeRepository.findOne({
|
||||
where: { id: requestBody.posTypeId },
|
||||
});
|
||||
if (!checkId) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประเภทตำแหน่ง");
|
||||
}
|
||||
}
|
||||
if (requestBody.posLevelId != null) {
|
||||
const checkId = await this.posLevelRepository.findOne({
|
||||
where: { id: requestBody.posLevelId },
|
||||
});
|
||||
if (!checkId) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับตำแหน่ง");
|
||||
}
|
||||
}
|
||||
|
||||
// const checkId = await this.developmentRepository.findOne({
|
||||
// where: { id: requestBody.developmentId },
|
||||
// });
|
||||
// if (!checkId) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรม");
|
||||
// }
|
||||
// if (requestBody.posTypeId != null) {
|
||||
// const checkId = await this.posTypeRepository.findOne({
|
||||
// where: { id: requestBody.posTypeId },
|
||||
// });
|
||||
// if (!checkId) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประเภทตำแหน่ง");
|
||||
// }
|
||||
// }
|
||||
// if (requestBody.posLevelId != null) {
|
||||
// const checkId = await this.posLevelRepository.findOne({
|
||||
// where: { id: requestBody.posLevelId },
|
||||
// });
|
||||
// if (!checkId) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับตำแหน่ง");
|
||||
// }
|
||||
// }
|
||||
const development = Object.assign(new DevelopmentScholarship(), requestBody);
|
||||
development.createdUserId = request.user.sub;
|
||||
development.createdFullName = request.user.name;
|
||||
development.lastUpdateUserId = request.user.sub;
|
||||
development.lastUpdateFullName = request.user.name;
|
||||
await this.developmentScholarshipRepository.save(development);
|
||||
return new HttpSuccess(development.id);
|
||||
}
|
||||
|
||||
// const development = Object.assign(new DevelopmentHistory(), requestBody);
|
||||
// development.type = type;
|
||||
// development.createdUserId = request.user.sub;
|
||||
// development.createdFullName = request.user.name;
|
||||
// development.lastUpdateUserId = request.user.sub;
|
||||
// development.lastUpdateFullName = request.user.name;
|
||||
// await this.developmentHistoryRepository.save(development);
|
||||
// return new HttpSuccess(development.id);
|
||||
// }
|
||||
/**
|
||||
* API แก้ไขทุนการศึกษา/ฝึกอบรม
|
||||
*
|
||||
* @summary DEV_012 - แก้ไขทุนการศึกษา/ฝึกอบรม #12
|
||||
*
|
||||
* @param {string} id Id โครงการ
|
||||
*/
|
||||
@Put("{id}")
|
||||
async UpdateDevelopmentScholarship(
|
||||
@Path() id: string,
|
||||
@Body() requestBody: UpdateDevelopmentScholarship,
|
||||
@Request() request: { user: Record<string, any> },
|
||||
) {
|
||||
const development = await this.developmentScholarshipRepository.findOne({
|
||||
where: { id: id },
|
||||
});
|
||||
if (!development) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทุนการศึกษา/ฝึกอบรมนี้");
|
||||
}
|
||||
if (requestBody.posTypeId != null) {
|
||||
const checkId = await this.posTypeRepository.findOne({
|
||||
where: { id: requestBody.posTypeId },
|
||||
});
|
||||
if (!checkId) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประเภทตำแหน่ง");
|
||||
}
|
||||
}
|
||||
if (requestBody.posLevelId != null) {
|
||||
const checkId = await this.posLevelRepository.findOne({
|
||||
where: { id: requestBody.posLevelId },
|
||||
});
|
||||
if (!checkId) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับตำแหน่ง");
|
||||
}
|
||||
}
|
||||
Object.assign(development, requestBody);
|
||||
development.lastUpdateUserId = request.user.sub;
|
||||
development.lastUpdateFullName = request.user.name;
|
||||
await this.developmentScholarshipRepository.save(development);
|
||||
return new HttpSuccess(development.id);
|
||||
}
|
||||
|
||||
// /**
|
||||
// * API แก้ไขประวัติการฝึกอบรม/ดูงาน
|
||||
// *
|
||||
// * @summary DEV_007 - แก้ไขประวัติการฝึกอบรม/ดูงาน #7
|
||||
// *
|
||||
// * @param {string} id Id โครงการ
|
||||
// */
|
||||
// @Put("{id}")
|
||||
// async UpdateDevelopmentHistory(
|
||||
// @Path() id: string,
|
||||
// @Body() requestBody: UpdateDevelopmentHistory,
|
||||
// @Request() request: { user: Record<string, any> },
|
||||
// ) {
|
||||
// const type = "OFFICER";
|
||||
// const development = await this.developmentHistoryRepository.findOne({
|
||||
// where: { id: id, type: type },
|
||||
// });
|
||||
// if (!development) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้");
|
||||
// }
|
||||
// const chk_name = await this.developmentHistoryRepository.find({
|
||||
// where: {
|
||||
// citizenId: requestBody.citizenId,
|
||||
// developmentId: requestBody.developmentId,
|
||||
// type: type,
|
||||
// id: Not(id),
|
||||
// },
|
||||
// });
|
||||
// if (chk_name.length > 0) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ประวัติการฝึกอบรม/ดูงาน มีอยู่ในระบบแล้ว");
|
||||
// }
|
||||
// const checkId = await this.developmentRepository.findOne({
|
||||
// where: { id: requestBody.developmentId },
|
||||
// });
|
||||
// if (!checkId) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรม");
|
||||
// }
|
||||
// if (requestBody.posTypeId != null) {
|
||||
// const checkId = await this.posTypeRepository.findOne({
|
||||
// where: { id: requestBody.posTypeId },
|
||||
// });
|
||||
// if (!checkId) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประเภทตำแหน่ง");
|
||||
// }
|
||||
// }
|
||||
// if (requestBody.posLevelId != null) {
|
||||
// const checkId = await this.posLevelRepository.findOne({
|
||||
// where: { id: requestBody.posLevelId },
|
||||
// });
|
||||
// if (!checkId) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับตำแหน่ง");
|
||||
// }
|
||||
// }
|
||||
// Object.assign(development, requestBody);
|
||||
// development.type = type;
|
||||
// development.lastUpdateUserId = request.user.sub;
|
||||
// development.lastUpdateFullName = request.user.name;
|
||||
// await this.developmentHistoryRepository.save(development);
|
||||
// return new HttpSuccess(development.id);
|
||||
// }
|
||||
/**
|
||||
* API ลบทุนการศึกษา/ฝึกอบรม
|
||||
*
|
||||
* @summary DEV_013 - ลบทุนการศึกษา/ฝึกอบรม #13
|
||||
*
|
||||
* @param {string} id Id โครงการ
|
||||
*/
|
||||
@Delete("{id}")
|
||||
async DeleteDevelopmentScholarship(@Path() id: string) {
|
||||
const development = await this.developmentScholarshipRepository.findOne({
|
||||
where: { id: id },
|
||||
});
|
||||
if (!development) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทุนการศึกษา/ฝึกอบรมนี้");
|
||||
}
|
||||
|
||||
// /**
|
||||
// * API ลบประวัติการฝึกอบรม/ดูงาน
|
||||
// *
|
||||
// * @summary DEV_008 - ลบประวัติการฝึกอบรม/ดูงาน #8
|
||||
// *
|
||||
// * @param {string} id Id โครงการ
|
||||
// */
|
||||
// @Delete("{id}")
|
||||
// async DeleteDevelopmentHistory(@Path() id: string) {
|
||||
// const type = "OFFICER";
|
||||
// const development = await this.developmentHistoryRepository.findOne({
|
||||
// where: { id: id, type: type },
|
||||
// });
|
||||
// if (!development) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้");
|
||||
// }
|
||||
await this.developmentScholarshipRepository.remove(development);
|
||||
return new HttpSuccess();
|
||||
}
|
||||
|
||||
// await this.developmentHistoryRepository.remove(development);
|
||||
// return new HttpSuccess();
|
||||
// }
|
||||
/**
|
||||
* API รายการทุนการศึกษา/ฝึกอบรม
|
||||
*
|
||||
* @summary DEV_014 - รายการทุนการศึกษา/ฝึกอบรม #14
|
||||
*
|
||||
*/
|
||||
@Get()
|
||||
async GetDevelopmentScholarshipLists(
|
||||
@Query("page") page: number = 1,
|
||||
@Query("pageSize") pageSize: number = 10,
|
||||
@Query("keyword") keyword?: string,
|
||||
@Query("year") year?: number,
|
||||
) {
|
||||
const type = "OFFICER";
|
||||
const [development, total] = await AppDataSource.getRepository(DevelopmentScholarship)
|
||||
.createQueryBuilder("developmentScholarship")
|
||||
.leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
|
||||
.leftJoinAndSelect("developmentScholarship.posType", "posType")
|
||||
.andWhere(
|
||||
year != 0 && year != null && year != undefined
|
||||
? "developmentScholarship.scholarshipYear = :scholarshipYear"
|
||||
: "1=1",
|
||||
{ year: year },
|
||||
)
|
||||
.andWhere("developmentScholarship.type = :type", { type: type })
|
||||
.andWhere(
|
||||
new Brackets((qb) => {
|
||||
qb.where(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.prefix LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.firstName LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.lastName LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.position LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.position LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != "" ? "posType.posTypeName LIKE :keyword" : "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != "" ? "posLevel.posLevelName LIKE :keyword" : "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
);
|
||||
}),
|
||||
)
|
||||
.orderBy("developmentScholarship.createdAt", "DESC")
|
||||
.skip((page - 1) * pageSize)
|
||||
.take(pageSize)
|
||||
.getManyAndCount();
|
||||
const formattedData = development.map((item) => ({
|
||||
id: item.id,
|
||||
citizenId: item.citizenId,
|
||||
fullName: item.prefix + item.firstName + " " + item.lastName,
|
||||
position: item.position,
|
||||
posType: item.posType ? item.posType.posTypeName : null,
|
||||
posLevel: item.posLevel ? item.posLevel.posLevelName : null,
|
||||
posExecutive: item.posExecutive,
|
||||
}));
|
||||
|
||||
// /**
|
||||
// * API รายการประวัติการฝึกอบรม/ดูงาน
|
||||
// *
|
||||
// * @summary DEV_009 - รายการประวัติการฝึกอบรม/ดูงาน #9
|
||||
// *
|
||||
// */
|
||||
// @Get()
|
||||
// async GetDevelopmentHistoryLists(
|
||||
// @Query("page") page: number = 1,
|
||||
// @Query("pageSize") pageSize: number = 10,
|
||||
// @Query("keyword") keyword?: string,
|
||||
// @Query("year") year?: number,
|
||||
// ) {
|
||||
// const type = "OFFICER";
|
||||
// const [development, total] = await AppDataSource.getRepository(DevelopmentHistory)
|
||||
// .createQueryBuilder("developmentHistory")
|
||||
// .leftJoinAndSelect("developmentHistory.development", "development")
|
||||
// .leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
|
||||
// .leftJoinAndSelect("developmentHistory.posType", "posType")
|
||||
// .andWhere(year != 0 && year != null && year != undefined ? "development.year = :year" : "1=1", { year: year })
|
||||
// .andWhere("developmentHistory.type = :type", { type: type })
|
||||
// .andWhere(
|
||||
// new Brackets((qb) => {
|
||||
// qb.where(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "developmentHistory.prefix LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "developmentHistory.firstName LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "developmentHistory.lastName LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "developmentHistory.position LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "developmentHistory.position LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "development.projectName LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "posType.posTypeName LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// )
|
||||
// .orWhere(
|
||||
// keyword != null && keyword != ""
|
||||
// ? "posLevel.posLevelName LIKE :keyword"
|
||||
// : "1=1",
|
||||
// {
|
||||
// keyword: `%${keyword}%`,
|
||||
// },
|
||||
// );
|
||||
// }),
|
||||
// )
|
||||
// .orderBy("developmentHistory.createdAt", "DESC")
|
||||
// .skip((page - 1) * pageSize)
|
||||
// .take(pageSize)
|
||||
// .getManyAndCount();
|
||||
// const formattedData = development.map(item => ({
|
||||
// id: item.id,
|
||||
// citizenId: item.citizenId,
|
||||
// fullName: item.prefix+item.firstName+" "+item.lastName,
|
||||
// position: item.position,
|
||||
// posType: item.posType ? item.posType.posTypeName : null,
|
||||
// posLevel: item.posLevel ? item.posLevel.posLevelName : null,
|
||||
// posExecutive: item.posExecutive,
|
||||
// projectName: item.development.projectName,
|
||||
// }));
|
||||
return new HttpSuccess({ data: formattedData, total });
|
||||
}
|
||||
|
||||
// return new HttpSuccess({ data: formattedData, total });
|
||||
// }
|
||||
/**
|
||||
* API รายละเอียดทุนการศึกษา/ฝึกอบรม
|
||||
*
|
||||
* @summary DEV_015 - รายละเอียดทุนการศึกษา/ฝึกอบรม #15
|
||||
*
|
||||
* @param {string} id Id โครงการ
|
||||
*/
|
||||
@Get("{id}")
|
||||
async GetDevelopemtScholarshipById(@Path() id: string) {
|
||||
const getDevelopment = await this.developmentScholarshipRepository.findOne({
|
||||
where: { id: id },
|
||||
});
|
||||
if (!getDevelopment) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทุนการศึกษา/ฝึกอบรมนี้");
|
||||
}
|
||||
|
||||
// /**
|
||||
// * API รายละเอียดประวัติการฝึกอบรม/ดูงาน
|
||||
// *
|
||||
// * @summary DEV_010 - รายละเอียดประวัติการฝึกอบรม/ดูงาน #10
|
||||
// *
|
||||
// * @param {string} id Id โครงการ
|
||||
// */
|
||||
// @Get("{id}")
|
||||
// async GetDevelopemtHistoryById(@Path() id: string) {
|
||||
// const type = "OFFICER";
|
||||
// const getDevelopment = await this.developmentHistoryRepository.findOne({
|
||||
// relations: ["development"],
|
||||
// where: { id: id, type: type },
|
||||
// });
|
||||
// if (!getDevelopment) {
|
||||
// throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้");
|
||||
// }
|
||||
|
||||
// const formattedData = {
|
||||
// rank: getDevelopment.rank ? getDevelopment.rank : null,
|
||||
// prefix: getDevelopment.prefix ? getDevelopment.prefix : null,
|
||||
// firstName: getDevelopment.firstName ? getDevelopment.firstName : null,
|
||||
// lastName: getDevelopment.lastName ? getDevelopment.lastName : null,
|
||||
// citizenId: getDevelopment.citizenId ? getDevelopment.citizenId : null,
|
||||
// position: getDevelopment.position ? getDevelopment.position : null,
|
||||
// posLevelId: getDevelopment.posLevelId ? getDevelopment.posLevelId : null,
|
||||
// posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null,
|
||||
// developmentId: getDevelopment.developmentId ? getDevelopment.developmentId : null,
|
||||
// order: getDevelopment.order ? getDevelopment.order : null,
|
||||
// dateOrder: getDevelopment.dateOrder ? getDevelopment.dateOrder : null,
|
||||
// year: getDevelopment.development.year ? getDevelopment.development.year : null,
|
||||
// projectName: getDevelopment.development.projectName ? getDevelopment.development.projectName : null,
|
||||
// dateStart: getDevelopment.development.dateStart ? getDevelopment.development.dateStart : null,
|
||||
// dateEnd: getDevelopment.development.dateEnd ? getDevelopment.development.dateEnd : null,
|
||||
// totalDate: getDevelopment.development.totalDate ? getDevelopment.development.totalDate : null,
|
||||
// addressAcademic: getDevelopment.development.addressAcademic ? getDevelopment.development.addressAcademic : null,
|
||||
// topicAcademic: getDevelopment.development.topicAcademic ? getDevelopment.development.topicAcademic : null,
|
||||
// dateStudyStart: getDevelopment.development.dateStudyStart ? getDevelopment.development.dateStudyStart : null,
|
||||
// dateStudyEnd: getDevelopment.development.dateStudyEnd ? getDevelopment.development.dateStudyEnd : null,
|
||||
// org: null,
|
||||
// };
|
||||
|
||||
// return new HttpSuccess(formattedData);
|
||||
// }
|
||||
return new HttpSuccess(getDevelopment);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue