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

updated

Browse source
This commit is contained in:
Warunee Tamkoo 2025-01-30 15:26:58 +07:00
parent 7b853002c5
commit 149003131c
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/EvaluateResultController.ts
View file

@ -15,7 +15,7 @@ import {
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import { RequestWithUser } from "../middlewares/user";
import { setLogDataDiff } from "../interfaces/utils";
import { findEndDate, setLogDataDiff } from "../interfaces/utils";
import { AppDataSource } from "../database/data-source";
import { AssignDirector } from "../entities/AssignDirector";
import HttpError from "../interfaces/http-error";
@ -163,11 +163,27 @@ export class EvaluateResultController extends Controller {
const evaluate_result = e.evaluate_result === 1 ? 1 : 2;
let startDate = assign.date_start;
if (e.no === "2") {
const resultNo1 = await this.evaluateResultRepository.findOne({
select: ["date_finish"],
where: { assign_id, no: "1" },
});
startDate = resultNo1?.date_finish ?? assign.date_start;
}
let endDate: any = assign.date_finish;
if (e.no === "1") {
endDate = findEndDate(3, assign.date_start) ?? assign.date_finish;
}
return {
develop_complete,
evaluate_result,
evaluate_no: Number(e.no),
isResult: check > 0 ? true : false,
start_date: startDate,
end_date: endDate,
};
}),
);