2023-10-25

2023-10-25 23:30:52 +08:00
parent 1580bbcbf7
commit 81d0edb9e7
23 changed files with 386 additions and 250 deletions
@@ -61,7 +61,9 @@ namespace BLL
                        (string.IsNullOrEmpty(table.SettledQuantity) ||
                         x.SettledQuantity.Contains(table.SettledQuantity)) &&
                        (string.IsNullOrEmpty(table.ContractId) ||
-                         x.ContractId.Contains(table.ContractId))
+                         table.ContractId.Split(',').Contains(x.ContractId))&&
+                        (string.IsNullOrEmpty(table.ProjectId) ||
+                         x.ProjectId.Contains(table.ProjectId))

                    select x
                ;
@@ -269,6 +271,39 @@ namespace BLL
            return SumSettledAmount;
        }

+        /// <summary>
+        /// 根据主键获取工程量偏差
+        /// </summary>
+        /// <returns></returns>
+        public static decimal GetQuantityOffset(object id)
+        {
+            decimal result = 0;
+            var model = GetPHTGL_ContractTrackById(id.ToString());
+            if (model != null)
+            {
+                result = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
+                         Funs.GetNewDecimalOrZero(model.SettledQuantity);
+            }
+
+            return result;
+
+        }
+        /// <summary>
+        /// 根据主键获取费用偏差
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static decimal GetAmountOffset(object id)
+        {
+            decimal result = 0;
+            var model = GetPHTGL_ContractTrackById(id.ToString());
+            if (model != null)
+            {
+                result =(model.EstimatedAmount??0 )- ( model.SettledAmount??0);
+            }
+
+            return result;
+        }
        public static ResponeData ImportData(string path, string contractid, string projectid)
        {
            var responeData = new ResponeData();