ปรับปรุงหลายข้อ

Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs

@@ -95,6 +95,13 @@ namespace TodoAPI2.Models
 
             var leave_start_date = plan.start_leave;
             var leave_end_date = plan.end_leave;
+            var plan_remark = plan.remark;
+
+
+            if (!string.IsNullOrEmpty(plan_remark))
+            {
+                plan_remark = "หมายเหตุ  " + plan_remark;
+            }
 
             var data = (
                 from m_eva_create_evaluation_detail_process in _repository.Context.eva_create_evaluation_detail
@@ -123,7 +130,7 @@ namespace TodoAPI2.Models
                 into external_supervisor2AResult
                 from fk_external_supervisor2A in external_supervisor2AResult.DefaultIfEmpty()
 
-                
+
 
                 where m_eva_create_evaluation_detail_process.id == id
 
@@ -209,7 +216,9 @@ namespace TodoAPI2.Models
                     chief_position_level_text = fk_external_chief.position_level_text,
 
                     leave_start_date = leave_start_date,
-                    leave_end_date = leave_end_date
+                    leave_end_date = leave_end_date,
+                    plan_remark = plan_remark,
+                    eva_detail_remark = m_eva_create_evaluation_detail_process.remark
                 }
             ).ToList();
 

Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs

@@ -41,5 +41,8 @@ namespace TodoAPI2.Models
         public DateTime? leave_start_date { get; set; }
 
         public DateTime? leave_end_date { get; set; }
+
+        public string plan_remark { get; set; }
+        public string eva_detail_remark { get; set; }
     }
 }