From 2168ebd759dd4643a18f2d775ab01cf9ee83501d Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 5 Oct 2023 17:57:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E8=AA=BF=E6=95=B4ope=20?= =?UTF-8?q?controller=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/OperationController.cs | 17 +++++++++-------- .../operation/維修_2023-10-05_2023-10-05.xlsx | Bin 0 -> 4236 bytes 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 FrontendWebApi/wwwroot/excel/operation/維修_2023-10-05_2023-10-05.xlsx diff --git a/FrontendWebApi/ApiControllers/OperationController.cs b/FrontendWebApi/ApiControllers/OperationController.cs index 92c14bd..29b5e71 100644 --- a/FrontendWebApi/ApiControllers/OperationController.cs +++ b/FrontendWebApi/ApiControllers/OperationController.cs @@ -24,6 +24,7 @@ using System.Threading.Tasks; using Image = System.Drawing.Image; using System.IdentityModel.Tokens.Jwt; using System.Net; +using System.Data.SqlTypes; namespace FrontendWebApi.ApiControllers { @@ -206,7 +207,7 @@ namespace FrontendWebApi.ApiControllers try { var sqlString = @$"select device_number, concat(device_floor_tag, ' ', full_name) as device_name, full_name, device_floor_tag, device_system_tag, device_name_tag - from device where deleted = 0 and device_area_tag = @device_area_tag and device_building_tag = @device_building_tag and device_name_tag in @list_sub_system_tag "; + from device where deleted = 0 and device_area_tag = @device_area_tag and device_name_tag in @list_sub_system_tag "; var param = new { @device_building_tag = bl.device_building_tag, @device_area_tag = bl.device_area_tag, @list_sub_system_tag = bl.list_sub_system_tag }; @@ -769,7 +770,7 @@ namespace FrontendWebApi.ApiControllers List opList = new List(); try { - var sqlString = $@"select id, name from operation_firm where deleted = 0 and device_system_category_layer3 in @sub_system_tag"; + var sqlString = $@"select id, name from operation_firm where deleted = 0"; opList = await backendRepository.GetAllAsync(sqlString, new { @sub_system_tag = ofl.sub_system_tag }); apiResult.Code = "0000"; @@ -1226,8 +1227,8 @@ namespace FrontendWebApi.ApiControllers { "@device_system_category_layer3", or.device_system_category_layer3}, { "@work_type", or.work_type}, { "@error_code", or.error_code}, - { "@fix_do", or.fix_do}, - { "@fix_do_code", or.fix_do_code }, + { "@fix_do", or.fix_do == "null" ? "" : or.fix_do }, + { "@fix_do_code", or.fix_do_code == "null" ? "" : or.fix_do_code }, { "@fix_firm", or.fix_firm}, { "@status", or.status}, { "@work_person_id", or.work_person_id}, @@ -1291,8 +1292,8 @@ namespace FrontendWebApi.ApiControllers { "@device_system_category_layer2", or.device_system_category_layer2}, { "@device_system_category_layer3", or.device_system_category_layer3}, { "@error_code", or.error_code}, - { "@fix_do", or.fix_do}, - { "@fix_do_code", or.fix_do_code }, + { "@fix_do", or.fix_do == "null" ? "" : or.fix_do }, + { "@fix_do_code", or.fix_do_code == "null" ? "" : or.fix_do_code }, { "@fix_firm", or.fix_firm}, { "@status", or.status}, { "@work_person_id", or.work_person_id}, @@ -1300,8 +1301,8 @@ namespace FrontendWebApi.ApiControllers { "@end_time", or.end_time}, { "@work_time", or.work_time}, { "@finish_time", or.finish_time}, - { "@notice", or.notice}, - { "@description", or.description}, + { "@notice", or.notice == "null" ? null : or.notice}, + { "@description", or.description == "null" ? null : or.description}, { "@updated_by", myUser.userinfo_guid}, { "@updated_at", DateTime.Now} }; diff --git a/FrontendWebApi/wwwroot/excel/operation/維修_2023-10-05_2023-10-05.xlsx b/FrontendWebApi/wwwroot/excel/operation/維修_2023-10-05_2023-10-05.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d47e149960f37a71ab1c25b71629a4a5e9edda3d GIT binary patch literal 4236 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