From c39b6196509ee07d5799cd2a6611700995948f5b Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 29 十二月 2021 14:23:45 +0800
Subject: [PATCH] 抽样时日期比对添加年数配置修改
---
Properties/AssemblyInfo.cs | 4 ++--
SizeDetection.cs | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 05da3ed..628b3bb 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// 鍙互鎸囧畾鎵�鏈夎繖浜涘�硷紝涔熷彲浠ヤ娇鐢ㄢ�滃唴閮ㄧ増鏈彿鈥濆拰鈥滀慨璁㈠彿鈥濈殑榛樿鍊硷紝
// 鏂规硶鏄寜濡備笅鎵�绀轰娇鐢ㄢ��*鈥�:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.4.1")]
+[assembly: AssemblyFileVersion("1.0.4.1")]
diff --git a/SizeDetection.cs b/SizeDetection.cs
index 2f5f8cb..df03200 100644
--- a/SizeDetection.cs
+++ b/SizeDetection.cs
@@ -664,9 +664,17 @@
weekPlus = 0;
}
weekOfYear += weekPlus;
-
string week = weekOfYear.ToString().Length == 1 ? "0" + weekOfYear.ToString() : weekOfYear.ToString();
+
+ var yearPlusStr = ConfigurationManager.AppSettings["YearPlus"];
+ int yearPlus = 0;
+ if (!int.TryParse(yearPlusStr, out yearPlus))
+ {
+ yearPlus = 0;
+ }
string year = dt.Year.ToString().Substring(dt.Year.ToString().Length - 1, 1);
+ year = (int.Parse(year) + yearPlus).ToString();
+
return year + week;
}
}
--
Gitblit v1.8.0