提交代码

2025-03-27 15:23:34 +08:00
parent b10af2e331 cd8148326c
commit 6eb3e01c1b
24 changed files with 366 additions and 45 deletions
@@ -4811,7 +4811,7 @@ namespace BLL
        /// <summary>
        /// 关键事项模板文件原始虚拟路径
        /// </summary>
-        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项.xlsx";
+        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项跟踪一览表.xlsx";

        #endregion
        #endregion
@@ -1250,6 +1250,59 @@ namespace BLL
            //return TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(timestamp);
        }

+        #region 去除后面多余的零
+
+        /// <summary>
+        /// 去除后面多余的零
+        /// </summary>
+        /// <param name="sResult"></param>
+        /// <returns></returns>
+        public static string RemoveZero(string sResult)
+        {
+            if (sResult.IndexOf(".") < 0)
+                return sResult;
+            int iIndex = sResult.Length - 1;
+            for (int i = sResult.Length - 1; i >= 0; i--)
+            {
+                if (sResult.Substring(i, 1) != "0")
+                {
+                    iIndex = i;
+                    break;
+                }
+            }
+            sResult = sResult.Substring(0, iIndex + 1);
+            if (sResult.EndsWith("."))
+                sResult = sResult.Substring(0, sResult.Length - 1);
+            return sResult;
+        }
+
+        /// <summary>
+        /// 去除后面多余的零
+        /// </summary>
+        /// <param name="dValue"></param>
+        /// <returns></returns>
+        public static string RemoveZero(decimal dValue)
+        {
+            string sResult = dValue.ToString();
+            if (sResult.IndexOf(".") < 0)
+                return sResult;
+            int iIndex = sResult.Length - 1;
+            for (int i = sResult.Length - 1; i >= 0; i--)
+            {
+                if (sResult.Substring(i, 1) != "0")
+                {
+                    iIndex = i;
+                    break;
+                }
+            }
+            sResult = sResult.Substring(0, iIndex + 1);
+            if (sResult.EndsWith("."))
+                sResult = sResult.Substring(0, sResult.Length - 1);
+            return sResult;
+        }
+
+        #endregion
+
        public static string RequestGet(string Baseurl, string Token)
        {
            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
@@ -113,7 +113,7 @@ namespace BLL
                    newHazardRegister.ProblemTypes = hazardRegister.ProblemTypes;
                    newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
                    newHazardRegister.Type = hazardRegister.Type;
-
+                    newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
                    newHazardRegister.HiddenType = hazardRegister.HiddenType;
                    //把附件表的路径复制过来
                    Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);