diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 3b7d3e8..54f1444 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -25,6 +25,7 @@ namespace rmutr_report.Controllers { _setting = setting; } + [SwaggerOperation(Summary = "รายงานงบประมาณแยกตามพื้นที่")] [HttpPost, Route("reports/budget_report/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -80,6 +81,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation(Summary = "รายงานสรุปงบประมาณรายจ่าย")] [HttpPost, Route("reports/budget_summary_report/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -244,7 +246,8 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("สรุปรายการสิ่งก่อสร้างที่เสนอขอ")] + + [SwaggerOperation("สรุปรายการสิ่งก่อสร้างที่เสนอขอ")] [HttpPost, Route("reports/summary_building_table/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetSumbuildingReport([FromRoute] string type, @@ -306,6 +309,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("สรุปรายการครุภัณฑ์ที่เสนอขอ")] [HttpPost, Route("reports/summary_durable_articles_table/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -351,6 +355,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("ตารางและรายงานสรุปคำขอในส่วนของโครงการทั้งหมด")] [HttpPost, Route("reports/summary_all_project_table/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -396,7 +401,8 @@ namespace rmutr_report.Controllers return Ok(); } -[SwaggerOperation("สรุปการเสนอของบประมาณโครงการประจำปีงบประมาณ")] + + [SwaggerOperation("สรุปการเสนอของบประมาณโครงการประจำปีงบประมาณ")] [HttpPost, Route("reports/summary_project_budget_proposals/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetSumPReport([FromRoute] string type, [FromBody] summary_project_budget_proposals eleven) @@ -449,6 +455,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("งบประมาณแผ่นดิน พื้นฐาน")] [HttpPost, Route("reports/basic_plan/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -769,6 +776,7 @@ namespace rmutr_report.Controllers return Ok(); } } + [SwaggerOperation("งบประมาณแผ่นดิน แผนบูรณาการ+แผนยุทธศาสตร์")] [HttpPost, Route("reports/integration_strategic_plan/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -1163,6 +1171,7 @@ namespace rmutr_report.Controllers "integration_strategic_plan_" + date + ".xlsx"); } } + [SwaggerOperation("งบประมาณแผ่นดิน รวมทุกแผน")] [HttpPost, Route("reports/basic_plan_all/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -1705,6 +1714,7 @@ namespace rmutr_report.Controllers "basic_plan_all_" + date + ".xlsx"); } } + [SwaggerOperation("ตารางสรุปประเด็นยุทธศาสตร์ เป้าหมายหลัก ตัวชี้วัดและกลยุทธ์")] [HttpPost, Route("reports/summary_strategic/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -1743,6 +1753,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("ร.15 ประมาณการรายรับจากการจัดการศึกษา")] [HttpPost, Route("reports/budget_expenditure_from_revenue/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -1967,6 +1978,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("สรุปรายรับและจัดสรรตามเกณฑ์")] [HttpPost, Route("reports/revenue_estimates/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -2431,6 +2443,7 @@ namespace rmutr_report.Controllers "revenue_estimates_" + date + ".xlsx"); } } + [SwaggerOperation("ตารางสรุปงบประมาณประจำปี แยกตามผลผลิตของมหาวิทยาลัย")] [HttpPost, Route("reports/summary_budget_university/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -2468,18 +2481,109 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("แผนงานบุคลากรภาครัฐ")] [HttpPost, Route("reports/budget_expenditure_report_from_revenue/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetBudgetExpenditureRevenueReport([FromRoute] string type, [FromBody] budget_expenditure_report_from_revenue budget) { + int no = 1; + var b = budget.budgets.ToArray(); + var budgets1 = budget.budgets.ToList(); foreach (var bb in b) { bb.personnel_list_s = new List { bb.personnel_lists }; + foreach (var detail in bb.personnel_list_s) + { + foreach (var detail2 in detail.budget_personnel_lists) + { + if (detail2.rate != null) + { + detail2.text1 = "อัตรา"; + } + + if (detail.budget_personnel_lists.Count() == 1) + { + detail.budget_personnel_lists[0].topic = "งบบุคลากร"; + } + + foreach (var detail3 in detail2.budget_personnel_lists_2) + { + if (detail3.rate != null) + { + detail3.text1 = "อัตรา"; + } + + int no2 = 1; + + if (detail3.topic != null) + { + detail3.row_no = no; + no++; + } + + foreach (var detail4 in detail3.budget_rates) + { + if (detail4.rate != null) + { + detail4.text1 = "อัตรา"; + } + + int no3 = 1; + if (detail4.topic != null) + { + detail4.row_no = no2; + no2++; + } + + foreach (var detail5 in detail4.details) + { + int no4 = 1; + if (detail5.rate != null) + { + detail5.text1 = "อัตรา"; + } + + if (detail5.position_level != null) + { + detail5.row_no = no3; + no3++; + } + + if (detail.budget_personnel_lists.Count() == 2) + { + detail.budget_personnel_lists[0].topic = "งบบุคลากร"; + detail.budget_personnel_lists[1].topic = "งบดําเนินงาน"; + detail.budget_personnel_lists[1].text1 = null; + detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null; + detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null; + detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0] + .row_no = null; + detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0] + .text1 = null; + detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0] + .details[0].text1 = null; + } + + foreach (var detail6 in detail5.details2) + { + if (detail6.topic != null) + { + detail6.row_no = no4; + no4++; + detail6.text1 = "บาท"; + } + } + } + } + } + } + } } + var budgetExpenditure = new List() { budget }; Report report = new Report(); @@ -2511,8 +2615,8 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("สรุปงบประมาณแผนปฏิบัติราชการประจำปี")] + [SwaggerOperation("สรุปงบประมาณแผนปฏิบัติราชการประจำปี")] [HttpPost, Route("reports/summary_government_budget_plan/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetSumGovernmentPlanReport([FromRoute] string type, @@ -2656,13 +2760,13 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("แผนงาน/ผลผลิตของมหาวิทยาลัยฯ")] [HttpPost, Route("reports/budget_projects/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetBudgetProjectsReport([FromRoute] string type, [FromBody] budget_projects budget) { - var budgets = new List() { budget }; Report report = new Report(); @@ -2693,13 +2797,13 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("ข้อมูลงบประมาณเงินแผ่นดิน งบประมาณเงินรายได้")] [HttpPost, Route("reports/total_budget/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetBudgetTotalReport([FromRoute] string type, [FromBody] total_budget budget) { - var summaryBudget = new List() { budget }; Report report = new Report(); @@ -2731,6 +2835,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("ร.6 สรุปโครงการงบดำเนินงาน")] [HttpPost, Route("reports/summary_subsidy_projects/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -2787,13 +2892,13 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("ตารางเป้าหมายผลผลิต")] + + [SwaggerOperation("ตารางเป้าหมายผลผลิต")] [HttpPost, Route("reports/target_budget_project/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetTargetBudgetReport([FromRoute] string type, [FromBody] List targetBudgetProjectsbudget) { - Report report = new Report(); report.Load(_setting.report_path + "target_budget_project.frx"); report.RegisterData(targetBudgetProjectsbudget, "target_budget_project"); @@ -2821,35 +2926,39 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("แผนการรับนักศึกษา")] [HttpPost, Route("reports/student_admission_plan/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetStdAdmissionReport([FromRoute] string type, [FromBody] student_admission_plan studentAdmission) { - if (studentAdmission.student_type_code==1) + if (studentAdmission.student_type_code == 1) { studentAdmission.student_type_name = "นักศึกษารับใหม่"; studentAdmission.text = "ภาคสมทบ"; } - if (studentAdmission.student_type_code==2) + + if (studentAdmission.student_type_code == 2) { studentAdmission.student_type_name = "นักศึกษาทั้งหมด"; studentAdmission.text = "ภาคสมทบ/ภาคพิเศษ"; } - if (studentAdmission.student_type_code==3) + + if (studentAdmission.student_type_code == 3) { studentAdmission.student_type_name = "นักศึกษาสำเร็จ"; studentAdmission.text = "ภาคสมทบ/ภาคพิเศษ"; } + foreach (var detail in studentAdmission.data) { if (detail.topic_type == 4) { - detail.topic = "- "+detail.topic; + detail.topic = "- " + detail.topic; } - } + var studentAdmissionPlans = new List() { studentAdmission }; Report report = new Report(); report.Load(_setting.report_path + "student_admission_plan.frx"); @@ -2878,121 +2987,130 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("รายงานภาพรวมนักศึกษา")] + + [SwaggerOperation("รายงานภาพรวมนักศึกษา")] [HttpPost, Route("reports/student_overview/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetStdoverviewReport([FromRoute] string type, [FromBody] student_overview studentOverview) { - if (studentOverview.student_type_code==1) + if (studentOverview.student_type_code == 1) { studentOverview.student_type_name = "นักศึกษาทั้งหมด"; } - if (studentOverview.student_type_code==2) + + if (studentOverview.student_type_code == 2) { studentOverview.student_type_name = "นักศึกษารับใหม่"; } - if (studentOverview.student_type_code==3) + + if (studentOverview.student_type_code == 3) { studentOverview.student_type_name = "นักศึกษาสำเร็จ"; } - if (studentOverview.student_type_code==4) + + if (studentOverview.student_type_code == 4) { studentOverview.student_type_name = "นักศึกษาปกติทั้งหมด"; } - if (studentOverview.student_type_code==5) + + if (studentOverview.student_type_code == 5) { studentOverview.student_type_name = "นักศึกษาปกติรับใหม่"; } - if (studentOverview.student_type_code==6) + + if (studentOverview.student_type_code == 6) { studentOverview.student_type_name = "นักศึกษาปกติสำเร็จ"; } - if (studentOverview.student_type_code==7) + + if (studentOverview.student_type_code == 7) { studentOverview.student_type_name = "นักศึกษาสมทบ/พิเศษทั้งหมด"; } - if (studentOverview.student_type_code==8) + + if (studentOverview.student_type_code == 8) { studentOverview.student_type_name = "นักศึกษาสมทบ/พิเศษรับใหม่"; } - if (studentOverview.student_type_code==9) + + if (studentOverview.student_type_code == 9) { studentOverview.student_type_name = "นักศึกษาสมทบ/พิเศษสำเร็จ"; } - var sum1 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_science_1); - var sum2 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_social_1); - var sum3 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_total_1); - var sum4 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_science_1); - var sum5 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_social_1); - var sum6 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_total_1); - var sum7 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_science_1); - var sum8 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_social_1); - var sum9 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_total_1); - var sum10 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_science_1); - var sum11 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_social_1); - var sum12 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_1); - var sum13 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_science_2); - var sum14 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_social_2); - var sum15 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_total_2); - var sum16 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_science_2); - var sum17 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_social_2); - var sum18 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_total_2); - var sum19 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_science_2); - var sum20 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_social_2); - var sum21 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_total_2); - var sum22 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_science_2); - var sum23 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_social_2); - var sum24 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_2); - var sum25 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_science_3); - var sum26 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_social_3); - var sum27 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_total_3); - var sum28 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_science_3); - var sum29 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_social_3); - var sum30 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_total_3); - var sum31 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_science_3); - var sum32 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_social_3); - var sum33 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_total_3); - var sum34 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_science_3); - var sum35 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_social_3); - var sum36 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_3); - var sum37 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_science_4); - var sum38 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_social_4); - var sum39 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_total_4); - var sum40 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_science_4); - var sum41 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_social_4); - var sum42 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_total_4); - var sum43 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_science_4); - var sum44 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_social_4); - var sum45 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_total_4); - var sum46 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_science_4); - var sum47 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_social_4); - var sum48 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_4); - var sum49 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_science_5); - var sum50 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_social_5); - var sum51 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_total_5); - var sum52 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_science_5); - var sum53 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_social_5); - var sum54 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_total_5); - var sum55 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_science_5); - var sum56 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_social_5); - var sum57 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_total_5); - var sum58 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_science_5); - var sum59 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_social_5); - var sum60 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_5); - var sum61 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_science_6); - var sum62 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_social_6); - var sum63 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ba_degree_total_6); - var sum64 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_science_6); - var sum65 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_social_6); - var sum66 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.ma_degree_total_6); - var sum67 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_science_6); - var sum68 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_social_6); - var sum69 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.doctor_degree_total_6); - var sum70 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_science_6); - var sum71 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_social_6); - var sum72 = studentOverview.data.Where(g=>g.topic_type==1).Sum(d => d.total_6); + var sum1 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_science_1); + var sum2 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_social_1); + var sum3 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_total_1); + var sum4 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_science_1); + var sum5 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_social_1); + var sum6 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_total_1); + var sum7 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_science_1); + var sum8 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_social_1); + var sum9 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_total_1); + var sum10 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_science_1); + var sum11 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_social_1); + var sum12 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_1); + var sum13 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_science_2); + var sum14 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_social_2); + var sum15 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_total_2); + var sum16 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_science_2); + var sum17 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_social_2); + var sum18 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_total_2); + var sum19 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_science_2); + var sum20 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_social_2); + var sum21 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_total_2); + var sum22 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_science_2); + var sum23 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_social_2); + var sum24 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_2); + var sum25 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_science_3); + var sum26 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_social_3); + var sum27 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_total_3); + var sum28 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_science_3); + var sum29 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_social_3); + var sum30 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_total_3); + var sum31 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_science_3); + var sum32 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_social_3); + var sum33 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_total_3); + var sum34 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_science_3); + var sum35 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_social_3); + var sum36 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_3); + var sum37 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_science_4); + var sum38 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_social_4); + var sum39 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_total_4); + var sum40 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_science_4); + var sum41 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_social_4); + var sum42 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_total_4); + var sum43 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_science_4); + var sum44 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_social_4); + var sum45 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_total_4); + var sum46 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_science_4); + var sum47 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_social_4); + var sum48 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_4); + var sum49 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_science_5); + var sum50 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_social_5); + var sum51 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_total_5); + var sum52 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_science_5); + var sum53 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_social_5); + var sum54 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_total_5); + var sum55 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_science_5); + var sum56 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_social_5); + var sum57 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_total_5); + var sum58 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_science_5); + var sum59 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_social_5); + var sum60 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_5); + var sum61 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_science_6); + var sum62 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_social_6); + var sum63 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ba_degree_total_6); + var sum64 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_science_6); + var sum65 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_social_6); + var sum66 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.ma_degree_total_6); + var sum67 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_science_6); + var sum68 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_social_6); + var sum69 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.doctor_degree_total_6); + var sum70 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_science_6); + var sum71 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_social_6); + var sum72 = studentOverview.data.Where(g => g.topic_type == 1).Sum(d => d.total_6); studentOverview.ba_degree_science_1 = sum1; studentOverview.ba_degree_social_1 = sum2; @@ -3006,7 +3124,7 @@ namespace rmutr_report.Controllers studentOverview.total_science_1 = sum10; studentOverview.total_social_1 = sum11; studentOverview.total_1 = sum12; - + studentOverview.ba_degree_science_2 = sum13; studentOverview.ba_degree_social_2 = sum14; studentOverview.ba_degree_total_2 = sum15; diff --git a/Models/budget/budget_expenditure_report_from_revenue.cs b/Models/budget/budget_expenditure_report_from_revenue.cs index 73d7865..6dc77bb 100644 --- a/Models/budget/budget_expenditure_report_from_revenue.cs +++ b/Models/budget/budget_expenditure_report_from_revenue.cs @@ -17,50 +17,75 @@ namespace rmutr_report.Models //public string agency_category_name { get; set; } //ผลผลิต public decimal? total { get; set; } public List budgets { get; set; } + //public List budgets2 { get; set; } } public class budget { + public string topic { get; set; } public decimal? total { get; set; } //แผนงาน - - public personnel_list personnel_lists { get; set; } + public personnel_list personnel_lists { get; set; } public List personnel_list_s { get; set; } } public class personnel_list //รายการบุคลกร { + public string topic { get; set; } public decimal? total { get; set; } public List budget_personnel_lists { get; set; } + public List budget_personnel_lists2 { get; set; } } public class budget_personnel_list //งบบุคลากร { + public string topic { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } public List budget_personnel_lists_2 { get; set; } } public class budget_personnel_list_2 //ค่าจ้างชั่วคราว { + public int? row_no { get; set; } public string topic { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } public List budget_rates { get; set; } } public class budget_rate //อัตราเดิม/อัตราใหม่ { + public int? row_no { get; set; } public string topic { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } public List
details { get; set; } } public class details //อันรองลงมา { + public int? row_no { get; set; } public string position_level { get; set; } public string qualification { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } + public List details2 { get; set; } } + public class details2 //อันรองลงมา + { + public int? row_no { get; set; } + public string topic { get; set; } + + public decimal? total { get; set; } + public string text1 { get; set; } + } + } \ No newline at end of file diff --git a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig index 916eff3..c04e72e 100644 --- a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -7,4 +7,4 @@ build_property.InvariantGlobalization = build_property.PlatformNeutralAssembly = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = rmutr_report -build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\ +build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\ diff --git a/obj/Debug/net5.0/rmutr_report.assets.cache b/obj/Debug/net5.0/rmutr_report.assets.cache index 17c510d..3b0323b 100644 Binary files a/obj/Debug/net5.0/rmutr_report.assets.cache and b/obj/Debug/net5.0/rmutr_report.assets.cache differ diff --git a/obj/project.assets.json b/obj/project.assets.json index b35f40f..13c8c8c 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2149,14 +2149,14 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", + "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "projectName": "rmutr_report", - "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", + "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\", + "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config", + "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 93dd475..fe8f515 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "hE1gzfQgC+4GgyoQuRqmEmX/hadpdQNNAtzoJP3ojRoJ0s4QtHzCqAzsknxDVb7FYfcX4JoJw8yCmPluWoUxgg==", + "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==", "success": true, - "projectFilePath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", + "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "expectedPackageFiles": [ "C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512", "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512", diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index 06836dd..daed5e1 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 317e319..555979d 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16921836306235276 \ No newline at end of file +16926162047873347 \ No newline at end of file diff --git a/obj/rmutr_report.csproj.nuget.dgspec.json b/obj/rmutr_report.csproj.nuget.dgspec.json index 10d6724..6a65beb 100644 --- a/obj/rmutr_report.csproj.nuget.dgspec.json +++ b/obj/rmutr_report.csproj.nuget.dgspec.json @@ -1,20 +1,20 @@ { "format": 1, "restore": { - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {} + "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {} }, "projects": { - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": { + "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", + "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "projectName": "rmutr_report", - "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", + "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\", + "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config", + "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx index 3a3cf83..244deaa 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue.frx @@ -1,5 +1,5 @@  - + @@ -8,25 +8,45 @@ + + + + + + + + + + + + + + + + + + + + @@ -36,7 +56,7 @@ - + @@ -51,48 +71,54 @@ - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + + + + + + +