diff --git a/Controllers/Personnel.Controller.cs b/Controllers/Personnel.Controller.cs index 32974f0..412cd38 100644 --- a/Controllers/Personnel.Controller.cs +++ b/Controllers/Personnel.Controller.cs @@ -4204,7 +4204,7 @@ namespace rmutr_report.Controllers ws.Cell("D8").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("D8").Style.Font.FontSize = 16; ws.Cell("D8").Style.Font.Bold = true; - ws.Range("E8:F8").Merge().Value = personnel.total_propose_budget1; + ws.Range("E8:F8").Merge().Value = personnel.act_old1; ws.Range("E8:F8").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range("E8:F8").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Range("E8:F8").Style.Font.FontName = "TH SarabunPSK"; @@ -4216,7 +4216,7 @@ namespace rmutr_report.Controllers ws.Cell("H8").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("H8").Style.Font.FontSize = 16; ws.Cell("H8").Style.Font.Bold = true; - ws.Range("I8:J8").Merge().Value = personnel.budget1; + ws.Range("I8:J8").Merge().Value = personnel.act_old2; ws.Range("I8:J8").Style.NumberFormat.Format = "#,##0.0000"; ws.Range("I8:J8").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range("I8:J8").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; @@ -4254,7 +4254,7 @@ namespace rmutr_report.Controllers ws.Cell("D10").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("D10").Style.Font.FontSize = 16; ws.Cell("D10").Style.Font.Bold = true; - ws.Range("E10:F10").Merge().Value = personnel.total_propose_budget1; + ws.Range("E10:F10").Merge().Value = personnel.act_old1; ws.Range("E10:F10").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range("E10:F10").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Range("E10:F10").Style.Font.FontName = "TH SarabunPSK"; @@ -4266,7 +4266,7 @@ namespace rmutr_report.Controllers ws.Cell("H8").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("H8").Style.Font.FontSize = 16; ws.Cell("H8").Style.Font.Bold = true; - ws.Range("I10:J10").Merge().Value = personnel.budget1; + ws.Range("I10:J10").Merge().Value = personnel.act_old2; ws.Range("I10:J10").Style.NumberFormat.Format = "#,##0.0000"; ws.Range("I10:J10").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range("I10:J10").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;