Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

APT.Data.Migrations/Migrations/20260522093927_hmr2026052201.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2026052201 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IS_RECORD",
+                table: "T_FO_PRE_SHIFT_MEETING_RECORD",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IS_RECORD",
+                table: "T_FO_PRE_SHIFT_MEETING_RECORD");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -37523,6 +37523,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IS_RECORD")
+                        .HasColumnType("bit");
+
                     b.Property<int>("IS_RUN")
                         .HasColumnType("int");
 

APT.MS.Domain/Entities/FO/T_FO_PRE_SHIFT_MEETING_RECORD.cs

@@ -204,8 +204,10 @@ namespace APT.MS.Domain.Entities.FO
 
         [Description("导航：上班生产情况")]
         [FormFieldEdit]
-        public ICollection<T_FO_PRE_SHIFT_MEETING_RECORD_DETAIL> Nav_Details { get; set; }
+        public ICollection<T_FO_PRE_SHIFT_MEETING_RECORD_DETAIL> Nav_Details { get; set; }
-
+
+        [Description("是否触发岗位当班记录")]
 
+        public bool IS_RECORD { get; set; } = false;
     }
 }

APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs

@@ -893,7 +893,7 @@ namespace APT.FO.WebApi.Controllers
                     approveId = null;
                 }
             }
-            else if (roleIds.Contains((Guid)approveTempDetail.APPROVE_ROLE_ID))
+            else if (approveTempDetail.APPROVE_ROLE_ID != null && roleIds.Contains((Guid)approveTempDetail.APPROVE_ROLE_ID))
             {
                 if (entity.TERRITORY_DEPARTMENT_ID != null)
                 {

APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs

@@ -201,11 +201,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                                 {
                                     var currCalendarID = currCalendar.CALENDAR_ID;
                                     var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(t => t.TEAM_ID == entity.CLASS_TEAM_ID && t.IS_DELETED == false, "Nav_DepartmentCalendarConfig");
-                                    if (currDepartmentConfig.Nav_DepartmentCalendarConfig == null)
+                                    if (currDepartmentConfig==null || currDepartmentConfig.Nav_DepartmentCalendarConfig == null)
                                     {
-                                        throw new Exception("未找到排班数据!");
+                                        //throw new Exception("未找到排班数据!");
                                     }
-                                    if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
+                                    if (currDepartmentConfig != null && currDepartmentConfig.Nav_DepartmentCalendarConfig != null&& currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
                                     {
                                         var searchFilter = new BaseFilter(entity.ORG_ID);
                                         searchFilter.SelectField = new string[] { "TEAM_ID", "PERSON_ID", "Nav_Person.Nav_Post", "Nav_Person.Nav_User", "Nav_DepartmentScheduling" };

APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs

@@ -13,6 +13,7 @@ using APT.MS.Domain.Enums;
 using APT.MS.Domain.Enums.SK;
 using APT.Utility;
 using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -54,7 +55,16 @@ namespace APT.FO.WebApi.Controllers
                 if (entity != null)
                 {
                     var details = this.GetEntities<T_FO_FIRE_JOB_DETAIL>(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList();
+                    
                     entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList();
+                    if (entity.FIRE_STATUS.GetInt() <= 15)
+                    {
+                        entity.Nav_Details = entity.Nav_Details.Where(t => t.JOB_STEP == FOJobStepEnum.Pre).OrderBy(m => m.NUM).ToList();
+                    }
+                    else if (entity.FIRE_STATUS.GetInt() <= 21)
+                    {
+                        entity.Nav_Details = entity.Nav_Details.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList();
+                    }
                     var users = this.GetEntities<T_FO_FIRE_JOB_USER>(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_UserType", "Nav_Train", "Nav_UserFiles.Nav_ImgFile", "Nav_User").ToList();
                     entity.Nav_Users = users.ToList();
                 }
@@ -137,8 +147,10 @@ namespace APT.FO.WebApi.Controllers
                     details = details.Where(t => !t.IS_DELETED).ToList();
                 }
                 entity.Nav_Details = null;
-                var detailIds = this.GetEntities<T_FO_FIRE_JOB_DETAIL>(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
+                var detailInfos = this.GetEntities<T_FO_FIRE_JOB_DETAIL>(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID)).ToList();
-                var detailFileIds = this.GetEntities<T_FO_FIRE_JOB_DETAIL_FILE>(t => detailIds.Contains(t.FIRE_JOB_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
+                var detailIds = detailInfos.Select(m => m.ID).ToList();
+                var detailFileInfos = this.GetEntities<T_FO_FIRE_JOB_DETAIL_FILE>(t => detailIds.Contains(t.FIRE_JOB_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList();
+                var detailFileIds = detailFileInfos.Select(m => m.ID).ToList();
                 var detailList = new List<T_FO_FIRE_JOB_DETAIL>();
                 var detailFileList = new List<T_FO_FIRE_JOB_DETAIL_FILE>();
                 if (details != null && details.Any())
@@ -341,8 +353,13 @@ namespace APT.FO.WebApi.Controllers
                         //if (monitorFileList == null || !monitorFileList.Any())
                         //    throw new Exception("必须上传完工验收附件");
                         var detailNeed = detailList.FirstOrDefault(t => (t.JOB_STEP == FOJobStepEnum.Ing && t.IS_CONFIRM_NEW == false) || (t.JOB_STEP == FOJobStepEnum.After && t.IS_CONFIRM_NEW == false));
-                        if (detailNeed != null)
+                        //if (detailNeed != null)
-                            throw new Exception("作业中或作业后未全部确认！");
+                        //    throw new Exception("作业中或作业后未全部确认！");
+                        //作业前不删
+                        var noDeleteIds = detailInfos.Where(t => t.JOB_STEP == FOJobStepEnum.Pre).Select(t => t.ID).ToList();
+                        detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList();
+                        var noDeleteFileIds = detailFileInfos.Where(t => noDeleteIds.Contains(t.FIRE_JOB_DETAIL_ID)).Select(t => t.ID).ToList();
+                        detailFileIds = detailFileIds.Where(t => !noDeleteFileIds.Contains(t)).ToList();
                         //触发给动火部门负责人、安全管理人员审阅
                         var sendUser = this.GetEntities<T_FM_USER>(t => t.ID == entity.FIRE_USER_ID || t.ID == entity.SAFE_USER_ID, new BaseFilter(entity.ORG_ID)).ToList();
                         if (sendUser != null && sendUser.Any())
@@ -375,6 +392,11 @@ namespace APT.FO.WebApi.Controllers
                         var detailNeed = detailList.FirstOrDefault(t => t.JOB_STEP == FOJobStepEnum.Pre && t.IS_CONFIRM_NEW == false);
                         if (detailNeed != null)
                             throw new Exception("作业前未全部确认！");
+                        //作业中后不删
+                        var noDeleteIds = detailInfos.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).Select(t => t.ID).ToList();
+                        detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList();
+                        var noDeleteFileIds = detailFileInfos.Where(t => noDeleteIds.Contains(t.FIRE_JOB_DETAIL_ID)).Select(t => t.ID).ToList();
+                        detailFileIds = detailFileIds.Where(t => !noDeleteFileIds.Contains(t)).ToList();
                         //触发给动火部门负责人、安全管理人员、矿调度人员审阅
                         var sendUser = this.GetEntities<T_FM_USER>(t => t.ID == entity.FIRE_USER_ID || t.ID == entity.SAFE_USER_ID || t.ID == entity.DISPATCH_USER_ID, new BaseFilter(entity.ORG_ID)).ToList();
                         if (sendUser != null && sendUser.Any())
@@ -403,6 +425,11 @@ namespace APT.FO.WebApi.Controllers
                     }
                     else
                     {
+                        //作业中后不删
+                        var noDeleteIds = detailInfos.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).Select(t => t.ID).ToList();
+                        detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList();
+                        var noDeleteFileIds = detailFileInfos.Where(t => noDeleteIds.Contains(t.FIRE_JOB_DETAIL_ID)).Select(t => t.ID).ToList();
+                        detailFileIds = detailFileIds.Where(t => !noDeleteFileIds.Contains(t)).ToList();
                         //触发审批
                         entity.STATUS = BaseData.Domain.Enums.PF.PFStandardStatus.Approving;
                         entity.FIRE_STATUS = FOFireStatus.Approving;
@@ -519,6 +546,7 @@ namespace APT.FO.WebApi.Controllers
             return SafeExecute(() =>
             {
                 var fire = this.GetEntity<T_FO_FIRE_JOB>(entity.ID);
+                var detailList = new List<T_FO_FIRE_JOB_DETAIL>();
                 var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
                 if (entity.TaskID != Guid.Empty)
                 {

APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs

@@ -271,9 +271,9 @@ namespace APT.FO.WebApi.Controllers
                     {
                         throw new Exception("接班人不能为空");
                     }
-                    if (!details.Any())
+                    if (!detailList.Any())
                     {
-                        throw new Exception("明细行至少填写一行，且现场责任人不能为空");
+                        throw new Exception("明细行至少填写一行");
                     }
                     var allUsers = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(entity.ORG_ID));
                     var sendUserIds = userList.Where(t => t.USER_ID != loginUserId && t.USER_ID != null).Select(m => (Guid)m.USER_ID).Distinct().ToList();

APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs

@@ -102,6 +102,7 @@ namespace APT.FO.WebApi.Controllers
                 if (files != null && files.Any())
                 {
                     files = files.Where(t => !t.IS_DELETED).ToList();
+                    files.ForEach(t => t.TECH_DISCLOSURE_FROM_ID = entity.ID);
                 }
                 entity.Nav_Files = null;
                 List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();

APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs

@@ -1,142 +1,151 @@
- 
+
- 
+
- 
+ 
-  
+
-
+
-
+
-
+ 
-
+ 
-
+  
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-//------------------------------------------------------------------------------
+
-//     T4模板文件：基础接口类
+
-//     此代码由T4模板自动生成
+
-//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+
-//------------------------------------------------------------------------------
+
-using APT.Infrastructure.Core;
+
-using Microsoft.AspNetCore.Mvc;
+//------------------------------------------------------------------------------
-using System.Collections.Generic;
+//     T4模板文件：基础接口类
-using APT.Utility;
+//     此代码由T4模板自动生成
-using APT.Infrastructure.Api;
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using APT.BaseData.Domain.ApiModel.PF;
+//------------------------------------------------------------------------------
-namespace APT.LG.WebApi.Controllers.Api
+using APT.Infrastructure.Core;
-{
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using APT.Utility;
+using APT.Infrastructure.Api;
+using APT.BaseData.Domain.ApiModel.PF;
+namespace APT.LG.WebApi.Controllers.Api
+{
 	using APT.BaseData.Domain.Entities.LG;
-
+
-	#region  Oprate-表单操作日志表
+
-	/// <summary>
+	#region  Oprate-表单操作日志表
-    ///  表单操作日志表
+	/// <summary>
-    /// </summary>
+    ///  表单操作日志表
-	[Route("api/LG/Oprate")]
+    /// </summary>
-    public partial class OprateController : AuthorizeApiController<T_LG_OPRATE>
+	[Route("api/LG/Oprate")]
-    {   
+    public partial class OprateController : AuthorizeApiController<T_LG_OPRATE>
-       /// <summary>
+    {   
-       /// 查询所有数据
+       /// <summary>
-       /// </summary>
+       /// 查询所有数据
-       /// <param name="filter">过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="filter">过滤实体</param>
-       [HttpPost, Route("Entities")]
+       /// <returns></returns>
-       public JsonActionResult<IEnumerable<T_LG_OPRATE>> Entities([FromBody]KeywordFilter filter)
+       [HttpPost, Route("Entities")]
-       {
+       public JsonActionResult<IEnumerable<T_LG_OPRATE>> Entities([FromBody]KeywordFilter filter)
-           return WitEntities(null, filter);
+       {
-       }
+           return WitEntities(null, filter);
-
+       }
-        /// <summary>
+
-       /// 排序查询所有数据
+        /// <summary>
-       /// </summary>
+       /// 排序查询所有数据
-       /// <param name="filter">过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="filter">过滤实体</param>
-
+       /// <returns></returns>
-       [HttpPost, Route("OrderEntities")]
+
-       public JsonActionResult<IEnumerable<T_LG_OPRATE>> OrderEntities([FromBody]KeywordFilter filter)
+       [HttpPost, Route("OrderEntities")]
-       {
+       public JsonActionResult<IEnumerable<T_LG_OPRATE>> OrderEntities([FromBody]KeywordFilter filter)
-           return WitOrderEntities(null, filter);
+       {
-       }
+           return WitOrderEntities(null, filter);
-
+       }
-       /// <summary>
+
-       /// 分页查询数据
+       /// <summary>
-       /// </summary>
+       /// 分页查询数据
-       /// <param name="pageFilter">分页过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="pageFilter">分页过滤实体</param>
-       [HttpPost, Route("Paged")]
+       /// <returns></returns>
-       public PagedActionResult<T_LG_OPRATE> Paged([FromBody]KeywordPageFilter pageFilter)
+       [HttpPost, Route("Paged")]
-       {
+       public PagedActionResult<T_LG_OPRATE> Paged([FromBody]KeywordPageFilter pageFilter)
-           return WitPaged(null, pageFilter);
+       {
-       }
+           return WitPaged(null, pageFilter);
-
+       }
-       /// <summary>
+
-       /// 排序分页查询数据
+       /// <summary>
-       /// </summary>
+       /// 排序分页查询数据
-       /// <param name="pageFilter">分页过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="pageFilter">分页过滤实体</param>
-       [HttpPost, Route("OrderPaged")]
+       /// <returns></returns>
-       public PagedActionResult<T_LG_OPRATE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
+       [HttpPost, Route("OrderPaged")]
-       {
+       public PagedActionResult<T_LG_OPRATE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
-           return WitOrderPaged(null, pageFilter);
+       {
-       }
+           return WitOrderPaged(null, pageFilter);
-
+       }
-       /// <summary>
+
-       /// 根据主键删除数据
+       /// <summary>
-       /// </summary>
+       /// 根据主键删除数据
-       /// <param name="id">主键ID</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="id">主键ID</param>
-       [HttpGet, Route("Delete")]
+       /// <returns></returns>
-       public JsonActionResult<bool> Delete(string id)
+       [HttpGet, Route("Delete")]
-       {
+       public JsonActionResult<bool> Delete(string id)
-           return WitRealDelete(id);
+       {
-       }
+           return WitRealDelete(id);
-
+       }
-       /// <summary>
+
-       /// 更新或新增数据
+       /// <summary>
-       /// </summary>
+       /// 更新或新增数据
-       /// <param name="entity">对象实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="entity">对象实体</param>
-       [HttpPost, Route("Update")]
+       /// <returns></returns>
-       public JsonActionResult<bool> Update([FromBody]T_LG_OPRATE entity)
+       [HttpPost, Route("Update")]
-       {
+       public JsonActionResult<bool> Update([FromBody]T_LG_OPRATE entity)
-           return WitUpdate(entity);
+       {
-       }
+           return WitUpdate(entity);
-
+       }
-       /// <summary>
+
-       /// 批量更新
+       /// <summary>
-       /// </summary>
+       /// 批量更新
-       /// <param name="entity">对象实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="entity">对象实体</param>
-       [HttpPost, Route("BatchUpdate")]
+       /// <returns></returns>
-       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_LG_OPRATE> entity)
+       [HttpPost, Route("BatchUpdate")]
-       {
+       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_LG_OPRATE> entity)
-             return WitBantchUpdate(entity?.Data);
+       {
-       }
+             return WitBantchUpdate(entity?.Data);
-
+       }
-       /// <summary>
+
-       /// 批量删除数据
+       /// <summary>
-       /// </summary>
+       /// 批量删除数据
-       /// <param name="ids">id字符串（id用逗号分隔）</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="ids">id字符串（id用逗号分隔）</param>
-       [HttpGet, Route("BatchDelete")]
+       /// <returns></returns>
-       public JsonActionResult<bool> BatchDelete(string ids)
+       [HttpGet, Route("BatchDelete")]
-       {
+       public JsonActionResult<bool> BatchDelete(string ids)
-           return WitRealBatchDelete(ids);
+       {
-       }
+           return WitRealBatchDelete(ids);
-
+       }
-       /// <summary>
+
-       /// 获得单条实体数据
+       /// <summary>
-       /// </summary>
+       /// 获得单条实体数据
-       /// <param name="filter">过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="filter">过滤实体</param>
-       [HttpPost, Route("Get")]
+       /// <returns></returns>
-       public JsonActionResult<T_LG_OPRATE> Get([FromBody] KeywordFilter filter)
+       [HttpPost, Route("Get")]
-       {
+       public JsonActionResult<T_LG_OPRATE> Get([FromBody] KeywordFilter filter)
-           return WitEntity(null, filter);
+       {
-       }
+           return WitEntity(null, filter);
-
+       }
-       
+
-    }
+       
-	#endregion
+
- }
+    }
+	#endregion
+
+ }

APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs

@@ -1,381 +1,395 @@
- 
+
- 
+
- 
+ 
-  
+
-
+
-
+
-
+ 
-
+ 
-
+  
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-//------------------------------------------------------------------------------
+
-//     T4模板文件：基础接口类
+
-//     此代码由T4模板自动生成
+
-//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+
-//------------------------------------------------------------------------------
+
-using APT.Infrastructure.Core;
+
-using Microsoft.AspNetCore.Mvc;
+//------------------------------------------------------------------------------
-using System.Collections.Generic;
+//     T4模板文件：基础接口类
-using APT.Utility;
+//     此代码由T4模板自动生成
-using APT.Infrastructure.Api;
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using APT.BaseData.Domain.ApiModel.PF;
+//------------------------------------------------------------------------------
-namespace APT.NW.WebApi.Controllers.Api
+using APT.Infrastructure.Core;
-{
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using APT.Utility;
+using APT.Infrastructure.Api;
+using APT.BaseData.Domain.ApiModel.PF;
+namespace APT.NW.WebApi.Controllers.Api
+{
 	using APT.BaseData.Domain.Entities.NW;
-
+
-
+
-	#region  Enterprise-子企业表
+
-	/// <summary>
+	#region  Enterprise-子企业表
-    ///  子企业表
+	/// <summary>
-    /// </summary>
+    ///  子企业表
-	[Route("api/NW/Enterprise")]
+    /// </summary>
-    public partial class EnterpriseController : AuthorizeTreeApiController<T_NW_ENTERPRISE>
+	[Route("api/NW/Enterprise")]
-    {   
+    public partial class EnterpriseController : AuthorizeTreeApiController<T_NW_ENTERPRISE>
-       /// <summary>
+    {   
-       /// 查询所有数据
+       /// <summary>
-       /// </summary>
+       /// 查询所有数据
-       /// <param name="filter">过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="filter">过滤实体</param>
-       [HttpPost, Route("Entities")]
+       /// <returns></returns>
-       public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> Entities([FromBody]KeywordFilter filter)
+       [HttpPost, Route("Entities")]
-       {
+       public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> Entities([FromBody]KeywordFilter filter)
-           return WitEntities(null, filter);
+       {
-       }
+           return WitEntities(null, filter);
-
+       }
-        /// <summary>
+
-       /// 排序查询所有数据
+        /// <summary>
-       /// </summary>
+       /// 排序查询所有数据
-       /// <param name="filter">过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="filter">过滤实体</param>
-
+       /// <returns></returns>
-       [HttpPost, Route("OrderEntities")]
+
-       public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> OrderEntities([FromBody]KeywordFilter filter)
+       [HttpPost, Route("OrderEntities")]
-       {
+       public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> OrderEntities([FromBody]KeywordFilter filter)
-           return WitOrderEntities(null, filter);
+       {
-       }
+           return WitOrderEntities(null, filter);
-
+       }
-       /// <summary>
+
-       /// 分页查询数据
+       /// <summary>
-       /// </summary>
+       /// 分页查询数据
-       /// <param name="pageFilter">分页过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="pageFilter">分页过滤实体</param>
-       [HttpPost, Route("Paged")]
+       /// <returns></returns>
-       public PagedActionResult<T_NW_ENTERPRISE> Paged([FromBody]KeywordPageFilter pageFilter)
+       [HttpPost, Route("Paged")]
-       {
+       public PagedActionResult<T_NW_ENTERPRISE> Paged([FromBody]KeywordPageFilter pageFilter)
-           return WitPaged(null, pageFilter);
+       {
-       }
+           return WitPaged(null, pageFilter);
-
+       }
-       /// <summary>
+
-       /// 排序分页查询数据
+       /// <summary>
-       /// </summary>
+       /// 排序分页查询数据
-       /// <param name="pageFilter">分页过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="pageFilter">分页过滤实体</param>
-       [HttpPost, Route("OrderPaged")]
+       /// <returns></returns>
-       public PagedActionResult<T_NW_ENTERPRISE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
+       [HttpPost, Route("OrderPaged")]
-       {
+       public PagedActionResult<T_NW_ENTERPRISE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
-           return WitOrderPaged(null, pageFilter);
+       {
-       }
+           return WitOrderPaged(null, pageFilter);
-
+       }
-       /// <summary>
+
-       /// 根据主键删除数据
+       /// <summary>
-       /// </summary>
+       /// 根据主键删除数据
-       /// <param name="id">主键ID</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="id">主键ID</param>
-       [HttpGet, Route("Delete")]
+       /// <returns></returns>
-       public JsonActionResult<bool> Delete(string id)
+       [HttpGet, Route("Delete")]
-       {
+       public JsonActionResult<bool> Delete(string id)
-           return WitRealDelete(id);
+       {
-       }
+           return WitRealDelete(id);
-
+       }
-       /// <summary>
+
-       /// 更新或新增数据
+       /// <summary>
-       /// </summary>
+       /// 更新或新增数据
-       /// <param name="entity">对象实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="entity">对象实体</param>
-       [HttpPost, Route("Update")]
+       /// <returns></returns>
-       public JsonActionResult<bool> Update([FromBody]T_NW_ENTERPRISE entity)
+       [HttpPost, Route("Update")]
-       {
+       public JsonActionResult<bool> Update([FromBody]T_NW_ENTERPRISE entity)
-           return WitUpdate(entity);
+       {
-       }
+           return WitUpdate(entity);
-
+       }
-       /// <summary>
+
-       /// 批量更新
+       /// <summary>
-       /// </summary>
+       /// 批量更新
-       /// <param name="entity">对象实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="entity">对象实体</param>
-       [HttpPost, Route("BatchUpdate")]
+       /// <returns></returns>
-       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ENTERPRISE> entity)
+       [HttpPost, Route("BatchUpdate")]
-       {
+       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ENTERPRISE> entity)
-             return WitBantchUpdate(entity?.Data);
+       {
-       }
+             return WitBantchUpdate(entity?.Data);
-
+       }
-       /// <summary>
+
-       /// 批量删除数据
+       /// <summary>
-       /// </summary>
+       /// 批量删除数据
-       /// <param name="ids">id字符串（id用逗号分隔）</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="ids">id字符串（id用逗号分隔）</param>
-       [HttpGet, Route("BatchDelete")]
+       /// <returns></returns>
-       public JsonActionResult<bool> BatchDelete(string ids)
+       [HttpGet, Route("BatchDelete")]
-       {
+       public JsonActionResult<bool> BatchDelete(string ids)
-           return WitRealBatchDelete(ids);
+       {
-       }
+           return WitRealBatchDelete(ids);
-
+       }
-       /// <summary>
+
-       /// 获得单条实体数据
+       /// <summary>
-       /// </summary>
+       /// 获得单条实体数据
-       /// <param name="filter">过滤实体</param>
+       /// </summary>
-       /// <returns></returns>
+       /// <param name="filter">过滤实体</param>
-       [HttpPost, Route("Get")]
+       /// <returns></returns>
-       public JsonActionResult<T_NW_ENTERPRISE> Get([FromBody] KeywordFilter filter)
+       [HttpPost, Route("Get")]
-       {
+       public JsonActionResult<T_NW_ENTERPRISE> Get([FromBody] KeywordFilter filter)
-           return WitEntity(null, filter);
+       {
-       }
+           return WitEntity(null, filter);
-
+       }
-                     	/// <summary>
+
-	/// 获得树形实体数据
+       
-	/// </summary>
+              	/// <summary>
-	/// <param name="filter"></param>
+	/// 获得树形实体数据
-	/// <returns></returns>
+	/// </summary>
-	[HttpPost, Route("TreeData")]
+	/// <param name="filter"></param>
-	public JsonActionResult<IEnumerable<TreeNode<T_NW_ENTERPRISE>>> TreeData([FromBody] KeywordFilter filter)
+	/// <returns></returns>
-	{
+	[HttpPost, Route("TreeData")]
-		return WitTreeOrderEntities(null, filter);
+	public JsonActionResult<IEnumerable<TreeNode<T_NW_ENTERPRISE>>> TreeData([FromBody] KeywordFilter filter)
-	}
+	{
-               
+		return WitTreeOrderEntities(null, filter);
-
+	}
-    }
+               
-	#endregion
+
-
+
-
+    }
-	#region  RoleDataPerm-子企业数据权限表
+	#endregion
-	/// <summary>
+
-    ///  子企业数据权限表
+
-    /// </summary>
+
-	[Route("api/NW/RoleDataPerm")]
+	#region  RoleDataPerm-子企业数据权限表
-    public partial class RoleDataPermController : AuthorizeApiController<T_NW_ROLE_DATA_PERM>
+	/// <summary>
-    {   
+    ///  子企业数据权限表
-       /// <summary>
+    /// </summary>
-       /// 查询所有数据
+	[Route("api/NW/RoleDataPerm")]
-       /// </summary>
+    public partial class RoleDataPermController : AuthorizeApiController<T_NW_ROLE_DATA_PERM>
-       /// <param name="filter">过滤实体</param>
+    {   
-       /// <returns></returns>
+       /// <summary>
-       [HttpPost, Route("Entities")]
+       /// 查询所有数据
-       public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> Entities([FromBody]KeywordFilter filter)
+       /// </summary>
-       {
+       /// <param name="filter">过滤实体</param>
-           return WitEntities(null, filter);
+       /// <returns></returns>
-       }
+       [HttpPost, Route("Entities")]
-
+       public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> Entities([FromBody]KeywordFilter filter)
-        /// <summary>
+       {
-       /// 排序查询所有数据
+           return WitEntities(null, filter);
-       /// </summary>
+       }
-       /// <param name="filter">过滤实体</param>
+
-       /// <returns></returns>
+        /// <summary>
-
+       /// 排序查询所有数据
-       [HttpPost, Route("OrderEntities")]
+       /// </summary>
-       public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> OrderEntities([FromBody]KeywordFilter filter)
+       /// <param name="filter">过滤实体</param>
-       {
+       /// <returns></returns>
-           return WitOrderEntities(null, filter);
+
-       }
+       [HttpPost, Route("OrderEntities")]
-
+       public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> OrderEntities([FromBody]KeywordFilter filter)
-       /// <summary>
+       {
-       /// 分页查询数据
+           return WitOrderEntities(null, filter);
-       /// </summary>
+       }
-       /// <param name="pageFilter">分页过滤实体</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpPost, Route("Paged")]
+       /// 分页查询数据
-       public PagedActionResult<T_NW_ROLE_DATA_PERM> Paged([FromBody]KeywordPageFilter pageFilter)
+       /// </summary>
-       {
+       /// <param name="pageFilter">分页过滤实体</param>
-           return WitPaged(null, pageFilter);
+       /// <returns></returns>
-       }
+       [HttpPost, Route("Paged")]
-
+       public PagedActionResult<T_NW_ROLE_DATA_PERM> Paged([FromBody]KeywordPageFilter pageFilter)
-       /// <summary>
+       {
-       /// 排序分页查询数据
+           return WitPaged(null, pageFilter);
-       /// </summary>
+       }
-       /// <param name="pageFilter">分页过滤实体</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpPost, Route("OrderPaged")]
+       /// 排序分页查询数据
-       public PagedActionResult<T_NW_ROLE_DATA_PERM> OrderPaged([FromBody]KeywordPageFilter pageFilter)
+       /// </summary>
-       {
+       /// <param name="pageFilter">分页过滤实体</param>
-           return WitOrderPaged(null, pageFilter);
+       /// <returns></returns>
-       }
+       [HttpPost, Route("OrderPaged")]
-
+       public PagedActionResult<T_NW_ROLE_DATA_PERM> OrderPaged([FromBody]KeywordPageFilter pageFilter)
-       /// <summary>
+       {
-       /// 根据主键删除数据
+           return WitOrderPaged(null, pageFilter);
-       /// </summary>
+       }
-       /// <param name="id">主键ID</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpGet, Route("Delete")]
+       /// 根据主键删除数据
-       public JsonActionResult<bool> Delete(string id)
+       /// </summary>
-       {
+       /// <param name="id">主键ID</param>
-           return WitRealDelete(id);
+       /// <returns></returns>
-       }
+       [HttpGet, Route("Delete")]
-
+       public JsonActionResult<bool> Delete(string id)
-       /// <summary>
+       {
-       /// 更新或新增数据
+           return WitRealDelete(id);
-       /// </summary>
+       }
-       /// <param name="entity">对象实体</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpPost, Route("Update")]
+       /// 更新或新增数据
-       public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_DATA_PERM entity)
+       /// </summary>
-       {
+       /// <param name="entity">对象实体</param>
-           return WitUpdate(entity);
+       /// <returns></returns>
-       }
+       [HttpPost, Route("Update")]
-
+       public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_DATA_PERM entity)
-       /// <summary>
+       {
-       /// 批量更新
+           return WitUpdate(entity);
-       /// </summary>
+       }
-       /// <param name="entity">对象实体</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpPost, Route("BatchUpdate")]
+       /// 批量更新
-       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_DATA_PERM> entity)
+       /// </summary>
-       {
+       /// <param name="entity">对象实体</param>
-             return WitBantchUpdate(entity?.Data);
+       /// <returns></returns>
-       }
+       [HttpPost, Route("BatchUpdate")]
-
+       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_DATA_PERM> entity)
-       /// <summary>
+       {
-       /// 批量删除数据
+             return WitBantchUpdate(entity?.Data);
-       /// </summary>
+       }
-       /// <param name="ids">id字符串（id用逗号分隔）</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpGet, Route("BatchDelete")]
+       /// 批量删除数据
-       public JsonActionResult<bool> BatchDelete(string ids)
+       /// </summary>
-       {
+       /// <param name="ids">id字符串（id用逗号分隔）</param>
-           return WitRealBatchDelete(ids);
+       /// <returns></returns>
-       }
+       [HttpGet, Route("BatchDelete")]
-
+       public JsonActionResult<bool> BatchDelete(string ids)
-       /// <summary>
+       {
-       /// 获得单条实体数据
+           return WitRealBatchDelete(ids);
-       /// </summary>
+       }
-       /// <param name="filter">过滤实体</param>
+
-       /// <returns></returns>
+       /// <summary>
-       [HttpPost, Route("Get")]
+       /// 获得单条实体数据
-       public JsonActionResult<T_NW_ROLE_DATA_PERM> Get([FromBody] KeywordFilter filter)
+       /// </summary>
-       {
+       /// <param name="filter">过滤实体</param>
-           return WitEntity(null, filter);
+       /// <returns></returns>
-       }
+       [HttpPost, Route("Get")]
-
+       public JsonActionResult<T_NW_ROLE_DATA_PERM> Get([FromBody] KeywordFilter filter)
-       
+       {
-
+           return WitEntity(null, filter);
-    }
+       }
-	#endregion
+
-
+       
-
+
-	#region  RoleMenu-子企业权限表
+
-	/// <summary>
+    }
-    ///  子企业权限表
+	#endregion
-    /// </summary>
+
-	[Route("api/NW/RoleMenu")]
+
-    public partial class RoleMenuController : AuthorizeApiController<T_NW_ROLE_MENU>
+
-    {   
+	#region  RoleMenu-子企业权限表
-       /// <summary>
+	/// <summary>
-       /// 查询所有数据
+    ///  子企业权限表
-       /// </summary>
+    /// </summary>
-       /// <param name="filter">过滤实体</param>
+	[Route("api/NW/RoleMenu")]
-       /// <returns></returns>
+    public partial class RoleMenuController : AuthorizeApiController<T_NW_ROLE_MENU>
-       [HttpPost, Route("Entities")]
+    {   
-       public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> Entities([FromBody]KeywordFilter filter)
+       /// <summary>
-       {
+       /// 查询所有数据
-           return WitEntities(null, filter);
+       /// </summary>
-       }
+       /// <param name="filter">过滤实体</param>
-
+       /// <returns></returns>
-        /// <summary>
+       [HttpPost, Route("Entities")]
-       /// 排序查询所有数据
+       public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> Entities([FromBody]KeywordFilter filter)
-       /// </summary>
+       {
-       /// <param name="filter">过滤实体</param>
+           return WitEntities(null, filter);
-       /// <returns></returns>
+       }
-
+
-       [HttpPost, Route("OrderEntities")]
+        /// <summary>
-       public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> OrderEntities([FromBody]KeywordFilter filter)
+       /// 排序查询所有数据
-       {
+       /// </summary>
-           return WitOrderEntities(null, filter);
+       /// <param name="filter">过滤实体</param>
-       }
+       /// <returns></returns>
-
+
-       /// <summary>
+       [HttpPost, Route("OrderEntities")]
-       /// 分页查询数据
+       public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> OrderEntities([FromBody]KeywordFilter filter)
-       /// </summary>
+       {
-       /// <param name="pageFilter">分页过滤实体</param>
+           return WitOrderEntities(null, filter);
-       /// <returns></returns>
+       }
-       [HttpPost, Route("Paged")]
+
-       public PagedActionResult<T_NW_ROLE_MENU> Paged([FromBody]KeywordPageFilter pageFilter)
+       /// <summary>
-       {
+       /// 分页查询数据
-           return WitPaged(null, pageFilter);
+       /// </summary>
-       }
+       /// <param name="pageFilter">分页过滤实体</param>
-
+       /// <returns></returns>
-       /// <summary>
+       [HttpPost, Route("Paged")]
-       /// 排序分页查询数据
+       public PagedActionResult<T_NW_ROLE_MENU> Paged([FromBody]KeywordPageFilter pageFilter)
-       /// </summary>
+       {
-       /// <param name="pageFilter">分页过滤实体</param>
+           return WitPaged(null, pageFilter);
-       /// <returns></returns>
+       }
-       [HttpPost, Route("OrderPaged")]
+
-       public PagedActionResult<T_NW_ROLE_MENU> OrderPaged([FromBody]KeywordPageFilter pageFilter)
+       /// <summary>
-       {
+       /// 排序分页查询数据
-           return WitOrderPaged(null, pageFilter);
+       /// </summary>
-       }
+       /// <param name="pageFilter">分页过滤实体</param>
-
+       /// <returns></returns>
-       /// <summary>
+       [HttpPost, Route("OrderPaged")]
-       /// 根据主键删除数据
+       public PagedActionResult<T_NW_ROLE_MENU> OrderPaged([FromBody]KeywordPageFilter pageFilter)
-       /// </summary>
+       {
-       /// <param name="id">主键ID</param>
+           return WitOrderPaged(null, pageFilter);
-       /// <returns></returns>
+       }
-       [HttpGet, Route("Delete")]
+
-       public JsonActionResult<bool> Delete(string id)
+       /// <summary>
-       {
+       /// 根据主键删除数据
-           return WitRealDelete(id);
+       /// </summary>
-       }
+       /// <param name="id">主键ID</param>
-
+       /// <returns></returns>
-       /// <summary>
+       [HttpGet, Route("Delete")]
-       /// 更新或新增数据
+       public JsonActionResult<bool> Delete(string id)
-       /// </summary>
+       {
-       /// <param name="entity">对象实体</param>
+           return WitRealDelete(id);
-       /// <returns></returns>
+       }
-       [HttpPost, Route("Update")]
+
-       public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_MENU entity)
+       /// <summary>
-       {
+       /// 更新或新增数据
-           return WitUpdate(entity);
+       /// </summary>
-       }
+       /// <param name="entity">对象实体</param>
-
+       /// <returns></returns>
-       /// <summary>
+       [HttpPost, Route("Update")]
-       /// 批量更新
+       public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_MENU entity)
-       /// </summary>
+       {
-       /// <param name="entity">对象实体</param>
+           return WitUpdate(entity);
-       /// <returns></returns>
+       }
-       [HttpPost, Route("BatchUpdate")]
+
-       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_MENU> entity)
+       /// <summary>
-       {
+       /// 批量更新
-             return WitBantchUpdate(entity?.Data);
+       /// </summary>
-       }
+       /// <param name="entity">对象实体</param>
-
+       /// <returns></returns>
-       /// <summary>
+       [HttpPost, Route("BatchUpdate")]
-       /// 批量删除数据
+       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_MENU> entity)
-       /// </summary>
+       {
-       /// <param name="ids">id字符串（id用逗号分隔）</param>
+             return WitBantchUpdate(entity?.Data);
-       /// <returns></returns>
+       }
-       [HttpGet, Route("BatchDelete")]
+
-       public JsonActionResult<bool> BatchDelete(string ids)
+       /// <summary>
-       {
+       /// 批量删除数据
-           return WitRealBatchDelete(ids);
+       /// </summary>
-       }
+       /// <param name="ids">id字符串（id用逗号分隔）</param>
-
+       /// <returns></returns>
-       /// <summary>
+       [HttpGet, Route("BatchDelete")]
-       /// 获得单条实体数据
+       public JsonActionResult<bool> BatchDelete(string ids)
-       /// </summary>
+       {
-       /// <param name="filter">过滤实体</param>
+           return WitRealBatchDelete(ids);
-       /// <returns></returns>
+       }
-       [HttpPost, Route("Get")]
+
-       public JsonActionResult<T_NW_ROLE_MENU> Get([FromBody] KeywordFilter filter)
+       /// <summary>
-       {
+       /// 获得单条实体数据
-           return WitEntity(null, filter);
+       /// </summary>
-       }
+       /// <param name="filter">过滤实体</param>
-
+       /// <returns></returns>
-       
+       [HttpPost, Route("Get")]
-
+       public JsonActionResult<T_NW_ROLE_MENU> Get([FromBody] KeywordFilter filter)
-    }
+       {
-	#endregion
+           return WitEntity(null, filter);
-
+       }
- }
+
+       
+
+
+    }
+	#endregion
+
+
+ }

APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs

@@ -2132,6 +2132,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     {
                         dt = DateTime.Parse(filter.Parameter1);
                     }
+                    DateTime minTime = dt.AddMinutes(0);
+                    DateTime maxTime = dt.AddMinutes(90);
                     var newFilter = new KeywordFilter();
                     newFilter.OrgId = filter.OrgId;
                     newFilter.IgnoreDataRule = true;
@@ -2140,13 +2142,14 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     var fmClass = this.GetEntities<T_FM_CLASS>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_ClassDetail");
                     var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId), "Nav_Person.Nav_Post");
                     //var records = this.GetEntities<T_FO_CURRENT_CLASS_RECORD>(t => t.RECORD_DATE.Date == dt.Date, newFilter);
-                    var preClass = this.GetEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(t => t.START_TIME <= dt && t.END_TIME!=null && t.END_TIME.Date == dt.Date && t.END_TIME.Hour == dt.AddHours(1).Hour && t.DEPARTMENT_SCHEDULING_ID == null, newFilter);
+                    var preClass = this.GetEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(t => t.END_TIME!=null && t.END_TIME.Date == dt.Date && t.END_TIME > minTime && t.END_TIME < maxTime && t.DEPARTMENT_SCHEDULING_ID == null && t.IS_RECORD == false, newFilter);
                     var preClassIds = preClass.Select(t => t.ID).ToList();
                     var preClassUsers = this.GetEntities<T_FO_PRE_SHIFT_MEETING_RECORD_USER>(t => preClassIds.Contains(t.PRE_SHIFT_MEETING_RECORD_ID), newFilter);
                     if (preClass != null && preClass.Any())
                     {
                         foreach (var item in preClass)
                         {
+                            item.IS_RECORD = true;
                                 var userIds = preClassUsers.Where(t => t.PRE_SHIFT_MEETING_RECORD_ID == item.ID && t.USER_ID != null).Select(m => m.USER_ID).Distinct().ToList();
                                 //当前班前会的所有人
                                 var preUsers = users.Where(t => t.DEPARTMENT_ID != null && userIds.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).ToList();
@@ -2201,6 +2204,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     }
                     UnifiedCommit(() =>
                     {
+                        if (preClass != null && preClass.Any())
+                            BantchSaveEntityNoCommit(preClass);
                         if (wellRecords != null && wellRecords.Any())
                             BantchSaveEntityNoCommit(wellRecords);
                         if (wellRecordUsers != null && wellRecordUsers.Any())
@@ -2285,5 +2290,53 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                 return true;
             });
         }
+
+        /// <summary>
+        /// 更新班前会议超时字段
+        /// </summary>
+        /// <param name="pageFilter"></param>
+        /// <returns></returns>
+        [HttpPost, Route("PremeetingSync")]
+        public JsonActionResult<bool> PremeetingSync([FromBody] KeywordFilter filter)
+        {
+            return SafeExecute<bool>(() =>
+            {
+                try
+                {
+                    var preClass = this.GetEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(t => t.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档 && t.OVERTIME == FOISOVERTIME.未统计, filter);
+                    var preClassIds = preClass.Select(t => t.ID).ToList();
+                    var tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => t.SOURCE_DATA_ID!=null &&  preClassIds.Contains((Guid)t.SOURCE_DATA_ID), filter);
+                    if (preClass != null && preClass.Any())
+                    {
+                        foreach (var item in preClass)
+                        {
+                            var taskOver = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == item.ID && t.NOTICE_STATUS == 2);
+                            if (taskOver != null)
+                            {
+                                item.OVERTIME = FOISOVERTIME.超时;
+                            }
+                            else
+                            {
+                                item.OVERTIME = FOISOVERTIME.未超时;
+                            }
+                        }
+                    }
+                    UnifiedCommit(() =>
+                    {
+                        if (preClass != null && preClass.Any())
+                            BantchSaveEntityNoCommit(preClass);
+                    });
+                }
+                catch (Exception ex)
+                {
+                    if (!string.IsNullOrEmpty(ex.StackTrace))
+                        throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
+                    else
+                        throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
+                }
+
+                return true;
+            });
+        }
     }
 }

APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.cs

@@ -1,4 +1,9 @@
- 
+
+
+ 
+
+
+
  
  
   
@@ -13,6 +18,7 @@
 
 
 
+
 
 //------------------------------------------------------------------------------
 //     T4模板文件：基础接口类
@@ -28,4 +34,5 @@ using APT.BaseData.Domain.ApiModel.PF;
 namespace APT.PP.WebApi.Controllers.Api
 {
 	
+
  }