2023-11-11

2023-11-11 16:02:42 +08:00
parent b2ffd4b8d0
commit 48dd589a7f
66 changed files with 2334 additions and 1232 deletions
@@ -50,17 +50,17 @@ namespace BLL
            if (count == 0) return null;
            // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
            return from x in q
-                select new
-                {
-                    x.Id,
-                    x.ProjectId,
-                    x.UnitId,
-                    x.CollCropCode,
-                    x.UnitName,
-                    x.ReportDate,
-                    x.DefectName,
-                    x.DefectNum
-                };
+                   select new
+                   {
+                       x.Id,
+                       x.ProjectId,
+                       x.UnitId,
+                       x.CollCropCode,
+                       x.UnitName,
+                       x.ReportDate,
+                       x.DefectName,
+                       x.DefectNum
+                   };
        }

        #endregion
@@ -80,80 +80,99 @@ namespace BLL
            string projectid)
        {
            var q = from x in db.Project_HJGLData_Defect
-                where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid
-                select x;
+                    where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid
+                    select x;
            return q.ToList();
        }

        public static void AddProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
        {
-            var table = new Project_HJGLData_Defect
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
-                Id = newtable.Id,
-                ProjectId = newtable.ProjectId,
-                UnitId = newtable.UnitId,
-                CollCropCode = newtable.CollCropCode,
-                UnitName = newtable.UnitName,
-                ReportDate = newtable.ReportDate,
-                DefectName = newtable.DefectName,
-                DefectNum = newtable.DefectNum
-            };
-            db.Project_HJGLData_Defect.InsertOnSubmit(table);
-            db.SubmitChanges();
+                var table = new Project_HJGLData_Defect
+                {
+                    Id = newtable.Id,
+                    ProjectId = newtable.ProjectId,
+                    UnitId = newtable.UnitId,
+                    CollCropCode = newtable.CollCropCode,
+                    UnitName = newtable.UnitName,
+                    ReportDate = newtable.ReportDate,
+                    DefectName = newtable.DefectName,
+                    DefectNum = newtable.DefectNum
+                };
+                db.Project_HJGLData_Defect.InsertOnSubmit(table);
+                db.SubmitChanges();
+            } 
        }

        public static void AddBulkProject_HJGLData_Defect(List<Project_HJGLData_Defect> newtables)
        {
-            db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
-            db.SubmitChanges();
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
+                db.SubmitChanges();
+            }
        }

        public static void UpdateProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
        {
-            var table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == newtable.Id);
-            if (table != null)
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
-                table.Id = newtable.Id;
-                table.ProjectId = newtable.ProjectId;
-                table.UnitId = newtable.UnitId;
-                table.CollCropCode = newtable.CollCropCode;
-                table.UnitName = newtable.UnitName;
-                table.ReportDate = newtable.ReportDate;
-                table.DefectName = newtable.DefectName;
-                table.DefectNum = newtable.DefectNum;
-                db.SubmitChanges();
+                var table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == newtable.Id);
+                if (table != null)
+                {
+                    table.Id = newtable.Id;
+                    table.ProjectId = newtable.ProjectId;
+                    table.UnitId = newtable.UnitId;
+                    table.CollCropCode = newtable.CollCropCode;
+                    table.UnitName = newtable.UnitName;
+                    table.ReportDate = newtable.ReportDate;
+                    table.DefectName = newtable.DefectName;
+                    table.DefectNum = newtable.DefectNum;
+                    db.SubmitChanges();
+                }
            }
        }

        public static void DeleteProject_HJGLData_DefectById(string Id)
        {
-            var table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == Id);
-            if (table != null)
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
-                db.Project_HJGLData_Defect.DeleteOnSubmit(table);
-                db.SubmitChanges();
+                var table = db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == Id);
+                if (table != null)
+                {
+                    db.Project_HJGLData_Defect.DeleteOnSubmit(table);
+                    db.SubmitChanges();
+                }
            }
        }

        public static void DeleteProject_HJGLData_DefectByDate(DateTime? reportDate)
        {
-            var table = db.Project_HJGLData_Defect.Where(x =>
-                x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
-            if (table != null)
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
-                db.Project_HJGLData_Defect.DeleteAllOnSubmit(table);
-                db.SubmitChanges();
+                var table = db.Project_HJGLData_Defect.Where(x =>
+                    x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
+                if (table != null)
+                {
+                    db.Project_HJGLData_Defect.DeleteAllOnSubmit(table);
+                    db.SubmitChanges();
+                }
            }
+            
        }

        public static void DeleteProject_HJGLData_DefectByDate(DateTime? reportDate, string projectid)
        {
-            var table = db.Project_HJGLData_Defect.Where(x =>
-                x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid);
-            if (table != null)
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
-                db.Project_HJGLData_Defect.DeleteAllOnSubmit(table);
-                db.SubmitChanges();
+                var table = db.Project_HJGLData_Defect.Where(x =>
+                    x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid);
+                if (table != null)
+                {
+                    db.Project_HJGLData_Defect.DeleteAllOnSubmit(table);
+                    db.SubmitChanges();
+                }
            }
        }

@@ -165,9 +184,9 @@ namespace BLL
        {
            var result = false;
            var q = (from x in Funs.DB.Project_HJGLData_Defect
-                where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
-                      x.ProjectId == projectid && x.DefectName == type
-                select x).ToList();
+                     where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
+                           x.ProjectId == projectid && x.DefectName == type
+                     select x).ToList();
            if (q != null && q.Count > 0) result = true;
            return result;
        }
@@ -180,24 +199,24 @@ namespace BLL
        public static Project_HJGLData_Defect getTodayProject_HJGLData_Defect(string projectid, string type)
        {
            var q = (from x in Funs.DB.Project_HJGLData_Defect
-                where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
-                      x.ProjectId == projectid && x.DefectName == type
-                select x).FirstOrDefault();
+                     where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
+                           x.ProjectId == projectid && x.DefectName == type
+                     select x).FirstOrDefault();
            return q;
        }

        public static List<HJGLDataDefectItems> getTodayProject_HJGLData_Defect()
        {
            var q = (from x in Funs.DB.Project_HJGLData_Defect
-                where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
-                group x by x.DefectName
+                     where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
+                     group x by x.DefectName
                into g
-                select new HJGLDataDefectItems
-                {
-                    Id = SQLHelper.GetNewID(),
-                    DefectName = g.Key,
-                    DefectNum = g.Sum(p => p.DefectNum)
-                }).ToList();
+                     select new HJGLDataDefectItems
+                     {
+                         Id = SQLHelper.GetNewID(),
+                         DefectName = g.Key,
+                         DefectNum = g.Sum(p => p.DefectNum)
+                     }).ToList();
            return q;
        }

@@ -215,19 +234,19 @@ namespace BLL
            var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
            var data = (from x in db.CH_CheckItem
                        join y in db.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-                where projectids.Contains(y.ProjectId)
-                group x by new { x.Defects_Definition, y.ProjectId }
+                        where projectids.Contains(y.ProjectId)
+                        group x by new { x.Defects_Definition, y.ProjectId }
                into g
-                select new
-                {
-                    UnitId = thisUnitId,
-                    CollCropCode = baseUnit.CollCropCode,
-                    UnitName = baseUnit.UnitName,
-                    ProjectId = g.Key.ProjectId,
-                    ReportDate = DateTime.Now.Date,
-                    DefectName = g.Key.Defects_Definition,
-                    DefectNum = g.Count(x => x.Defects_Definition == g.Key.Defects_Definition)
-                }).ToList();
+                        select new
+                        {
+                            UnitId = thisUnitId,
+                            CollCropCode = baseUnit.CollCropCode,
+                            UnitName = baseUnit.UnitName,
+                            ProjectId = g.Key.ProjectId,
+                            ReportDate = DateTime.Now.Date,
+                            DefectName = g.Key.Defects_Definition,
+                            DefectNum = g.Count(x => x.Defects_Definition == g.Key.Defects_Definition)
+                        }).ToList();
            DeleteProject_HJGLData_DefectByDate(DateTime.Now.Date); //删除当前所有
            var projectHjglDataDefect = new List<Project_HJGLData_Defect>();
            foreach (var item in data
@@ -261,9 +280,9 @@ namespace BLL
            if (thisUnit != null) thisUnitId = thisUnit.UnitId;
            var base_Unit = UnitService.GetUnitByUnitId(thisUnitId);
            var list = from x in db.CH_CheckItem
-                join y in db.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-                where y.ProjectId == projectid
-                select x;
+                       join y in db.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
+                       where y.ProjectId == projectid
+                       select x;
            var types = (from x in list select x.Defects_Definition).Distinct().ToList();
            foreach (var t in types)
                if (!string.IsNullOrEmpty(t))