Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/BLL/Common/Funs.cs

@@ -1396,6 +1396,8 @@ namespace BLL
             client.Timeout = -1;
             var request = new RestRequest(Method.GET);
             request.AddHeader("token", Token);
+            request.AddHeader("ClientId", SysConstSetService.ClientId);
+            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
             IRestResponse response = client.Execute(request);
             Console.WriteLine(response.Content);
             return response.Content;
@@ -1409,7 +1411,7 @@ namespace BLL
             var request = new RestRequest(Method.POST);
             request.AddHeader("token", Token);
             request.AddHeader("ClientId", SysConstSetService.ClientId);
-            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal)+1));
+            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
             if (!string.IsNullOrEmpty(JsonBody))
             {
                 request.AddJsonBody(JsonBody);

SGGL/BLL/DigData/HTGLDataDWService.cs

@@ -36,7 +36,7 @@ namespace BLL
         /// <param name="endTime"></param>
         /// <param name="Grid1"></param>
         /// <returns></returns>
-        public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1)
+        public static IEnumerable getDataDWList( string projectId, Grid Grid1)
         {
             var getDataList = from x in Funs.DB.Base_Project select x;
             if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null)
@@ -56,10 +56,29 @@ namespace BLL
                        x.ProjectId,
                        x.ProjectName,
                        x.ProjectCode,
-                       Count1=0, 
+                       Count1= getTotalProfit(x.ProjectId), 
                    };
         }
         #endregion
 
+        public static string getTotalProfit(string projectId)
+        {
+            decimal contractAmount = 0;
+            var getContract = Funs.DB.PHTGL_Contract.Where(x => x.ProjectId == projectId);
+            if (getContract.Count() > 0)
+            {
+                contractAmount = getContract.Sum(x => x.ContractAmount ?? 0);
+            }        
+
+            decimal estimatedAmount = 0;
+            var getContractTrack = Funs.DB.PHTGL_ContractTrack.Where(x => x.ProjectId == projectId);
+            if (getContractTrack.Count() > 0)
+            {
+                estimatedAmount = getContractTrack.Sum(x => x.EstimatedAmount ?? 0);
+            }           
+
+           return estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount).ToString() + "%" : "0%";
+
+        }
     }
 }

SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs

@@ -105,7 +105,10 @@ namespace BLL
 
         public static Model.HJGL_PackagingManage GetHJGL_PackagingManageById(string PackagingManageId)
         {
-            return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId);
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId);
+            }
         }
         public static string GetMinPlanStartDate(string PackagingManageId)
         {

SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs

@@ -38,7 +38,8 @@ namespace BLL
                 WorkContent = newtable.WorkContent,
                 Remarks = newtable.Remarks,
                 IsTemplate = newtable.IsTemplate,
-                ParentId = newtable.ParentId
+                ParentId = newtable.ParentId,
+                SerialNumber = newtable.SerialNumber
             };
             Funs.DB.PHTGL_Quantity.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
@@ -68,7 +69,8 @@ namespace BLL
                 WorkContent = newtable.WorkContent,
                 Remarks = newtable.Remarks,
                 IsTemplate = false,
-                ParentId = parentId
+                ParentId = parentId,
+                SerialNumber = newtable.SerialNumber
             };
             Funs.DB.PHTGL_Quantity.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
@@ -96,6 +98,7 @@ namespace BLL
                 table.Remarks = newtable.Remarks;
                 table.IsTemplate = newtable.IsTemplate;
                 table.ParentId = newtable.ParentId;
+                table.SerialNumber = newtable.SerialNumber;
                 Funs.DB.SubmitChanges();
             }
         }
@@ -278,34 +281,37 @@ namespace BLL
         public static List<PHTGL_Quantity> GetPHTGL_QuantityByModle(PHTGL_Quantity table)
         {
             var q = from x in Funs.DB.PHTGL_Quantity
-                    where
-                        (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
-                        (string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) &&
-                        (string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) &&
-                        (string.IsNullOrEmpty(table.SubItemProject) ||
-                         x.SubItemProject.Contains(table.SubItemProject)) &&
-                        (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) &&
-                        (string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) &&
-                        (string.IsNullOrEmpty(table.ProjectDescription) ||
-                         x.ProjectDescription.Contains(table.ProjectDescription)) &&
-                        (string.IsNullOrEmpty(table.UnitOfMeasurement) ||
-                         x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) &&
-                        (string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) &&
-                        (string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) ||
-                         x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) &&
-                        (string.IsNullOrEmpty(table.MainMaterialCost) ||
-                         x.MainMaterialCost.Contains(table.MainMaterialCost)) &&
-                        (string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) &&
-                        (string.IsNullOrEmpty(table.CalculationRule) ||
-                         x.CalculationRule.Contains(table.CalculationRule)) &&
-                        (string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) &&
-                        (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) &&
-                        x.IsTemplate == table.IsTemplate && 
-                        (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId))
-                    select x
-                ;
+                where
+                    (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
+                    (string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) &&
+                    (string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) &&
+                    (string.IsNullOrEmpty(table.SubItemProject) ||
+                     x.SubItemProject.Contains(table.SubItemProject)) &&
+                    (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) &&
+                    (string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) &&
+                    (string.IsNullOrEmpty(table.ProjectDescription) ||
+                     x.ProjectDescription.Contains(table.ProjectDescription)) &&
+                    (string.IsNullOrEmpty(table.UnitOfMeasurement) ||
+                     x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) &&
+                    (string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) &&
+                    (string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) ||
+                     x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) &&
+                    (string.IsNullOrEmpty(table.MainMaterialCost) ||
+                     x.MainMaterialCost.Contains(table.MainMaterialCost)) &&
+                    (string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) &&
+                    (string.IsNullOrEmpty(table.CalculationRule) ||
+                     x.CalculationRule.Contains(table.CalculationRule)) &&
+                    (string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) &&
+                    (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) &&
+                    x.IsTemplate == table.IsTemplate &&
+                    (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId))
+                   
+                    select new  { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", ""))
+                        }
 
-            return q.ToList();
+                ; 
+            var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx =>  itemx.x).ToList();
+            return model;
         }
 
         /// 获取分页列表
@@ -324,6 +330,7 @@ namespace BLL
                 select new
                 {
                     x.Id,
+                    x.SerialNumber,
                     x.Major,
                     x.SubProject,
                     x.SubItemProject,
@@ -348,7 +355,7 @@ namespace BLL
 
     public class PHTGL_QuantityDtoIn
     {
-        [ExcelColumnIndex("A")] public string Major { get; set; }
+        [ExcelColumnIndex("A")] public string SerialNumber { get; set; }
         [ExcelColumnIndex("B")] public string SubProject { get; set; }
 
         [ExcelColumnIndex("C")] public string SubItemProject { get; set; }