From 70a68e5e7abea01c2c2c46ba38afc02628811bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Fri, 29 May 2026 14:38:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?FO043=E6=94=B9FO043=5F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs index cd25126..3c8f6c8 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs @@ -1952,7 +1952,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP { var userName = users.FirstOrDefault(t => t.ID == sendUser.USER_ID)?.NAME; var notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", item.ID, item.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now, - DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043"); + DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_1"); notices.Add(notice); } } From 665411be7ab2b03801cd2b628195f320e62db8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sun, 31 May 2026 12:54:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E8=BE=A8=E8=AF=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SKController.cs | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index e886069..db13f1b 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -1623,7 +1623,11 @@ namespace APT.PP.WebApi.Controllers.Api { try { - var dtNow = DateTime.Now; + var dtNow = DateTime.Now; + if (filter.Parameter1 != null) + { + dtNow = DateTime.Parse(filter.Parameter1); + } var year = dtNow.Year; var month = dtNow.Month; var day = dtNow.Day; @@ -1645,7 +1649,7 @@ namespace APT.PP.WebApi.Controllers.Api var baseFilter = new BaseFilter(filter.GetOrgId()); baseFilter.IgnoreDataRule = true; baseFilter.SelectField = new string[] { "ID", "START_DATE", "END_DATE" }; //指定字段，包括导航属性 - Expression> expression = i => i.END_DATE.Value.Date == DateTime.Now.Date && i.STATUS == PFStandardStatus.Archived; + Expression> expression = i => i.END_DATE.Value.Date == dtNow.Date && i.STATUS == PFStandardStatus.Archived; List planTemps = this.GetOrderEntities(expression, baseFilter, "Nav_Requires").ToList(); var planIds = planTemps.Select(t => t.ID).ToList(); var newFilter = new BaseFilter(filter.GetOrgId()); @@ -2009,15 +2013,22 @@ namespace APT.PP.WebApi.Controllers.Api } } //车间级和班组级汇总给车间安全员 - var shopClass = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 15).ToList(); - if (shopClass.Any()) - { - var tempIds = shopClass.Select(t => t.ID).ToList(); - var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList(); - if (tempIds.Any()) + var shopClass = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 15).ToList(); + var shopIds = shopClass.Select(t=>t.ID).ToList(); + //可能只有班组，获取所有班组的车间 + var classDept = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 20).ToList(); + if (classDept != null && classDept.Any()) + { + var classIds = classDept.Select(t => t.ID).ToList(); + var tempShopIds = departs.Where(t => classIds.Contains(t.ID) && t.PARENT_ID!=null).Select(m=>(Guid)m.PARENT_ID).ToList(); + shopIds.AddRange(tempShopIds); + } + shopIds = shopIds.Distinct().ToList(); + //var classTempInfos = departs.Where(t => t.PARENT_ID != null && shopIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList(); + if (shopIds.Any()) { //每个车间汇总班组和车间 - foreach (var de in tempIds) + foreach (var de in shopIds) { //车间 var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == de && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员")); @@ -2069,21 +2080,25 @@ namespace APT.PP.WebApi.Controllers.Api var exsisRecird = identityResults.FirstOrDefault(t => t.IDENTIFY_EVALUATION_PLAN_ID == plan && t.APPLY_DEPARTMENT_ID == user.DEPARTMENT_ID && t.APPLY_USER_ID == user.ID && t.ISCOMPANY == SKIsStoreEnum.No); if (exsisRecird == null) { - var classIds = classTempInfos.Where(t => t.PARENT_ID == de).Select(t => t.ID).ToList(); + var classIds = departs.Where(t => t.PARENT_ID == de).Select(t => t.ID).ToList(); //departListIds.AddRange(classIds); var deTemp = ides.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == de); + if (deTemp == null) + { + deTemp = ides.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID!=null &&classIds.Contains((Guid)t.APPLY_DEPARTMENT_ID)); + } T_SK_RISK_IDENTIFY_RESULT result = new T_SK_RISK_IDENTIFY_RESULT(); result.ORG_ID = filter.OrgId; result.APPLY_DEPARTMENT_ID = user?.DEPARTMENT_ID; result.APPLY_USER_ID = user.ID; - result.IDENTIFY_ID = deTemp.ID; + result.IDENTIFY_ID = deTemp?.ID; result.IDENTIFY_EVALUATION_PLAN_ID = plan; result.YEAR = DateTime.Now.Year.ToString(); result.ISAUTO = true; result.ISCOMPANY = SKIsStoreEnum.No; - result.CONTENTS = deTemp.CONTENTS; - result.START_DATE = planTemp.START_DATE; - result.END_DATE = planTemp.END_DATE; + result.CONTENTS = deTemp?.CONTENTS; + result.START_DATE = planTemp?.START_DATE; + result.END_DATE = planTemp?.END_DATE; result.REQUIRE_ID = requre?.ID; results.Add(result); if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any()) @@ -2203,7 +2218,6 @@ namespace APT.PP.WebApi.Controllers.Api } } } - } } } } @@ -5182,7 +5196,7 @@ namespace APT.PP.WebApi.Controllers.Api if (set.MONTH == month && set.DATA == day) { setList.Add(set); - } + } break; case SKPLANCHECKFREQUENCYEnum.HalfYear: if ((set.MONTH == month && set.DATA == day) || ((set.MONTH + 6) == month && (set.DATA + 183) == day)) From 0cd08ff1cc996e143f6f3a3a711ddf61d73ca874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 1 Jun 2026 09:12:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=BB=E8=AE=A1=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/BIController/BIKanBanController.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs index 59088a2..a84f826 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -30,6 +30,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data; +using System.DirectoryServices.ActiveDirectory; using System.Linq; using System.Linq.Expressions; using static APT.SC.WebApi.Controllers.Api.BI.BIKanBanController; @@ -990,7 +991,16 @@ namespace APT.SC.WebApi.Controllers.Api.BI riskList.Add(risk); } } - result.Data.riskList = riskList.OrderByDescending(t=>t.totalCount).ToList(); + var riskListNew = riskList.OrderByDescending(t => t.totalCount).ToList(); + RiskList riskTotal = new RiskList(); + riskTotal.companyName = "小计"; + riskTotal.majorCount = riskList.Sum(t=>t.majorCount); + riskTotal.largerCount = riskList.Sum(t => t.largerCount); + riskTotal.generalCount = riskList.Sum(t => t.generalCount); + riskTotal.lowCount = riskList.Sum(t => t.lowCount); + riskTotal.totalCount = riskList.Sum(t => t.totalCount); + riskListNew.Add(riskTotal); + result.Data.riskList = riskListNew; result.Data.riskTypeList = riskTypeList; return result; From 696be4e13b9fb2b2072858aee5b9361139b5eb6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 1 Jun 2026 10:33:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/HiddenDangerRectifyRecordController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index c23370b..8ed0b79 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -650,9 +650,9 @@ namespace APT.SK.WebApi.Controllers { record.QTY = records.Count(p => p.PRODUCTION_UNIT_ID == record.PRODUCTION_UNIT_ID && p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.CHECK_QUESTION_ID == record.CHECK_QUESTION_ID && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL); } - var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenByDescending(m => m.QTY).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList(); + var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenByDescending(m => m.QTY).ToList();//.Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit) result.Data = data; - result.TotalCount = groupRecords.Count; + result.TotalCount = data.Count; } return result; }