แก้ import data ไมพบข้อมูลในทะเบียนประวัติ
This commit is contained in:
parent
8c39019f4a
commit
78ce7fa612
2 changed files with 92 additions and 6 deletions
|
|
@ -36,10 +36,7 @@ import { Province } from "../entities/Province";
|
|||
import { PosType } from "../entities/PosType";
|
||||
import { PosLevel } from "../entities/PosLevel";
|
||||
import { PlannedGoalPosition } from "../entities/PlannedGoalPosition";
|
||||
import {
|
||||
CreateDevelopmentHistoryOBO,
|
||||
DevelopmentHistory,
|
||||
} from "../entities/DevelopmentHistory";
|
||||
import { CreateDevelopmentHistoryOBO, DevelopmentHistory } from "../entities/DevelopmentHistory";
|
||||
import { DevelopmentProjectType } from "../entities/DevelopmentProjectType";
|
||||
import {
|
||||
CreateDevelopmentEvaluation,
|
||||
|
|
@ -2544,7 +2541,7 @@ export class DevelopmentController extends Controller {
|
|||
return;
|
||||
}
|
||||
if (item["ประเภท"] == undefined) return;
|
||||
if (item["ประเภท"] == "ข้าราชการกรุงเทพมหานครสามัญ") {
|
||||
if (item["ประเภท"] == "ข้าราชการกรุงเทพมหานครสามัญ" || item["ประเภท"] == "ขรก.กทม. สามัญ") {
|
||||
await new CallAPI()
|
||||
.GetData(request, `/org/unauthorize/officer/citizen/${item["รหัสประจำตัวประชาชน"]}`)
|
||||
.then(async (x: any) => {
|
||||
|
|
@ -2628,7 +2625,7 @@ export class DevelopmentController extends Controller {
|
|||
await this.developmentHistoryRepository.save(development, { data: request });
|
||||
setLogDataDiff(request, { before, after: development });
|
||||
});
|
||||
} else {
|
||||
} else if (item["ประเภท"] == "ลูกจ้างประจำ") {
|
||||
await new CallAPI()
|
||||
.GetData(request, `/org/unauthorize/employee/citizen/${item["รหัสประจำตัวประชาชน"]}`)
|
||||
.then(async (x: any) => {
|
||||
|
|
@ -2712,6 +2709,49 @@ export class DevelopmentController extends Controller {
|
|||
await this.developmentHistoryRepository.save(development, { data: request });
|
||||
setLogDataDiff(request, { before, after: development });
|
||||
});
|
||||
} else {
|
||||
let development = new DevelopmentHistory();
|
||||
let _null: any = null;
|
||||
development.prefix = item["คำนำหน้า"] == undefined ? null : item["คำนำหน้า"];
|
||||
development.firstName = item["ชื่อ"] == undefined ? null : item["ชื่อ"];
|
||||
development.lastName = item["นามสกุล"] == undefined ? null : item["นามสกุล"];
|
||||
development.position = item["ตำแหน่ง"] == undefined ? null : item["ตำแหน่ง"];
|
||||
development.org = item["สังกัด"] == undefined ? null : item["สังกัด"];
|
||||
development.dateStart =
|
||||
item["วันที่เริ่มต้น"] == undefined ? null : item["วันที่เริ่มต้น"];
|
||||
development.dateEnd = item["วันที่สิ้นสุด"] == undefined ? null : item["วันที่สิ้นสุด"];
|
||||
development.citizenId =
|
||||
item["รหัสประจำตัวประชาชน"] == undefined ? _null : item["รหัสประจำตัวประชาชน"];
|
||||
development.type = "OTHER";
|
||||
development.order =
|
||||
item["เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"] == undefined
|
||||
? null
|
||||
: item["เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"];
|
||||
development.dateOrder =
|
||||
item["คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"] == undefined
|
||||
? _null
|
||||
: new Date(item["คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"]);
|
||||
development.trainingDays =
|
||||
item["จำนวนวันที่อบรม"] == undefined ? null : item["จำนวนวันที่อบรม"];
|
||||
development.posLevelId = null;
|
||||
development.posTypeId = null;
|
||||
development.employeePosLevelId = null;
|
||||
development.employeePosTypeId = null;
|
||||
development.developmentId = id;
|
||||
development.createdUserId = request.user.sub;
|
||||
development.createdFullName = request.user.name;
|
||||
development.lastUpdateUserId = request.user.sub;
|
||||
development.lastUpdateFullName = request.user.name;
|
||||
development.createdAt = new Date();
|
||||
development.lastUpdatedAt = new Date();
|
||||
development.isProfile = false;
|
||||
// addLogSequence(request, {
|
||||
// action: "database",
|
||||
// status: "success",
|
||||
// description: "Store DevelopmentHistory.",
|
||||
// });
|
||||
await this.developmentHistoryRepository.save(development, { data: request });
|
||||
setLogDataDiff(request, { before, after: development });
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue