wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、培训计划明细添加是否直接触发培训记录字段

Browse Source 
2、培训计划审批结束时 对字段初始化
3、跑批修改加入 初始化触发搜索  触发表单并修改值
This commit is contained in:
wyw 2025-11-26 23:06:08 +08:00
parent d85e73c72d
commit ee2b7725fc
18 changed files with 274145 additions and 140285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -2486,9 +2486,9 @@ namespace APT.BaseData.Services.DomainServices
else else
{ {
var entity = this.GetEntity<T_FO_FIRE_JOB>(modelApp.DATA_ID, "Nav_Users"); var entity = this.GetEntity<T_FO_FIRE_JOB>(modelApp.DATA_ID, "Nav_Users");
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
if (entity.JOB_DATE.Value.AddMinutes(-30) <= DateTime.Now && entity.IS_RUN == false && entity.Nav_Users!=null && entity.Nav_Users.Any()) if (entity.JOB_DATE.Value.AddMinutes(-30) <= DateTime.Now && entity.IS_RUN == false && entity.Nav_Users != null && entity.Nav_Users.Any())
{ {
entity.IS_RUN = true; entity.IS_RUN = true;
entity.FIRE_STATUS = FOFireStatus.Sign; entity.FIRE_STATUS = FOFireStatus.Sign;
@ -2497,8 +2497,8 @@ namespace APT.BaseData.Services.DomainServices
if (sendUser != null) if (sendUser != null)
{ {
var userName = this.GetEntity<T_FM_USER>(t => t.ID == sendUser.USER_ID)?.NAME; var userName = this.GetEntity<T_FM_USER>(t => t.ID == sendUser.USER_ID)?.NAME;
notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", entity.ID, entity.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now, notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", entity.ID, entity.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043"); DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043");
} }
} }
else else
@ -12931,7 +12931,8 @@ namespace APT.BaseData.Services.DomainServices
//currentDepart = departUser; //currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId); user = users.FirstOrDefault(t => t.ID == userId);
} }
else { else
{
var departUserUp = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID); var departUserUp = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID);
if (departUserUp != null) if (departUserUp != null)
{ {
@ -13529,7 +13530,7 @@ namespace APT.BaseData.Services.DomainServices
} }
//应急处置 //应急处置
var emeList = new List<string>(); var emeList = new List<string>();
var emerges= temp.Select(t => t.EMERGENCY).ToList(); var emerges = temp.Select(t => t.EMERGENCY).ToList();
if (emerges != null && emerges.Any()) if (emerges != null && emerges.Any())
{ {
foreach (var mm in emerges) foreach (var mm in emerges)
@ -14061,7 +14062,7 @@ namespace APT.BaseData.Services.DomainServices
resultDetails.Add(detail); resultDetails.Add(detail);
} }
} }
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表" + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'), result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039"); var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0'), result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039");
notices.Add(noticeTask); notices.Add(noticeTask);
//T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN(); //T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN();
//modelBegin.ID = Guid.NewGuid(); //modelBegin.ID = Guid.NewGuid();
@ -15058,8 +15059,8 @@ namespace APT.BaseData.Services.DomainServices
{ {
var entity = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); var entity = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
entity.END_DATE = DateTime.Now; entity.END_DATE = DateTime.Now;
var sumDetails= this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t=>t.RISK_EVALUATION_SUMMARY_ID == entity.ID,new BaseFilter(entity.ORG_ID)); var sumDetails = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID));
//触发风险检查关联表 //触发风险检查关联表
T_SK_DOUBLE_PREVENT_MECHANISM dou = null; T_SK_DOUBLE_PREVENT_MECHANISM dou = null;
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
@ -15882,7 +15883,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15)
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null) if (dep != null)
@ -15908,7 +15909,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15)
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null) if (dep != null)
@ -16164,7 +16165,18 @@ namespace APT.BaseData.Services.DomainServices
modelPlan.STATUS = PFStandardStatus.Archived; modelPlan.STATUS = PFStandardStatus.Archived;
IEnumerable<T_SE_TRAIN_PLAN_DETAIL> listDetail = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.PLAN_ID == modelPlan.ID); IEnumerable<T_SE_TRAIN_PLAN_DETAIL> listDetail = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.PLAN_ID == modelPlan.ID);
listDetail.ForEach(e => e.STATUS = PFStandardStatus.Sign); listDetail.ForEach(e =>
{
e.STATUS = PFStandardStatus.Sign;
if (e.DATE_TRAIN <= DateTime.Now)
{
e.ISNEEDINI = true;
}
else
{
e.ISNEEDINI = false;
}
});
List<T_FM_NOTIFICATION_TASK> listTaskNotice = null;//部门今日提醒 List<T_FM_NOTIFICATION_TASK> listTaskNotice = null;//部门今日提醒
if (modelPlan.TYPE == PlanType.Company) if (modelPlan.TYPE == PlanType.Company)

136464
APT.Data.Migrations/Migrations/20251126150008_wyw2025112601.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20251126150008_wyw2025112601.cs Normal file
View File

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

3
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -74471,6 +74471,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("ISALL") b.Property<bool>("ISALL")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<bool>("ISNEEDINI")
.HasColumnType("bit");
b.Property<bool>("IS_DELETED") b.Property<bool>("IS_DELETED")
.HasColumnType("bit"); .HasColumnType("bit");

7
APT.MS.Domain/Entities/SC/SE/T_SE_TRAIN_PLAN_DETAIL.cs
View File

@ -140,6 +140,13 @@ namespace APT.MS.Domain.Entities.SE
[Description("被培训组织")] [Description("被培训组织")]
public ICollection<T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT> Nav_ListDetailDepartment { get; set; } public ICollection<T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT> Nav_ListDetailDepartment { get; set; }
/// <summary>
/// 是否需要直接跑批
/// 审批成功月份小于等于前时间为true 跑完为false
/// </summary>
[Description("被培训组织")]
public bool ISNEEDINI { get; set; } = false;
/// <summary> /// <summary>
/// 状态 /// 状态
/// 触发：默认0 单审批完成 10 触发了_20 审阅中_21_部分完成了 所有单子归档了_30 /// 触发：默认0 单审批完成 10 触发了_20 审阅中_21_部分完成了 所有单子归档了_30

1604
APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

13484
APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

11923
APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

23363
APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

31524
APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

263
APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs
View File

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

724
APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs
View File

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

5784
APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

7963
APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

15
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -2040,11 +2040,23 @@ namespace APT.PP.WebApi.Controllers.Api.PP
try try
{ {
// STATUS 触发：默认0 单审批完成 10 触发了_20 审阅中_21_部分完成了 所有单子归档了_30 // STATUS 触发：默认0 单审批完成 10 触发了_20 审阅中_21_部分完成了 所有单子归档了_30
var listDetailRun = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.STATUS == PFStandardStatus.Sign && e.DEPARTMENT_ID.HasValue && dtMin <= e.DATE_TRAIN.Date && e.DATE_TRAIN.Date <= dtMax, null); var listDetailRun = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.STATUS == PFStandardStatus.Sign && e.DEPARTMENT_ID.HasValue && ((dtMin <= e.DATE_TRAIN.Date && e.DATE_TRAIN.Date <= dtMax) || e.ISNEEDINI), null);
if (listDetailRun == null || listDetailRun.Count() < 1) if (listDetailRun == null || listDetailRun.Count() < 1)
{ {
return; return;
} }
//只要有数据 如果 6 月之前 是审批结束前要触发的待办 也要触发
//if (dtMin.Month <= 6)
//{
// var listDetailRunExt = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.STATUS == PFStandardStatus.Sign && e.DEPARTMENT_ID.HasValue && e.DATE_TRAIN.Date <= dtMin, null);
// if (listDetailRunExt != null && listDetailRunExt.Count() > 0)
// {
// listDetailRun.ToList().AddRange(listDetailRunExt);
// }
//}
var listDetailID = listDetailRun.Select(e => e.ID); var listDetailID = listDetailRun.Select(e => e.ID);
var listNotice = GetEntities<T_SE_TRAIN_NOTIFY>(e => e.CREATE_TIME.HasValue && e.PLANDETAILID.HasValue && listDetailID.Contains(e.ID), null); var listNotice = GetEntities<T_SE_TRAIN_NOTIFY>(e => e.CREATE_TIME.HasValue && e.PLANDETAILID.HasValue && listDetailID.Contains(e.ID), null);
@ -2104,6 +2116,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
continue; //找不到人 接收培训通知的人 continue; //找不到人 接收培训通知的人
item.STATUS = PFStandardStatus.Approving; item.STATUS = PFStandardStatus.Approving;
item.ISNEEDINI = false;
item.MODIFY_TIME = dtNow; item.MODIFY_TIME = dtNow;
modelDep = listDep.FirstOrDefault(e => e.ID == item.DEPARTMENT_ID); modelDep = listDep.FirstOrDefault(e => e.ID == item.DEPARTMENT_ID);
if (modelDep == null) if (modelDep == null)

11
APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -1,13 +1,7 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -21,5 +15,4 @@ using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api namespace APT.PP.WebApi.Controllers.Api
{ {
}
}

145754
APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

35484
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff