updated

src/controllers/EvaluateResultController.ts

@@ -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,
         };
       }),
     );