提交代码

This commit is contained in:
2025-04-10 10:45:57 +08:00
parent 774af1be61
commit eb753a1fa4
2 changed files with 35 additions and 25 deletions
@@ -1248,7 +1248,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
newItem.ArchitectureReportId = report.ArchitectureReportId; newItem.ArchitectureReportId = report.ArchitectureReportId;
newItem.BaseNumber = System.Web.HttpUtility.HtmlDecode(item.BaseNumber); newItem.BaseNumber = System.Web.HttpUtility.HtmlDecode(item.BaseNumber);
newItem.SortIndex = System.Web.HttpUtility.HtmlDecode(item.SortIndex); newItem.SortIndex = System.Web.HttpUtility.HtmlDecode(item.SortIndex);
newItem.LastYearValue = System.Web.HttpUtility.HtmlDecode(item.LastYearValue); string str = item.LastYearValue;
if (str == "6E-05")
{
str = "0.00006";
}
newItem.LastYearValue = System.Web.HttpUtility.HtmlDecode(str);
newItem.ThisYearValue = System.Web.HttpUtility.HtmlDecode(item.ThisYearValue); newItem.ThisYearValue = System.Web.HttpUtility.HtmlDecode(item.ThisYearValue);
newItem.Rate = System.Web.HttpUtility.HtmlDecode(item.Rate); newItem.Rate = System.Web.HttpUtility.HtmlDecode(item.Rate);
ArchitectureReportItemService.AddArchitectureReportItem(newItem); ArchitectureReportItemService.AddArchitectureReportItem(newItem);
@@ -1265,7 +1270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return; return;
} }
else if (code=="3") else if (code == "3")
{ {
Alert.ShowInParent("集团当前季度数据已锁定,无法上传!", MessageBoxIcon.Error); Alert.ShowInParent("集团当前季度数据已锁定,无法上传!", MessageBoxIcon.Error);
} }
@@ -1331,7 +1336,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
{ {
try try
{ {
decimal d = Convert.ToDecimal(values.Value<string>("LastYearValue")); string str = values.Value<string>("LastYearValue");
if (str == "6E-05")
{
str = "0.00006";
}
decimal d = Convert.ToDecimal(str);
} }
catch (Exception) catch (Exception)
{ {
+1 -1
View File
@@ -29,7 +29,7 @@
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>5</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\Model.xml</DocumentationFile> <DocumentationFile>bin\Debug\Model.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>