From dd6e770ec744a0e0ff5627a91cd602c80de983a5 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 3 Sep 2024 14:59:53 +0700 Subject: [PATCH 1/6] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B9=80=E0=B8=A7=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82/?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentController.ts | 72 +++++++++++++++++-- .../DevelopmentEmployeeHistoryController.ts | 3 + .../DevelopmentHistoryController.ts | 3 + .../DevelopmentScholarshipController.ts | 7 ++ src/controllers/PortfolioController.ts | 3 + src/controllers/StrategyController.ts | 3 + 6 files changed, 87 insertions(+), 4 deletions(-) diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index 3784d02..ac8db88 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -156,6 +156,9 @@ export class DevelopmentController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.createdAt = new Date(); + development.lastUpdatedAt = new Date(); + // addLogSequence(request, { // action: "database", // status: "success", @@ -235,8 +238,6 @@ export class DevelopmentController extends Controller { development.child4ShortName = x.child4ShortName; }) .catch((x) => {}); - development.lastUpdateUserId = request.user.sub; - development.lastUpdateFullName = request.user.name; const _null: any = null; switch (requestBody.node) { case 0: { @@ -284,6 +285,9 @@ export class DevelopmentController extends Controller { default: throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรม"); } + development.lastUpdateUserId = request.user.sub; + development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -324,6 +328,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentPlannedGoalId = development.id; // addLogSequence(request, { // action: "database", @@ -356,6 +362,8 @@ export class DevelopmentController extends Controller { _data.createdFullName = request.user.name; _data.lastUpdateUserId = request.user.sub; _data.lastUpdateFullName = request.user.name; + _data.createdAt = new Date(); + _data.lastUpdatedAt = new Date(); _data.plannedGoalId = data.id; // addLogSequence(request, { // action: "database", @@ -400,6 +408,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentPlannedPeopleId = development.id; // addLogSequence(request, { // action: "database", @@ -463,6 +473,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentActualGoalId = development.id; // addLogSequence(request, { // action: "database", @@ -505,6 +517,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentActualPeopleId = development.id; // addLogSequence(request, { // action: "database", @@ -556,6 +570,7 @@ export class DevelopmentController extends Controller { Object.assign(development, { ...requestBody, positions: [] }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -587,6 +602,8 @@ export class DevelopmentController extends Controller { _data.createdFullName = request.user.name; _data.lastUpdateUserId = request.user.sub; _data.lastUpdateFullName = request.user.name; + _data.createdAt = new Date(); + _data.lastUpdatedAt = new Date(); _data.plannedGoalId = development.id; // addLogSequence(request, { // action: "database", @@ -633,6 +650,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -698,6 +716,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -737,6 +756,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -1137,6 +1157,9 @@ export class DevelopmentController extends Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลยุทธศาสตร์เป้าหมายตามจริง"); } } + development.lastUpdateUserId = request.user.sub; + development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentRepository.save(development, { data: request }); if (requestBody.developmentProjectTypes != null) { await Promise.all( @@ -1147,6 +1170,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentId = development.id; await this.developmentProjectTypeRepository.save(data, { data: request }); }), @@ -1161,6 +1186,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentId = development.id; await this.developmentProjectTechniquePlannedRepository.save(data, { data: request }); }), @@ -1175,6 +1202,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentId = development.id; await this.developmentProjectTechniqueActualRepository.save(data, { data: request }); }), @@ -1206,6 +1235,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); await this.developmentAddresssRepository.save(data, { data: request }); } // setLogDataDiff(request, { before, after: development }); @@ -1240,6 +1271,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -1265,7 +1297,6 @@ export class DevelopmentController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรมนี้"); } - console.log(">>>>>>>>>>", requestBody.results); let results: any = requestBody.results && requestBody.results != "" ? requestBody.results : null; const before = structuredClone(development); @@ -1276,6 +1307,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentId = development.id; await this.developmentEvaluationRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); @@ -1335,6 +1368,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -1368,6 +1402,7 @@ export class DevelopmentController extends Controller { Object.assign(development, { ...requestBody, developmentAddresss: [] }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentRepository.save(development, { data: request }); return new HttpSuccess(development.id); } @@ -1405,6 +1440,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentId = development.id; await this.developmentOtherRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); @@ -1454,6 +1491,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentOtherRepository.save(development, { data: request }); return new HttpSuccess(development.id); @@ -1483,6 +1521,7 @@ export class DevelopmentController extends Controller { Object.assign(development, { ...requestBody }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentRepository.save(development, { data: request }); return new HttpSuccess(development.id); } @@ -1568,6 +1607,7 @@ export class DevelopmentController extends Controller { Object.assign(development, { ...requestBody }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentRepository.save(development, { data: request }); return new HttpSuccess(development.id); } @@ -1597,6 +1637,8 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; + data.createdAt = new Date(); + data.lastUpdatedAt = new Date(); data.developmentId = development.id; await this.developmentRiskRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); @@ -1646,6 +1688,7 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentRiskRepository.save(development, { data: request }); return new HttpSuccess(development.id); @@ -1930,6 +1973,7 @@ export class DevelopmentController extends Controller { getDevelopment.status = "FINISH"; getDevelopment.lastUpdateUserId = request.user.sub; getDevelopment.lastUpdateFullName = request.user.name; + getDevelopment.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -2403,6 +2447,7 @@ export class DevelopmentController extends Controller { _data.lastUpdateUserId = request.user.sub; _data.lastUpdateFullName = request.user.name; + _data.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -2489,6 +2534,8 @@ export class DevelopmentController extends Controller { oldProfile.createdFullName = request.user.name; oldProfile.lastUpdateUserId = request.user.sub; oldProfile.lastUpdateFullName = request.user.name; + oldProfile.createdAt = new Date(); + oldProfile.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -2527,6 +2574,8 @@ export class DevelopmentController extends Controller { 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 = true; // addLogSequence(request, { // action: "database", @@ -2570,6 +2619,8 @@ export class DevelopmentController extends Controller { 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", @@ -2607,6 +2658,8 @@ export class DevelopmentController extends Controller { 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 = true; // addLogSequence(request, { // action: "database", @@ -2650,6 +2703,8 @@ export class DevelopmentController extends Controller { 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", @@ -2708,6 +2763,8 @@ export class DevelopmentController extends Controller { oldProfile.createdFullName = request.user.name; oldProfile.lastUpdateUserId = request.user.sub; oldProfile.lastUpdateFullName = request.user.name; + oldProfile.createdAt = new Date(); + oldProfile.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -2742,6 +2799,8 @@ export class DevelopmentController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.createdAt = new Date(); + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -2781,6 +2840,8 @@ export class DevelopmentController extends Controller { 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", @@ -2789,7 +2850,6 @@ export class DevelopmentController extends Controller { // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); - console.log(development.isProfile); status = development.isProfile; }); } else { @@ -2815,6 +2875,8 @@ export class DevelopmentController extends Controller { 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 = true; // addLogSequence(request, { // action: "database", @@ -2855,6 +2917,8 @@ export class DevelopmentController extends Controller { 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", diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index 1ee5004..d3a351d 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -124,6 +124,8 @@ export class DevelopmentEmployeeHistoryController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.createdAt = new Date(); + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -196,6 +198,7 @@ export class DevelopmentEmployeeHistoryController extends Controller { development.posLevelId = null; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 547312b..af42286 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -120,6 +120,8 @@ export class DevelopmentOfficerHistoryController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.createdAt = new Date(); + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -188,6 +190,7 @@ export class DevelopmentOfficerHistoryController extends Controller { development.type = type; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index 779f291..772d73f 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -73,6 +73,8 @@ export class DevelopmentScholarshipController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.createdAt = new Date(); + development.lastUpdatedAt = new Date(); await this.developmentScholarshipRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -118,6 +120,7 @@ export class DevelopmentScholarshipController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); await this.developmentScholarshipRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -563,6 +566,7 @@ export class DevelopmentScholarshipController extends Controller { Object.assign(getDevelopment, requestBody); getDevelopment.lastUpdateUserId = request.user.sub; getDevelopment.lastUpdateFullName = request.user.name; + getDevelopment.lastUpdatedAt = new Date(); await this.developmentScholarshipRepository.save(getDevelopment, { data: request }); setLogDataDiff(request, { before, after: getDevelopment }); return new HttpSuccess(getDevelopment.id); @@ -646,6 +650,9 @@ export class DevelopmentScholarshipController extends Controller { }); } else if (_status == "NOTGRADUATE") { getDevelopment.status = _status; + getDevelopment.lastUpdateUserId = request.user.sub; + getDevelopment.lastUpdateFullName = request.user.name; + getDevelopment.lastUpdatedAt = new Date(); await this.developmentScholarshipRepository.save(getDevelopment, { data: request }); } else { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบสถานะนี้ในระบบ"); diff --git a/src/controllers/PortfolioController.ts b/src/controllers/PortfolioController.ts index df0aa98..68de02e 100644 --- a/src/controllers/PortfolioController.ts +++ b/src/controllers/PortfolioController.ts @@ -106,6 +106,8 @@ export class PortfolioController extends Controller { _portfolio.createdFullName = request.user.name; _portfolio.lastUpdateUserId = request.user.sub; _portfolio.lastUpdateFullName = request.user.name; + _portfolio.createdAt = new Date(); + _portfolio.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -143,6 +145,7 @@ export class PortfolioController extends Controller { _portfolio.lastUpdateUserId = request.user.sub; _portfolio.lastUpdateFullName = request.user.name; + _portfolio.lastUpdatedAt = new Date(); Object.assign(_portfolio, requestBody); // addLogSequence(request, { // action: "database", diff --git a/src/controllers/StrategyController.ts b/src/controllers/StrategyController.ts index f0d781f..39529b0 100644 --- a/src/controllers/StrategyController.ts +++ b/src/controllers/StrategyController.ts @@ -222,6 +222,8 @@ export class StrategyController extends Controller { strategyChild.createdFullName = request.user.name; strategyChild.lastUpdateUserId = request.user.sub; strategyChild.lastUpdateFullName = request.user.name; + strategyChild.createdAt = new Date(); + strategyChild.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "database", // status: "success", @@ -303,6 +305,7 @@ export class StrategyController extends Controller { } strategyChild.lastUpdateUserId = request.user.sub; strategyChild.lastUpdateFullName = request.user.name; + strategyChild.lastUpdatedAt = new Date(); // addLogSequence(request, { // action: "remove", From 8c39019f4a18597146bc7cdb546ba26aa13d6f4e Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 3 Sep 2024 15:18:30 +0700 Subject: [PATCH 2/6] delete import dont use --- src/controllers/DevelopmentController.ts | 4 +-- .../DevelopmentEmployeeHistoryController.ts | 3 +- .../DevelopmentHistoryController.ts | 3 +- .../DevelopmentScholarshipController.ts | 3 +- src/controllers/MyController.ts | 2 +- src/controllers/PortfolioController.ts | 2 +- src/controllers/ReportController.ts | 31 ++----------------- 7 files changed, 9 insertions(+), 39 deletions(-) diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index ac8db88..da7f1d2 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -27,7 +27,6 @@ import { UpdateDevelopment5, UpdateDevelopment7, UpdateDevelopment8, - UpdateDevelopment8_1, } from "../entities/Development"; import { ActualPeople, CreateActualPeople } from "../entities/ActualPeople"; import { CreatePlannedPeople, PlannedPeople } from "../entities/PlannedPeople"; @@ -38,7 +37,6 @@ import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import { PlannedGoalPosition } from "../entities/PlannedGoalPosition"; import { - CreateDevelopmentHistory, CreateDevelopmentHistoryOBO, DevelopmentHistory, } from "../entities/DevelopmentHistory"; @@ -59,7 +57,7 @@ import CallAPI from "../interfaces/call-api"; import { UseInterceptors } from "@nestjs/common"; import { FileInterceptor } from "@nestjs/platform-express"; import * as xlsx from "xlsx"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; import { RequestWithUser } from "../middlewares/user"; import { DevelopmentRisk, UpdateDevelopmentRisk } from "../entities/DevelopmentRisk"; import { DevelopmentOther, UpdateDevelopmentOther } from "../entities/DevelopmentOther"; diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index d3a351d..8d25e7c 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -10,7 +10,6 @@ import { Body, Path, Request, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import { Brackets, Not } from "typeorm"; @@ -26,7 +25,7 @@ import { import { EmployeePosType } from "../entities/EmployeePosType"; import { EmployeePosLevel } from "../entities/EmployeePosLevel"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; import permission from "../interfaces/permission"; @Route("api/v1/development/history/employee") diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index af42286..dfefb2e 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -10,7 +10,6 @@ import { Body, Path, Request, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import { Brackets, Not } from "typeorm"; @@ -26,7 +25,7 @@ import { import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; import permission from "../interfaces/permission"; @Route("api/v1/development/history/officer") diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index 772d73f..b6bdd6e 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -27,8 +27,7 @@ import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import CallAPI from "../interfaces/call-api"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; -import { request } from "axios"; +import { setLogDataDiff } from "../interfaces/utils"; import permission from "../interfaces/permission"; @Route("api/v1/development/scholarship") diff --git a/src/controllers/MyController.ts b/src/controllers/MyController.ts index 2e5f1bd..7f14906 100644 --- a/src/controllers/MyController.ts +++ b/src/controllers/MyController.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Post, Put, Delete, Patch, Route, Security, Tags } from "tsoa"; +import { Controller, Get, Route, Security, Tags } from "tsoa"; @Route("/hello") @Tags("Test") diff --git a/src/controllers/PortfolioController.ts b/src/controllers/PortfolioController.ts index 68de02e..e4d174c 100644 --- a/src/controllers/PortfolioController.ts +++ b/src/controllers/PortfolioController.ts @@ -20,7 +20,7 @@ import HttpError from "../interfaces/http-error"; import { Not } from "typeorm"; import { CreatePortfolio, Portfolio } from "../entities/Portfolio"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/development/portfolio") @Tags("Portfolio") diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index e1bbd9b..ba4dd6d 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1,28 +1,10 @@ -import { - Controller, - Get, - Post, - Put, - Delete, - Route, - Security, - Tags, - Body, - Path, - Request, - Query, -} from "tsoa"; +import { Controller, Get, Post, Route, Security, Tags, Body, Path } from "tsoa"; import { AppDataSource } from "../database/data-source"; -import { Brackets, Not } 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"; +import { DevelopmentHistory } from "../entities/DevelopmentHistory"; import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import Extension from "../interfaces/extension"; @@ -31,10 +13,6 @@ import { DevelopmentScholarship } from "../entities/DevelopmentScholarship"; @Tags("Report") @Security("bearerAuth") export class ReportController extends Controller { - private developmentHistoryRepository = AppDataSource.getRepository(DevelopmentHistory); - private developmentRepository = AppDataSource.getRepository(Development); - private posTypeRepository = AppDataSource.getRepository(PosType); - private posLevelRepository = AppDataSource.getRepository(PosLevel); private developmentScholarshipRepository = AppDataSource.getRepository(DevelopmentScholarship); /** @@ -285,10 +263,7 @@ export class ReportController extends Controller { getDevelopment.graduatedDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.graduatedDate)), - graduatedReason: - getDevelopment.graduatedReason == null - ? "" - : getDevelopment.graduatedReason, + graduatedReason: getDevelopment.graduatedReason == null ? "" : getDevelopment.graduatedReason, useOfficialTime: getDevelopment.useOfficialTime, useOffTime: getDevelopment.useOfficialTime == true ? "🗹 ใช้ ☐ ไม่ใช้" : "☐ ใช้ 🗹 ไม่ใช้", isGraduated: getDevelopment.isGraduated, From 78ce7fa6126cb89c47176803731b7a16a2deb0bf Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 3 Sep 2024 19:08:13 +0700 Subject: [PATCH 3/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20import=20data?= =?UTF-8?q?=20=E0=B9=84=E0=B8=A1=E0=B8=9E=E0=B8=9A=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B9=83=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentController.ts | 52 ++++++++++++++++--- .../DevelopmentScholarshipController.ts | 46 ++++++++++++++++ 2 files changed, 92 insertions(+), 6 deletions(-) diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index da7f1d2..eb3ceea 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -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 }); } }), ); diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index b6bdd6e..e12a503 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -359,6 +359,52 @@ export class DevelopmentScholarshipController extends Controller { return new HttpSuccess(formattedData); } + /** + * API แก้ไขทุนการศึกษา/ฝึกอบรม + * + * @summary DEV_012 - แก้ไขทุนการศึกษา/ฝึกอบรม #12 + * + * @param {string} id Id ข้าราชการฯที่ได้รับทุนการศึกษา + */ + @Put("admin/{id}") + async UpdateDevelopmentScholarshipAdminById( + @Path() id: string, + @Body() requestBody: UpdateDevelopmentScholarship, + @Request() request: RequestWithUser, + ) { + await new permission().PermissionUpdate(request, "SYS_DEV_SCHOLARSHIP"); + 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, "ไม่พบข้อมูลระดับตำแหน่ง"); + } + } + const before = structuredClone(development); + Object.assign(development, requestBody); + development.lastUpdateUserId = request.user.sub; + development.lastUpdateFullName = request.user.name; + development.lastUpdatedAt = new Date(); + await this.developmentScholarshipRepository.save(development, { data: request }); + setLogDataDiff(request, { before, after: development }); + return new HttpSuccess(development.id); + } + /** * API รายละเอียดทุนการศึกษา/ฝึกอบรม ADMIN * From 28f8c87feaf69fc8d70d3e0d131621dae068e89c Mon Sep 17 00:00:00 2001 From: kittapath Date: Wed, 4 Sep 2024 09:57:05 +0700 Subject: [PATCH 4/6] =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?= =?UTF-8?q?=E0=B8=B2=E0=B8=A5=E0=B8=B8=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=88=E0=B8=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index eb3ceea..af8f250 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -2627,7 +2627,7 @@ export class DevelopmentController extends Controller { }); } else if (item["ประเภท"] == "ลูกจ้างประจำ") { await new CallAPI() - .GetData(request, `/org/unauthorize/employee/citizen/${item["รหัสประจำตัวประชาชน"]}`) + .GetData(request, `/org/unauthorize/employee-prem/citizen/${item["รหัสประจำตัวประชาชน"]}`) .then(async (x: any) => { let development = Object.assign(new DevelopmentHistory(), x); development.dateStart = From a6493dcb62be3200b0f2392616219fa022061ea7 Mon Sep 17 00:00:00 2001 From: kittapath Date: Wed, 4 Sep 2024 16:17:51 +0700 Subject: [PATCH 5/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA?= =?UTF-8?q?=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interfaces/permission.ts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts index 1669018..2ea6b91 100644 --- a/src/interfaces/permission.ts +++ b/src/interfaces/permission.ts @@ -45,20 +45,9 @@ class CheckAuth { return null; } return await new CallAPI() - .GetData(req, "/org/permission/org") + .GetData(req, `/org/permission/org/${action}/${system}`) .then(async (x) => { - let privilege = null; - if (action.trim().toLocaleUpperCase() == "CREATE") - privilege = await this.PermissionCreate(req, system); - if (action.trim().toLocaleUpperCase() == "DELETE") - privilege = await this.PermissionDelete(req, system); - if (action.trim().toLocaleUpperCase() == "GET") - privilege = await this.PermissionGet(req, system); - if (action.trim().toLocaleUpperCase() == "LIST") - privilege = await this.PermissionList(req, system); - if (action.trim().toLocaleUpperCase() == "UPDATE") - privilege = await this.PermissionUpdate(req, system); - + let privilege = x.privilege; let data: any = { root: [null], child1: [null], From ea776021e33bd31847784ab510c97651f940358f Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 6 Sep 2024 15:25:15 +0700 Subject: [PATCH 6/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=AA?= =?UTF-8?q?=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=E0=B8=84=E0=B9=89=E0=B8=99=E0=B9=84=E0=B8=A7=E0=B8=82?= =?UTF-8?q?=E0=B8=B6=E0=B9=89=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/Development.ts | 4 +-- src/entities/Province.ts | 2 +- src/interfaces/permission.ts | 52 ++++++++++++++++++++++-------------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/entities/Development.ts b/src/entities/Development.ts index 0a6fecd..eb4b00e 100644 --- a/src/entities/Development.ts +++ b/src/entities/Development.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany, Double, ManyToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany, Double } from "typeorm"; import { EntityBase } from "./base/Base"; import { Province } from "./Province"; import { ActualPeople, CreateActualPeople } from "./ActualPeople"; @@ -8,7 +8,7 @@ import { CreatePlannedGoal, PlannedGoal } from "./PlannedGoal"; import { DevelopmentHistory } from "./DevelopmentHistory"; import { DevelopmentProjectType } from "./DevelopmentProjectType"; import { DevelopmentProjectTechniquePlanned } from "./DevelopmentProjectTechniquePlanned"; -import { CreateDevelopmentEvaluation, DevelopmentEvaluation } from "./DevelopmentEvaluation"; +import { DevelopmentEvaluation } from "./DevelopmentEvaluation"; import { CreateDevelopmentAddress, DevelopmentAddress } from "./DevelopmentAddress"; import { DevelopmentProjectTechniqueActual } from "./DevelopmentProjectTechniqueActual"; import { StrategyChild5 } from "./StrategyChild5"; diff --git a/src/entities/Province.ts b/src/entities/Province.ts index 7ba8848..a826b67 100644 --- a/src/entities/Province.ts +++ b/src/entities/Province.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, ManyToMany, JoinTable } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { Development } from "./Development"; import { DevelopmentAddress } from "./DevelopmentAddress"; diff --git a/src/interfaces/permission.ts b/src/interfaces/permission.ts index 2ea6b91..fb2d669 100644 --- a/src/interfaces/permission.ts +++ b/src/interfaces/permission.ts @@ -42,12 +42,30 @@ class CheckAuth { req.headers["api_key"] && req.headers["api_key"] == process.env.API_KEY ) { - return null; + return { + root: null, + child1: null, + child2: null, + child3: null, + child4: null, + }; } return await new CallAPI() - .GetData(req, `/org/permission/org/${action}/${system}`) + .GetData(req, `/org/permission/org/${system}/${action}`) .then(async (x) => { + console.log(x); let privilege = x.privilege; + // if (action.trim().toLocaleUpperCase() == "CREATE") + // privilege = await this.PermissionCreate(req, system); + // if (action.trim().toLocaleUpperCase() == "DELETE") + // privilege = await this.PermissionDelete(req, system); + // if (action.trim().toLocaleUpperCase() == "GET") + // privilege = await this.PermissionGet(req, system); + // if (action.trim().toLocaleUpperCase() == "LIST") + // privilege = await this.PermissionList(req, system); + // if (action.trim().toLocaleUpperCase() == "UPDATE") + // privilege = await this.PermissionUpdate(req, system); + let data: any = { root: [null], child1: [null], @@ -124,25 +142,19 @@ class CheckAuth { return true; } return await new CallAPI() - .GetData(req, `/org/permission/user/${profileId}`) + .GetData(req, `/org/permission/user/${system}/${action}/${profileId}`) .then(async (x) => { - let org = { - root: [null], - child1: [null], - child2: [null], - child3: [null], - child4: [null], - }; - if (action.trim().toLocaleUpperCase() == "CREATE") - org = await this.PermissionOrgCreate(req, system); - if (action.trim().toLocaleUpperCase() == "DELETE") - org = await this.PermissionOrgDelete(req, system); - if (action.trim().toLocaleUpperCase() == "GET") - org = await this.PermissionOrgGet(req, system); - if (action.trim().toLocaleUpperCase() == "LIST") - org = await this.PermissionOrgList(req, system); - if (action.trim().toLocaleUpperCase() == "UPDATE") - org = await this.PermissionOrgUpdate(req, system); + let org = x.org; + // if (action.trim().toLocaleUpperCase() == "CREATE") + // org = await this.PermissionOrgCreate(req, system); + // if (action.trim().toLocaleUpperCase() == "DELETE") + // org = await this.PermissionOrgDelete(req, system); + // if (action.trim().toLocaleUpperCase() == "GET") + // org = await this.PermissionOrgGet(req, system); + // if (action.trim().toLocaleUpperCase() == "LIST") + // org = await this.PermissionOrgList(req, system); + // if (action.trim().toLocaleUpperCase() == "UPDATE") + // org = await this.PermissionOrgUpdate(req, system); if (org.root != null) if (x.orgRootId != org.root[0]) throw "ไม่มีสิทธิ์เข้าถึงข้อมูล"; if (org.child1 != null)