This commit is contained in:
@@ -1747,13 +1747,9 @@ namespace rmutr_report.Controllers
|
|||||||
detail.unique_feature2 = null;
|
detail.unique_feature2 = null;
|
||||||
detail.unique_feature3 = null;
|
detail.unique_feature3 = null;
|
||||||
}
|
}
|
||||||
if (detail.topic_type == 2)
|
|
||||||
{
|
|
||||||
detail.topic = "- " + detail.topic;
|
|
||||||
}
|
|
||||||
if (detail.topic_type == 5)
|
if (detail.topic_type == 5)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (detail.conform_1 == true)
|
if (detail.conform_1 == true)
|
||||||
{
|
{
|
||||||
detail.conform1 = "P";
|
detail.conform1 = "P";
|
||||||
@@ -1829,26 +1825,22 @@ namespace rmutr_report.Controllers
|
|||||||
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
[SwaggerOperation("สรุปภาพรวมการเสนอแผนการปรับปรุงอาคารสถานที่/แผนการจัดหาที่ดินและสิ่งก่อสร้าง")]
|
|
||||||
|
[SwaggerOperation("สรุปภาพรวมการเสนอแผนการปรับปรุงอาคารสถานที่/แผนการจัดหาที่ดินและสิ่งก่อสร้าง")]
|
||||||
[HttpPost, Route("reports/summary_overview_building/{type}")]
|
[HttpPost, Route("reports/summary_overview_building/{type}")]
|
||||||
[ApiExplorerSettings(GroupName = "reports")]
|
[ApiExplorerSettings(GroupName = "reports")]
|
||||||
public IActionResult GetSumDemandReport([FromRoute] string type,
|
public IActionResult GetSumDemandReport([FromRoute] string type,
|
||||||
[FromBody] summary_overview_building summaryOverviewBuilding)
|
[FromBody] summary_overview_building summaryOverviewBuilding)
|
||||||
{
|
{
|
||||||
|
|
||||||
foreach (var detail in summaryOverviewBuilding.data)
|
foreach (var detail in summaryOverviewBuilding.data)
|
||||||
{
|
{
|
||||||
if (detail.topic_type != 5)
|
if (detail.topic_type != 5)
|
||||||
{
|
{
|
||||||
detail.row_no = null;
|
detail.row_no = null;
|
||||||
}
|
|
||||||
if (detail.topic_type == 2)
|
|
||||||
{
|
|
||||||
detail.topic = "- " + detail.topic;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (detail.topic_type == 5)
|
if (detail.topic_type == 5)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (detail.readiness_action_1 == true)
|
if (detail.readiness_action_1 == true)
|
||||||
{
|
{
|
||||||
detail.readiness_action1 = "P";
|
detail.readiness_action1 = "P";
|
||||||
@@ -1869,7 +1861,7 @@ namespace rmutr_report.Controllers
|
|||||||
detail.readiness_action4 = "P";
|
detail.readiness_action4 = "P";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (detail.appearance_equipment_1 == true)
|
if (detail.appearance_equipment_1 == true)
|
||||||
{
|
{
|
||||||
detail.appearance_equipment1 = "P";
|
detail.appearance_equipment1 = "P";
|
||||||
|
|||||||
Reference in New Issue
Block a user