บันทึกลงทะเบียนประวัติ
This commit is contained in:
parent
166c919bbe
commit
b8e1c93cb4
3 changed files with 77 additions and 7 deletions
|
|
@ -24,6 +24,7 @@ import {
|
||||||
} from "../entities/DevelopmentScholarship";
|
} from "../entities/DevelopmentScholarship";
|
||||||
import { PosType } from "../entities/PosType";
|
import { PosType } from "../entities/PosType";
|
||||||
import { PosLevel } from "../entities/PosLevel";
|
import { PosLevel } from "../entities/PosLevel";
|
||||||
|
import CallAPI from "../interfaces/call-api";
|
||||||
|
|
||||||
@Route("api/v1/development/scholarship")
|
@Route("api/v1/development/scholarship")
|
||||||
@Tags("DevelopmentScholarship")
|
@Tags("DevelopmentScholarship")
|
||||||
|
|
@ -75,7 +76,7 @@ export class DevelopmentScholarshipController extends Controller {
|
||||||
*
|
*
|
||||||
* @summary DEV_012 - แก้ไขทุนการศึกษา/ฝึกอบรม #12
|
* @summary DEV_012 - แก้ไขทุนการศึกษา/ฝึกอบรม #12
|
||||||
*
|
*
|
||||||
* @param {string} id Id โครงการ
|
* @param {string} id Id ข้าราชการฯที่ได้รับทุนการศึกษา
|
||||||
*/
|
*/
|
||||||
@Put("{id}")
|
@Put("{id}")
|
||||||
async UpdateDevelopmentScholarship(
|
async UpdateDevelopmentScholarship(
|
||||||
|
|
@ -117,7 +118,7 @@ export class DevelopmentScholarshipController extends Controller {
|
||||||
*
|
*
|
||||||
* @summary DEV_013 - ลบทุนการศึกษา/ฝึกอบรม #13
|
* @summary DEV_013 - ลบทุนการศึกษา/ฝึกอบรม #13
|
||||||
*
|
*
|
||||||
* @param {string} id Id โครงการ
|
* @param {string} id Id ข้าราชการฯที่ได้รับทุนการศึกษา
|
||||||
*/
|
*/
|
||||||
@Delete("{id}")
|
@Delete("{id}")
|
||||||
async DeleteDevelopmentScholarship(@Path() id: string) {
|
async DeleteDevelopmentScholarship(@Path() id: string) {
|
||||||
|
|
@ -224,7 +225,7 @@ export class DevelopmentScholarshipController extends Controller {
|
||||||
*
|
*
|
||||||
* @summary DEV_015 - รายละเอียดทุนการศึกษา/ฝึกอบรม #15
|
* @summary DEV_015 - รายละเอียดทุนการศึกษา/ฝึกอบรม #15
|
||||||
*
|
*
|
||||||
* @param {string} id Id โครงการ
|
* @param {string} id Id ข้าราชการฯที่ได้รับทุนการศึกษา
|
||||||
*/
|
*/
|
||||||
@Get("{id}")
|
@Get("{id}")
|
||||||
async GetDevelopemtScholarshipById(@Path() id: string) {
|
async GetDevelopemtScholarshipById(@Path() id: string) {
|
||||||
|
|
@ -321,11 +322,15 @@ export class DevelopmentScholarshipController extends Controller {
|
||||||
*
|
*
|
||||||
* @summary DEV_0 - เปลี่ยนสถานะ #
|
* @summary DEV_0 - เปลี่ยนสถานะ #
|
||||||
*
|
*
|
||||||
* @param {string} id Id โครงการ
|
* @param {string} id Id ข้าราชการฯที่ได้รับทุนการศึกษา
|
||||||
* @param {string} status status สถานะ
|
* @param {string} status status สถานะ
|
||||||
*/
|
*/
|
||||||
@Get("status/{id}/{status}")
|
@Get("status/{id}/{status}")
|
||||||
async ChangeStatusDevelopemtScholarshipById(@Path() id: string, @Path() status: string) {
|
async ChangeStatusDevelopemtScholarshipById(
|
||||||
|
@Path() id: string,
|
||||||
|
@Path() status: string,
|
||||||
|
@Request() request: { user: Record<string, any> },
|
||||||
|
) {
|
||||||
const getDevelopment = await this.developmentScholarshipRepository.findOne({
|
const getDevelopment = await this.developmentScholarshipRepository.findOne({
|
||||||
where: { id: id },
|
where: { id: id },
|
||||||
});
|
});
|
||||||
|
|
@ -335,12 +340,53 @@ export class DevelopmentScholarshipController extends Controller {
|
||||||
const _status = status.trim().toUpperCase();
|
const _status = status.trim().toUpperCase();
|
||||||
getDevelopment.status = _status;
|
getDevelopment.status = _status;
|
||||||
if (_status == "GRADUATE") {
|
if (_status == "GRADUATE") {
|
||||||
//xxxxxxxxxxxxxxxxxxxบันทึกลงทะเบียน
|
if (getDevelopment.scholarshipType != null) {
|
||||||
|
switch (getDevelopment.scholarshipType.trim().toUpperCase()) {
|
||||||
|
case "DOMESTICE":
|
||||||
|
getDevelopment.scholarshipType = "การศึกษาในประเทศ";
|
||||||
|
break;
|
||||||
|
case "NOABROAD":
|
||||||
|
getDevelopment.scholarshipType =
|
||||||
|
"ฝึกอบรมในประเทศที่ส่งไปพัฒนากับหน่วยวงานภายนอก (หลักสูตรที่ไม่มีการไปต่างประเทศ)";
|
||||||
|
break;
|
||||||
|
case "ABROAD":
|
||||||
|
getDevelopment.scholarshipType =
|
||||||
|
"ฝึกอบรมในประเทศที่ส่งไปพัฒนากับหน่วยวงานภายนอก (หลักสูตรที่มีการไปต่างประเทศ)";
|
||||||
|
break;
|
||||||
|
case "EXECUTIVE":
|
||||||
|
getDevelopment.scholarshipType =
|
||||||
|
"ฝึกอบรมในประเทศที่ส่งไปพัฒนากับหน่วยวงานภายนอก (หลักสูตรประเภทนักบริหาร)";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let profileEdu = await new CallAPI().PostData(request, "org/profile/educations", {
|
||||||
|
profileId: getDevelopment.profileId,
|
||||||
|
institute: getDevelopment.educationalInstitution,
|
||||||
|
startDate: getDevelopment.startDate,
|
||||||
|
endDate: getDevelopment.endDate,
|
||||||
|
finishDate: null,
|
||||||
|
isEducation: false,
|
||||||
|
degree: null,
|
||||||
|
field: getDevelopment.field,
|
||||||
|
fundName: getDevelopment.scholarshipType,
|
||||||
|
gpa: null,
|
||||||
|
country: getDevelopment.studyCountry,
|
||||||
|
other: null,
|
||||||
|
duration: getDevelopment.totalPeriod,
|
||||||
|
durationYear: 0,
|
||||||
|
note: null,
|
||||||
|
educationLevel: getDevelopment.degreeLevel,
|
||||||
|
educationLevelId: null,
|
||||||
|
isDate: false,
|
||||||
|
positionPath: null,
|
||||||
|
positionPathId: null,
|
||||||
|
});
|
||||||
} else if (_status == "NOTGRADUATE") {
|
} else if (_status == "NOTGRADUATE") {
|
||||||
} else {
|
} else {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบสถานะนี้ในระบบ");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบสถานะนี้ในระบบ");
|
||||||
}
|
}
|
||||||
await this.developmentScholarshipRepository.remove(getDevelopment);
|
|
||||||
|
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,14 @@ import { PosType } from "./PosType";
|
||||||
|
|
||||||
@Entity("developmentScholarship")
|
@Entity("developmentScholarship")
|
||||||
export class DevelopmentScholarship extends EntityBase {
|
export class DevelopmentScholarship extends EntityBase {
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "id profile",
|
||||||
|
length: 40,
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
profileId: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
// PENDING = ค่าเริ่มต้น
|
// PENDING = ค่าเริ่มต้น
|
||||||
// GRADUATE = สำเร็จการศึกษา
|
// GRADUATE = สำเร็จการศึกษา
|
||||||
|
|
@ -423,6 +431,7 @@ export class DevelopmentScholarship extends EntityBase {
|
||||||
totalPeriod: string;
|
totalPeriod: string;
|
||||||
}
|
}
|
||||||
export class CreateDevelopmentScholarship {
|
export class CreateDevelopmentScholarship {
|
||||||
|
profileId: string | null;
|
||||||
rank?: string | null;
|
rank?: string | null;
|
||||||
prefix: string | null;
|
prefix: string | null;
|
||||||
firstName: string | null;
|
firstName: string | null;
|
||||||
|
|
@ -475,6 +484,7 @@ export class CreateDevelopmentScholarship {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UpdateDevelopmentScholarship {
|
export class UpdateDevelopmentScholarship {
|
||||||
|
profileId: string | null;
|
||||||
rank?: string | null;
|
rank?: string | null;
|
||||||
prefix: string | null;
|
prefix: string | null;
|
||||||
firstName: string | null;
|
firstName: string | null;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||||
|
|
||||||
|
export class UpdateTableScholarshipAddProfileId1712721970803 implements MigrationInterface {
|
||||||
|
name = 'UpdateTableScholarshipAddProfileId1712721970803'
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`developmentScholarship\` ADD \`profileId\` varchar(40) NULL COMMENT 'id profile'`);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`developmentScholarship\` DROP COLUMN \`profileId\``);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue