This commit is contained in:
何美荣 2025-12-18 17:45:23 +08:00
commit c62a4f09bd
31 changed files with 275249 additions and 140846 deletions

View File

@ -312,5 +312,11 @@ namespace APT.BaseData.Domain.Entities.FM
[Description("人员类别名称")]
[DataFieldLength(50)]
public string USER_TYPE_NAME { get; set; }
/// <summary>
/// 是否接收短信
/// </summary>
[Description("是否接收短信")]
public bool ISGETMSG { get; set; } = true;
}
}

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -6797,6 +6797,9 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<bool>("ISGETMSG")
.HasColumnType("bit");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BD.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护
/// <summary>
/// HMI资源表维护
@ -130,10 +123,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Picture-
/// <summary>
/// 图片资源
@ -241,10 +232,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PictureFile-
/// <summary>
/// 资源图片文件
@ -352,10 +341,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Place-
/// <summary>
/// 区域表
@ -462,8 +449,7 @@ namespace APT.BD.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -474,10 +460,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region ServerInfo-
/// <summary>
/// 服务器信息表
@ -585,10 +569,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SystemInfo-
/// <summary>
/// 系统信息表
@ -696,10 +678,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region WordTemplate-WORD模板维护
/// <summary>
/// WORD模板维护
@ -807,8 +787,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": true,
"applicationUrl": "http://localhost:5101"

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BS.WebApi.Controllers.Api
{
using APT.MS.Domain.Entities.BS;
#region CheckContent-
/// <summary>
/// 检查内容表
@ -130,10 +123,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContents-
/// <summary>
/// 检查内容
@ -241,10 +232,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentCheckType-
/// <summary>
/// 检查类型
@ -352,10 +341,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentCheckTypeLevel-()
/// <summary>
/// 检查内容检查类型子表(关联层级)
@ -463,10 +450,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentHmRiskArea-
/// <summary>
/// 检查区域
@ -574,10 +559,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckMain-
/// <summary>
/// 安全检查库
@ -685,10 +668,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentMainDepartment-
/// <summary>
/// 安全检查库责任部门
@ -796,10 +777,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentQuestion-
/// <summary>
/// 检查问题
@ -907,10 +886,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckMainLaw-
/// <summary>
/// 检查库法规
@ -1018,10 +995,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProject-
/// <summary>
/// 检查项目
@ -1129,10 +1104,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategory-
/// <summary>
/// 检查项目分类表
@ -1240,10 +1213,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategoryChecktype-_检查类型
/// <summary>
/// 检查项目分类_检查类型
@ -1351,10 +1322,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategoryObject-_检查区域
/// <summary>
/// 检查项目分类_检查区域
@ -1462,10 +1431,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectProjectCategory-
/// <summary>
/// 检查项目分类
@ -1573,10 +1540,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckQuestion-
/// <summary>
/// 检查问题
@ -1684,10 +1649,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckType-
/// <summary>
/// 检查类型表
@ -1794,8 +1757,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1806,10 +1768,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region CheckTypeLevel-
/// <summary>
/// 检查层级
@ -1917,10 +1877,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckTypeMinetype-
/// <summary>
/// 检查类型生产单元
@ -2028,10 +1986,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentAreaobject-
/// <summary>
/// 部门范围
@ -2139,10 +2095,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region OperateLog-
/// <summary>
/// 操作日志
@ -2250,10 +2204,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSet-
/// <summary>
/// 制定任务
@ -2361,10 +2313,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetArea-
/// <summary>
/// 制定任务区域
@ -2472,10 +2422,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetDepartmentOut-
/// <summary>
/// 制定任务排除组织
@ -2583,10 +2531,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetDepObject-
/// <summary>
/// 制定任务部门触发范围
@ -2694,10 +2640,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetObject-
/// <summary>
/// 制定任务触发范围
@ -2805,10 +2749,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskCategory-
/// <summary>
/// 隐患类别
@ -2916,10 +2858,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskLevelDelayDays-
/// <summary>
/// 隐患等级最长延期整改天数
@ -3027,10 +2967,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskReason-
/// <summary>
/// 隐患原因表
@ -3138,10 +3076,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmit-
/// <summary>
/// 隐患上报表
@ -3249,10 +3185,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContent-
/// <summary>
/// 隐患上报明细
@ -3360,10 +3294,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentBack-退
/// <summary>
/// 隐患上报明细退回
@ -3471,10 +3403,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDeal-
/// <summary>
/// 隐患整改记录
@ -3582,10 +3512,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealAfterFile-
/// <summary>
/// 检查任务附件表
@ -3693,10 +3621,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealFile-
/// <summary>
/// 检查任务附件表
@ -3804,10 +3730,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealUserchecksign-
/// <summary>
/// 隐患整改验收人签名
@ -3915,10 +3839,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealUsersign-
/// <summary>
/// 隐患整改责任人签名
@ -4026,10 +3948,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentFile-
/// <summary>
/// 检查任务明细附件表
@ -4137,10 +4057,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentReason-
/// <summary>
/// 隐患上报明细原因
@ -4248,10 +4166,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentTemp-
/// <summary>
/// 隐患上报详情待入库
@ -4359,10 +4275,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitDelayApply-
/// <summary>
/// 延期整改申请
@ -4470,10 +4384,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitDelayApplyDetail-
/// <summary>
/// 延期整改申请详情
@ -4581,10 +4493,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitFile-
/// <summary>
/// 检查任务附件表
@ -4692,10 +4602,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitNotice-
/// <summary>
/// 隐患通知
@ -4803,10 +4711,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitNoticePerson-
/// <summary>
/// 隐患通知
@ -4914,10 +4820,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskTpm-TPM对接数据
/// <summary>
/// TPM对接数据
@ -5025,10 +4929,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheck-
/// <summary>
/// 安全检查
@ -5136,10 +5038,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetail-
/// <summary>
/// 检查明细
@ -5247,10 +5147,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailFile-
/// <summary>
/// 检查任务明细附件表
@ -5358,10 +5256,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailLaw-
/// <summary>
/// 检查依据
@ -5469,10 +5365,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailQuestion-
/// <summary>
/// 检查明细问题
@ -5580,10 +5474,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailReason-
/// <summary>
/// 检查明细隐患原因
@ -5691,10 +5583,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailReject-退
/// <summary>
/// 检查明细退回
@ -5802,10 +5692,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailRejectFile-退
/// <summary>
/// 检查明细退回附件
@ -5913,10 +5801,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailUser-
/// <summary>
/// 检查明细人员
@ -6024,10 +5910,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckFile-
/// <summary>
/// 安全检查文件
@ -6135,10 +6019,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckProject-
/// <summary>
/// 安全检查文件
@ -6246,10 +6128,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckProjectCategory-
/// <summary>
/// 安全检查文件
@ -6357,10 +6237,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRecord-
/// <summary>
/// 检查记录确认
@ -6468,10 +6346,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRecordDetail-
/// <summary>
/// 检查记录确认明细
@ -6579,10 +6455,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRiskArea-
/// <summary>
/// 检查区域
@ -6690,10 +6564,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckUsersign-
/// <summary>
/// 检查签名
@ -6801,8 +6673,6 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": true,
"applicationUrl": "http://localhost:5178"

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -23,7 +17,6 @@ namespace APT.FM.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
#region Api-API
/// <summary>
/// API
@ -131,10 +124,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseAdd-
/// <summary>
/// 企业位置信息
@ -242,10 +233,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseEnergy-
/// <summary>
/// 企业能耗配置信息
@ -353,10 +342,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseInfo-
/// <summary>
/// 企业基本信息
@ -464,10 +451,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfig-
/// <summary>
/// 部门日历配置表
@ -575,10 +560,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfigDetail-
/// <summary>
/// 部门日历配置明细表
@ -686,10 +669,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfigTeam-
/// <summary>
/// 部门日历配置班组表
@ -797,10 +778,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCompletion-XX班完成情况统计
/// <summary>
/// XX班完成情况统计
@ -908,10 +887,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCompletionSort-
/// <summary>
/// 班组完成情况前十
@ -1019,10 +996,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentPost-
/// <summary>
/// 部门岗位
@ -1130,10 +1105,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentPostUser-
/// <summary>
/// 部门岗位人员
@ -1241,10 +1214,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentProductionUnit-
/// <summary>
/// 生产单元
@ -1352,10 +1323,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentSafeuser-
/// <summary>
/// 安全员表
@ -1463,10 +1432,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentScheduling-
/// <summary>
/// 部门排班表
@ -1574,10 +1541,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentSchedulingDetail-
/// <summary>
/// 排班信息人员明细表
@ -1685,10 +1650,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentUser-
/// <summary>
/// 部门人员表
@ -1796,10 +1759,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Enum-
/// <summary>
/// 枚举管理
@ -1907,10 +1868,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Enums-
/// <summary>
/// 枚举表单
@ -2018,10 +1977,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region EnumItem-
/// <summary>
/// 枚举项
@ -2129,10 +2086,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region EnumType-
/// <summary>
/// 枚举类别
@ -2240,10 +2195,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region HiddenDangerRectification-
/// <summary>
/// 隐患整改完成情况统计
@ -2351,10 +2304,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityCompletion-
/// <summary>
/// 班组作业完成率统计
@ -2462,10 +2413,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region MessageTemplate-
/// <summary>
/// 短信模板表
@ -2573,10 +2522,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Monitoring-
/// <summary>
/// 服务器监听表
@ -2684,10 +2631,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Notice-
/// <summary>
/// 信息通知表
@ -2795,10 +2740,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region NotificationTask-?
/// <summary>
/// 娑堟伅琛?
@ -2906,10 +2849,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region NotificationTaskTimeSet-?
/// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3017,10 +2958,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region ParamSet-
/// <summary>
/// 参数设置表
@ -3128,10 +3067,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region ParamSetDepartment-
/// <summary>
/// 组织关联信息
@ -3239,10 +3176,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Person-
/// <summary>
/// 人员信息
@ -3350,10 +3285,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonCertificateFile-
/// <summary>
/// 证书
@ -3461,10 +3394,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonEducationFile-
/// <summary>
/// 学历证
@ -3572,10 +3503,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonIdcardFile-
/// <summary>
/// 身份证
@ -3683,10 +3612,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonSkills-
/// <summary>
/// 技能
@ -3794,10 +3721,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonWork-
/// <summary>
/// 工作经历
@ -3905,10 +3830,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RiskLevelProportion-
/// <summary>
/// 风险等级占比
@ -4016,10 +3939,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RiskTypeProportion-
/// <summary>
/// 风险类别占比
@ -4127,10 +4048,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RoleDepartment-
/// <summary>
/// 部门权限
@ -4238,10 +4157,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Snapshot-
/// <summary>
/// 随手拍
@ -4349,10 +4266,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SnapshotFile-
/// <summary>
/// 随手拍图片
@ -4460,10 +4375,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLimit-
/// <summary>
/// 数据同步次数限制
@ -4571,10 +4484,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLog-
/// <summary>
/// 跑批日志表
@ -4682,10 +4593,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLogDetail-
/// <summary>
/// 跑批日志明细表
@ -4793,10 +4702,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncUserRule-
/// <summary>
/// 用户数据同步例外配置
@ -4904,10 +4811,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Team-
/// <summary>
/// 班组表
@ -5015,10 +4920,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region TeamPerson-
/// <summary>
/// 班组人员关联信息
@ -5126,10 +5029,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserDepartment-
/// <summary>
/// 用户部门关联表
@ -5237,10 +5138,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserPost-
/// <summary>
/// 宀椾綅鍒楄〃
@ -5348,10 +5247,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserProductionUnit-
/// <summary>
/// 生产单元
@ -5459,10 +5356,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserProductionUnitSet-
/// <summary>
/// 生产单元
@ -5570,10 +5465,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserSignFile-
/// <summary>
/// 签名照片
@ -5681,10 +5574,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserTest-
/// <summary>
/// 测试多选
@ -5792,10 +5683,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserVacationSet-
/// <summary>
/// 人员休假设置
@ -5903,10 +5792,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region WorkTicketCompletion-
/// <summary>
/// 关键许可工作票完成情况统计
@ -6014,8 +5901,6 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": false,
"applicationUrl": "http://localhost:5107"

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"applicationUrl": "http://localhost:5119",
"nativeDebugging": false

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": true,
"applicationUrl": "http://localhost:5117"

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.LG;
#region Oprate-
/// <summary>
/// 表单操作日志表
@ -130,8 +123,6 @@ namespace APT.LG.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": false,
"applicationUrl": "http://localhost:5109"

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.NW.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.NW;
#region Enterprise-
/// <summary>
/// 子企业表
@ -129,8 +122,7 @@ namespace APT.NW.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -141,10 +133,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region RoleDataPerm-
/// <summary>
/// 子企业数据权限表
@ -252,10 +242,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RoleMenu-
/// <summary>
/// 子企业权限表
@ -363,8 +351,6 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": false,
"applicationUrl": "http://localhost:5111"

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.OP.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.OP;
#region Alluser-()
/// <summary>
/// 用户表(租户平台)
@ -130,10 +123,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region BillingRule-
/// <summary>
/// 计费规则表
@ -241,10 +232,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region BillingRuleVersion-
/// <summary>
/// 计费规则子表
@ -352,10 +341,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ChargeTimeSet-
/// <summary>
/// 充电时长配置
@ -463,10 +450,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Client-
/// <summary>
/// 客户表
@ -574,10 +559,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ClinetOpenid-OpenId
/// <summary>
/// 客户表OpenId
@ -685,10 +668,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CommonQuestion-
/// <summary>
/// 常见问题
@ -796,10 +777,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region FileFirmware-
/// <summary>
/// 充电桩固件表
@ -907,10 +886,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Member-
/// <summary>
/// 会员表
@ -1018,10 +995,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Menu-()
/// <summary>
/// 菜单表(租户平台)
@ -1128,8 +1103,7 @@ namespace APT.OP.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1140,10 +1114,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region Notice-
/// <summary>
/// 公告表
@ -1251,10 +1223,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region NoticeDetail-
/// <summary>
/// 公告内容
@ -1362,10 +1332,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PeakValleyConfig-
/// <summary>
/// 峰谷配置表
@ -1473,10 +1441,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeCard-
/// <summary>
/// 充值卡
@ -1584,10 +1550,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeOrder-
/// <summary>
/// 充值订单
@ -1695,10 +1659,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeSetting-
/// <summary>
/// 充值金额配置
@ -1806,10 +1768,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RfidCard-RFID卡
/// <summary>
/// RFID卡
@ -1917,10 +1877,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RoleMenu-
/// <summary>
/// 租户权限表
@ -2028,10 +1986,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Tenant-
/// <summary>
/// 租户表
@ -2139,10 +2095,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantDbConn-
/// <summary>
/// 租户数据库表
@ -2250,10 +2204,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantDomain-
/// <summary>
/// 租户域名表
@ -2361,10 +2313,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantExpiration-
/// <summary>
/// 租户租期表
@ -2472,10 +2422,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region User-()
/// <summary>
/// 用户表(租户平台)
@ -2583,10 +2531,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Version-
/// <summary>
/// 版本升级表
@ -2694,10 +2640,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region VersionMenu-
/// <summary>
/// 菜单版本升级表
@ -2805,10 +2749,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region VersionTenant-
/// <summary>
/// 租户版本升级表
@ -2916,8 +2858,6 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": false,
"applicationUrl": "http://localhost:5116"

View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件基础接口类
// 此代码由T4模板自动生成
@ -25,7 +19,6 @@ namespace APT.PF.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4;
#region ApprovalRole-
/// <summary>
/// 审批角色
@ -133,10 +126,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Approve-
/// <summary>
/// 审批流主表
@ -244,10 +235,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveDetail-
/// <summary>
/// 审批流子表
@ -355,10 +344,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveOperationRole-
/// <summary>
/// 操作角色
@ -466,10 +453,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveRejectConfig-
/// <summary>
/// 审批驳回配置表
@ -577,10 +562,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveRoleDepartment-
/// <summary>
/// 分管部门
@ -688,10 +671,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveTemp-
/// <summary>
/// 审批流模板主表
@ -799,10 +780,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveTempDetail-
/// <summary>
/// 审批流模板子表
@ -910,10 +889,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region AppVersion-App版本发布
/// <summary>
/// App版本发布
@ -1021,10 +998,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region AppVersionFile-App包文件
/// <summary>
/// App包文件
@ -1132,10 +1107,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ClientScopes-
/// <summary>
/// 资源表
@ -1243,10 +1216,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region CodeRuleRunLog-
/// <summary>
/// 编码规则跑批表
@ -1354,10 +1325,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ComplaintLog-
/// <summary>
/// 转办记录表
@ -1465,10 +1434,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region DataChannel-
/// <summary>
/// 数据通道
@ -1576,10 +1543,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region DataFrequency-
/// <summary>
/// 采集频率
@ -1687,10 +1652,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Fddeback-
/// <summary>
/// 意见反馈
@ -1798,10 +1761,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FddebackFile-
/// <summary>
/// 意见反馈附件
@ -1909,10 +1870,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileDb-
/// <summary>
///
@ -2020,10 +1979,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileDbFile-
/// <summary>
///
@ -2131,10 +2088,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileType-
/// <summary>
///
@ -2242,10 +2197,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeChart-
/// <summary>
/// 首页:图标区域
@ -2353,10 +2306,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeHmi-HMI区域
/// <summary>
/// 首页HMI区域
@ -2464,10 +2415,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeRanking-
/// <summary>
/// 首页:排名区域
@ -2575,10 +2524,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeStatistic-
/// <summary>
/// 首页:统计区域
@ -2686,10 +2633,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormRelation-
/// <summary>
/// 关联表单配置
@ -2797,10 +2742,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region HomeTitle-
/// <summary>
/// 首页方针
@ -2908,10 +2851,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region MqttConfig-MQTT配置表
/// <summary>
/// MQTT配置表
@ -3019,10 +2960,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region MqttConfigTheme-
/// <summary>
///
@ -3130,10 +3069,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Notice-
/// <summary>
/// 通知
@ -3241,10 +3178,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region NoticeFile-
/// <summary>
///
@ -3352,10 +3287,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region PicFilter-
/// <summary>
/// 图片条件主表
@ -3463,10 +3396,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region PicFilterDetail-
/// <summary>
/// 图片条件子表
@ -3574,10 +3505,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region QuestionFeedback-
/// <summary>
/// 问题反馈表
@ -3685,10 +3614,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region QuestionFeedbackFile-
/// <summary>
/// 问题反馈附件表
@ -3796,10 +3723,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Scopes-
/// <summary>
/// 资源表
@ -3907,10 +3832,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region VersionManage-
/// <summary>
/// 版本管理表
@ -4018,8 +3941,6 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
}

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": false,
"applicationUrl": "http://localhost:5112"

View File

@ -293,15 +293,15 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{
try
{
AlibabaCloud.SDK.Dysmsapi20170525.Client client = CreateClient("LTAI5t6Pc52xRjzHgsVszgNY", "FxuLo87JVr0kXK6LjRRioVZpCw4frs");
AlibabaCloud.SDK.Dysmsapi20170525.Client client = CreateClient("LTAI5t6Pc52xRjzHqsVszgNY", "FxuLo87JVr0kXK6LjRRioVZpCw4frs");
DateTime now = DateTime.Now;
BaseFilter userfilter = new BaseFilter(filter.GetOrgId());
userfilter.SelectField = new string[] { "PHONE" };
var allUsers = GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, userfilter);
var approveUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE != 2 && t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()));
var allUsers = GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.ISGETMSG && t.PHONE != null && t.PHONE.Length == 11, userfilter);
var approveUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE != 2 && t.ENABLE_STATUS == 0 && t.ISGETMSG && t.PHONE != null && t.PHONE.Length == 11, new BaseFilter(filter.GetOrgId()));
var userIds = approveUsers.Select(t => t.ID);
List<T_FM_NOTIFICATION_TASK> sendSMSs = null;
if (now.Hour >= 7 && now.Hour < 23)
if (now.Hour >= 8 && now.Hour < 24)
{
sendSMSs = GetEntities<T_FM_NOTIFICATION_TASK>(t => t.NOTICE_STATUS == 0 && t.CREATE_TIME > now.AddDays(-6) && !t.SOURCE_FORMCODE.Contains("FO005") && t.SENDTIME == DateTime.MinValue, new BaseFilter(filter.GetOrgId())).ToList();
var sendSMSs2 = sendSMSs.Where(t => t.TASK_ENDDT < now.AddHours(1) && t.TASK_ENDDT > t.TASK_STARTDT);

View File

@ -1464,7 +1464,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{
return true;
}
T_FM_USER user = UserService.GetSafeApproveUser(yearPlan.ORG_ID.Value);//默认安环专员
T_FM_USER user = UserService.GetSafeApproveUser(config.ORG_ID.Value);//默认安环专员
if (user == null)
{
throw new Exception("未找到安环部相关审批人员!");

View File

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

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"applicationUrl": "http://localhost:5118",
"nativeDebugging": false

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": true,
"applicationUrl": "http://localhost:5179"

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"applicationUrl": "http://localhost:5180",
"nativeDebugging": false

View File

@ -5,7 +5,7 @@
"commandName": "Project",
"launchUrl": "api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Pdev"
"ASPNETCORE_ENVIRONMENT": "Test"
},
"nativeDebugging": false,
"applicationUrl": "http://localhost:5177"