diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 87c725ba..8002a14b 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -53770,11 +53770,11 @@ Ghra_staff_InsureBase DescText 1743489513 Administrator -1743490106 +1743587696 Administrator 说明 -nvarchar(32) -32 +nvarchar(2000) +2000 1E086FDB-189B-42E8-8027-48526B989755 diff --git a/Tiobon.Core.Api/Controllers/Ghrm/Ghrm_MessageToDoController.cs b/Tiobon.Core.Api/Controllers/Ghrm/Ghrm_MessageToDoController.cs new file mode 100644 index 00000000..0b3ea10a --- /dev/null +++ b/Tiobon.Core.Api/Controllers/Ghrm/Ghrm_MessageToDoController.cs @@ -0,0 +1,14 @@ +namespace Tiobon.Core.Api.Controllers; + +/// +/// Ghrm_MessageToDo(Controller) +/// +[Route("api/[controller]")] +[ApiController, GlobalActionFilter] +[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghrm)] +public class Ghrm_MessageToDoController : BaseController +{ + public Ghrm_MessageToDoController(IGhrm_MessageToDoServices service) : base(service) + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 5f7b6557..654828c7 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -13385,6 +13385,156 @@ Reverse9 + + + Ghrm_MessageToDo (Dto.Base) + + + + + MessageToDoID + + + + + ToUserID + + + + + GroupType + + + + + Tag + + + + + DataID + + + + + DataTable + + + + + WorkID + + + + + NodeID + + + + + Title + + + + + Content + + + + + PicType + + + + + PicUrl + + + + + JumpType + + + + + APPUrl + + + + + WEBUrl + + + + + IsAgreeBtn + + + + + IsRejectBtn + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + Ghrm_MessageUser (Dto.Base) @@ -15692,6 +15842,11 @@ Ghrm_MessageText (Dto.EditInput) + + + Ghrm_MessageToDo (Dto.EditInput) + + Ghrm_MessageUser (Dto.EditInput) @@ -16263,6 +16418,11 @@ Ghrm_MessageText (Dto.InsertInput) + + + Ghrm_MessageToDo (Dto.InsertInput) + + Ghrm_MessageUser (Dto.InsertInput) @@ -29892,6 +30052,156 @@ Reverse9 + + + Ghrm_MessageToDo (Model) + + + + + MessageToDoID + + + + + ToUserID + + + + + GroupType + + + + + Tag + + + + + DataID + + + + + DataTable + + + + + WorkID + + + + + NodeID + + + + + Title + + + + + Content + + + + + PicType + + + + + PicUrl + + + + + JumpType + + + + + APPUrl + + + + + WEBUrl + + + + + IsAgreeBtn + + + + + IsRejectBtn + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + Ghrm_MessageUser (Model) @@ -34828,6 +35138,21 @@ 修改信息 + + + Ghrm_MessageToDo(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + Ghrm_MessageUser(Dto.View1) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 7ed65935..a43f3f3c 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -2091,6 +2091,11 @@ Ghrm_MessageText(Controller) + + + Ghrm_MessageToDo(Controller) + + Ghrm_MessageUser(Controller) diff --git a/Tiobon.Core.IServices/Ghrm/IGhrm_MessageToDoServices.cs b/Tiobon.Core.IServices/Ghrm/IGhrm_MessageToDoServices.cs new file mode 100644 index 00000000..ccbef7b7 --- /dev/null +++ b/Tiobon.Core.IServices/Ghrm/IGhrm_MessageToDoServices.cs @@ -0,0 +1,8 @@ +namespace Tiobon.Core.IServices; + +/// +/// Ghrm_MessageToDo(自定义服务接口) +/// +public interface IGhrm_MessageToDoServices : IBaseServices +{ +} \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Survey.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Survey.Dto.Base.cs index 7f371e16..b786b327 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Survey.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Survey.Dto.Base.cs @@ -115,7 +115,7 @@ public class Ghre_SurveyBase /// /// 说明 /// - [Display(Name = "DescText"), Description("说明"), MaxLength(32, ErrorMessage = "说明 不能超过 32 个字符")] + [Display(Name = "DescText"), Description("说明"), MaxLength(2000, ErrorMessage = "说明 不能超过 2000 个字符")] public string DescText { get; set; } /// diff --git a/Tiobon.Core.Model/Base/Ghrm/Ghrm_MessageToDo.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrm/Ghrm_MessageToDo.Dto.Base.cs new file mode 100644 index 00000000..a55920a0 --- /dev/null +++ b/Tiobon.Core.Model/Base/Ghrm/Ghrm_MessageToDo.Dto.Base.cs @@ -0,0 +1,193 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrm_MessageToDo.cs +* +*功 能： N / A +* 类 名： Ghrm_MessageToDo +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/4/2 17:22:45 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrm_MessageToDo (Dto.Base) +/// +public class Ghrm_MessageToDoBase +{ + + /// + /// MessageToDoID + /// + public long? MessageToDoID { get; set; } + + /// + /// ToUserID + /// + public int? ToUserID { get; set; } + + /// + /// GroupType + /// + [Display(Name = "GroupType"), Description("GroupType"), MaxLength(100, ErrorMessage = "GroupType 不能超过 100 个字符")] + public string GroupType { get; set; } + + /// + /// Tag + /// + [Display(Name = "Tag"), Description("Tag"), MaxLength(100, ErrorMessage = "Tag 不能超过 100 个字符")] + public string Tag { get; set; } + + /// + /// DataID + /// + public int? DataID { get; set; } + + /// + /// DataTable + /// + [Display(Name = "DataTable"), Description("DataTable"), MaxLength(200, ErrorMessage = "DataTable 不能超过 200 个字符")] + public string DataTable { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// NodeID + /// + [Display(Name = "NodeID"), Description("NodeID"), MaxLength(100, ErrorMessage = "NodeID 不能超过 100 个字符")] + public string NodeID { get; set; } + + /// + /// Title + /// + [Display(Name = "Title"), Description("Title"), MaxLength(200, ErrorMessage = "Title 不能超过 200 个字符")] + public string Title { get; set; } + + /// + /// Content + /// + [Display(Name = "Content"), Description("Content"), MaxLength(-1, ErrorMessage = "Content 不能超过 -1 个字符")] + public string Content { get; set; } + + /// + /// PicType + /// + [Display(Name = "PicType"), Description("PicType"), MaxLength(200, ErrorMessage = "PicType 不能超过 200 个字符")] + public string PicType { get; set; } + + /// + /// PicUrl + /// + [Display(Name = "PicUrl"), Description("PicUrl"), MaxLength(200, ErrorMessage = "PicUrl 不能超过 200 个字符")] + public string PicUrl { get; set; } + + /// + /// JumpType + /// + [Display(Name = "JumpType"), Description("JumpType"), MaxLength(200, ErrorMessage = "JumpType 不能超过 200 个字符")] + public string JumpType { get; set; } + + /// + /// APPUrl + /// + [Display(Name = "APPUrl"), Description("APPUrl"), MaxLength(200, ErrorMessage = "APPUrl 不能超过 200 个字符")] + public string APPUrl { get; set; } + + /// + /// WEBUrl + /// + [Display(Name = "WEBUrl"), Description("WEBUrl"), MaxLength(200, ErrorMessage = "WEBUrl 不能超过 200 个字符")] + public string WEBUrl { get; set; } + + /// + /// IsAgreeBtn + /// + [Display(Name = "IsAgreeBtn"), Description("IsAgreeBtn"), MaxLength(10, ErrorMessage = "IsAgreeBtn 不能超过 10 个字符")] + public string IsAgreeBtn { get; set; } + + /// + /// IsRejectBtn + /// + [Display(Name = "IsRejectBtn"), Description("IsRejectBtn"), MaxLength(10, ErrorMessage = "IsRejectBtn 不能超过 10 个字符")] + public string IsRejectBtn { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } +} diff --git a/Tiobon.Core.Model/Edit/Ghrm/Ghrm_MessageToDo.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrm/Ghrm_MessageToDo.Dto.EditInput.cs new file mode 100644 index 00000000..fcbd3fd7 --- /dev/null +++ b/Tiobon.Core.Model/Edit/Ghrm/Ghrm_MessageToDo.Dto.EditInput.cs @@ -0,0 +1,26 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrm_MessageToDo.cs +* +*功 能： N / A +* 类 名： Ghrm_MessageToDo +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/4/2 17:22:45 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrm_MessageToDo (Dto.EditInput) +/// +public class EditGhrm_MessageToDoInput : Ghrm_MessageToDoBase +{ +} diff --git a/Tiobon.Core.Model/Insert/Ghrm/Ghrm_MessageToDo.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrm/Ghrm_MessageToDo.Dto.InsertInput.cs new file mode 100644 index 00000000..a220bca8 --- /dev/null +++ b/Tiobon.Core.Model/Insert/Ghrm/Ghrm_MessageToDo.Dto.InsertInput.cs @@ -0,0 +1,26 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrm_MessageToDo.cs +* +*功 能： N / A +* 类 名： Ghrm_MessageToDo +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/4/2 17:22:45 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrm_MessageToDo (Dto.InsertInput) +/// +public class InsertGhrm_MessageToDoInput : Ghrm_MessageToDoBase +{ +} diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Survey.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Survey.cs index 07a4ae7f..eba350c8 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Survey.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Survey.cs @@ -116,7 +116,7 @@ public class Ghre_Survey : BasePoco /// /// 说明 /// - [Display(Name = "DescText"), Description("说明"), MaxLength(32, ErrorMessage = "说明 不能超过 32 个字符")] + [Display(Name = "DescText"), Description("说明"), MaxLength(2000, ErrorMessage = "说明 不能超过 2000 个字符")] public string DescText { get; set; } /// diff --git a/Tiobon.Core.Model/Models/Ghrm/Ghrm_MessageToDo.cs b/Tiobon.Core.Model/Models/Ghrm/Ghrm_MessageToDo.cs new file mode 100644 index 00000000..549cc64b --- /dev/null +++ b/Tiobon.Core.Model/Models/Ghrm/Ghrm_MessageToDo.cs @@ -0,0 +1,195 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrm_MessageToDo.cs +* +*功 能： N / A +* 类 名： Ghrm_MessageToDo +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/4/2 17:22:45 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrm_MessageToDo (Model) +/// +[SugarTable("Ghrm_MessageToDo", "Ghrm_MessageToDo"), Entity(TableCnName = "Ghrm_MessageToDo", TableName = "Ghrm_MessageToDo")] +public class Ghrm_MessageToDo : BasePoco1 +{ + + /// + /// MessageToDoID + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] + public long? MessageToDoID { get; set; } + + /// + /// ToUserID + /// + public int? ToUserID { get; set; } + + /// + /// GroupType + /// + [Display(Name = "GroupType"), Description("GroupType"), MaxLength(100, ErrorMessage = "GroupType 不能超过 100 个字符")] + public string GroupType { get; set; } + + /// + /// Tag + /// + [Display(Name = "Tag"), Description("Tag"), MaxLength(100, ErrorMessage = "Tag 不能超过 100 个字符")] + public string Tag { get; set; } + + /// + /// DataID + /// + public int? DataID { get; set; } + + /// + /// DataTable + /// + [Display(Name = "DataTable"), Description("DataTable"), MaxLength(200, ErrorMessage = "DataTable 不能超过 200 个字符")] + public string DataTable { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// NodeID + /// + [Display(Name = "NodeID"), Description("NodeID"), MaxLength(100, ErrorMessage = "NodeID 不能超过 100 个字符")] + public string NodeID { get; set; } + + /// + /// Title + /// + [Display(Name = "Title"), Description("Title"), MaxLength(200, ErrorMessage = "Title 不能超过 200 个字符")] + public string Title { get; set; } + + /// + /// Content + /// + [Display(Name = "Content"), Description("Content"), MaxLength(-1, ErrorMessage = "Content 不能超过 -1 个字符")] + public string Content { get; set; } + + /// + /// PicType + /// + [Display(Name = "PicType"), Description("PicType"), MaxLength(200, ErrorMessage = "PicType 不能超过 200 个字符")] + public string PicType { get; set; } + + /// + /// PicUrl + /// + [Display(Name = "PicUrl"), Description("PicUrl"), MaxLength(200, ErrorMessage = "PicUrl 不能超过 200 个字符")] + public string PicUrl { get; set; } + + /// + /// JumpType + /// + [Display(Name = "JumpType"), Description("JumpType"), MaxLength(200, ErrorMessage = "JumpType 不能超过 200 个字符")] + public string JumpType { get; set; } + + /// + /// APPUrl + /// + [Display(Name = "APPUrl"), Description("APPUrl"), MaxLength(200, ErrorMessage = "APPUrl 不能超过 200 个字符")] + public string APPUrl { get; set; } + + /// + /// WEBUrl + /// + [Display(Name = "WEBUrl"), Description("WEBUrl"), MaxLength(200, ErrorMessage = "WEBUrl 不能超过 200 个字符")] + public string WEBUrl { get; set; } + + /// + /// IsAgreeBtn + /// + [Display(Name = "IsAgreeBtn"), Description("IsAgreeBtn"), MaxLength(10, ErrorMessage = "IsAgreeBtn 不能超过 10 个字符")] + public string IsAgreeBtn { get; set; } + + /// + /// IsRejectBtn + /// + [Display(Name = "IsRejectBtn"), Description("IsRejectBtn"), MaxLength(10, ErrorMessage = "IsRejectBtn 不能超过 10 个字符")] + public string IsRejectBtn { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } +} diff --git a/Tiobon.Core.Model/View/Ghrm/Ghrm_MessageToDo.Dto.View.cs b/Tiobon.Core.Model/View/Ghrm/Ghrm_MessageToDo.Dto.View.cs new file mode 100644 index 00000000..23c945d4 --- /dev/null +++ b/Tiobon.Core.Model/View/Ghrm/Ghrm_MessageToDo.Dto.View.cs @@ -0,0 +1,34 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrm_MessageToDo.cs +* +*功 能： N / A +* 类 名： Ghrm_MessageToDo +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/4/2 17:22:45 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + +/// +/// Ghrm_MessageToDo(Dto.View1) +/// +public class Ghrm_MessageToDoDto : Ghrm_MessageToDo +{ + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } +} diff --git a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs index e8b6863b..7f9d5fb9 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs @@ -324,15 +324,17 @@ public class Ghre_SurveyServices : BaseServices x.OptionNo == question.Value1[j]).FirstOrDefault(); - var questionOption1 = question.Options.Where(x => x.OptionNo == question.Value1[j]).FirstOrDefault(); - - option1.SurveyQuestionOptionId = questionOption1?.Id; - option1.OptionContent = question.Value1[j]; + option1.SurveyQuestionOptionId = questionOption1?.Id; + option1.OptionContent = question.Value1[j]; - if (questionOption1.IsOther == true) - option1.Reverse1 = questionOption1.OtherContent; - await Db.Insertable(option1).ExecuteReturnSnowflakeIdAsync(); + if (questionOption1.IsOther == true) + option1.Reverse1 = questionOption1.OtherContent; + await Db.Insertable(option1).ExecuteReturnSnowflakeIdAsync(); + } } break; @@ -349,13 +351,16 @@ public class Ghre_SurveyServices : BaseServices x.OptionNo == question.Value).FirstOrDefault(); + if (question.Value.IsNotEmptyOrNull()) + { + var questionOption = question.Options.Where(x => x.OptionNo == question.Value).FirstOrDefault(); - option.SurveyQuestionOptionId = questionOption?.Id; - option.OptionContent = question.Value; - if (questionOption.IsOther == true) - option.Reverse1 = questionOption.OtherContent; - await Db.Insertable(option).ExecuteReturnSnowflakeIdAsync(); + option.SurveyQuestionOptionId = questionOption?.Id; + option.OptionContent = question.Value; + if (questionOption.IsOther == true) + option.Reverse1 = questionOption.OtherContent; + await Db.Insertable(option).ExecuteReturnSnowflakeIdAsync(); + } break; @@ -393,6 +398,10 @@ public class Ghre_SurveyServices : BaseServices() .SetColumns(it => new Ghre_Survey() { Status = "Publish" }) .Where(x => x.Id == id) @@ -413,7 +422,32 @@ public class Ghre_SurveyServices : BaseServices().Where(x => x.UserStaffID != null && staffIds.Contains(x.UserStaffID.Value)).Select(x => x.UserId).ToListAsync(); + var userIds = await Db.Queryable().Where(x => x.UserStaffID != null && staffIds.Contains(x.UserStaffID.Value)).Select(x => new + { + x.UserId, + x.UserPhotoUrl + }).ToListAsync(); + + var ToDos = userIds.Select(x => new Ghrm_MessageToDo() + { + ToUserID = x.UserId, + GroupType = "Survey", + Tag = "问卷调查", + DataID = 0, + DataTable = "Ghre_Survey", + WorkID = 0, + Title = "问卷调查填写", + Content = $"问卷名称:{entity.SurveyName}
填写时间:{DateTimeHelper.ConvertToMiniuteString(entity.BeginTime)}~{DateTimeHelper.ConvertToMiniuteString(entity.EndTime)}", + PicType = "Url", + JumpType = "link", + WEBUrl = "/F_Ess_Nav_Survey/" + id, + IsAgreeBtn = "N", + IsRejectBtn = "N", + SortNo = 1, + IsDefault = 1 + }).ToList(); + + await Db.Insertable(ToDos).ExecuteReturnIdentityAsync(); return ServiceResult.OprateSuccess("发布成功！"); } diff --git a/Tiobon.Core.Services/Ghrm/Ghrm_MessageToDoServices.cs b/Tiobon.Core.Services/Ghrm/Ghrm_MessageToDoServices.cs new file mode 100644 index 00000000..bf51debe --- /dev/null +++ b/Tiobon.Core.Services/Ghrm/Ghrm_MessageToDoServices.cs @@ -0,0 +1,15 @@ +namespace Tiobon.Core.Services; + +/// +/// Ghrm_MessageToDo (服务) +/// +public class Ghrm_MessageToDoServices : BaseServices, IGhrm_MessageToDoServices +{ + private readonly IBaseRepository _dal; + public Ghrm_MessageToDoServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } +} \ No newline at end of file diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 5f7b6557..654828c7 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -13385,6 +13385,156 @@ Reverse9 + + + Ghrm_MessageToDo (Dto.Base) + + + + + MessageToDoID + + + + + ToUserID + + + + + GroupType + + + + + Tag + + + + + DataID + + + + + DataTable + + + + + WorkID + + + + + NodeID + + + + + Title + + + + + Content + + + + + PicType + + + + + PicUrl + + + + + JumpType + + + + + APPUrl + + + + + WEBUrl + + + + + IsAgreeBtn + + + + + IsRejectBtn + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + Ghrm_MessageUser (Dto.Base) @@ -15692,6 +15842,11 @@ Ghrm_MessageText (Dto.EditInput) + + + Ghrm_MessageToDo (Dto.EditInput) + + Ghrm_MessageUser (Dto.EditInput) @@ -16263,6 +16418,11 @@ Ghrm_MessageText (Dto.InsertInput) + + + Ghrm_MessageToDo (Dto.InsertInput) + + Ghrm_MessageUser (Dto.InsertInput) @@ -29892,6 +30052,156 @@ Reverse9 + + + Ghrm_MessageToDo (Model) + + + + + MessageToDoID + + + + + ToUserID + + + + + GroupType + + + + + Tag + + + + + DataID + + + + + DataTable + + + + + WorkID + + + + + NodeID + + + + + Title + + + + + Content + + + + + PicType + + + + + PicUrl + + + + + JumpType + + + + + APPUrl + + + + + WEBUrl + + + + + IsAgreeBtn + + + + + IsRejectBtn + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + Ghrm_MessageUser (Model) @@ -34828,6 +35138,21 @@ 修改信息 + + + Ghrm_MessageToDo(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + Ghrm_MessageUser(Dto.View1) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 7ed65935..a43f3f3c 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -2091,6 +2091,11 @@ Ghrm_MessageText(Controller) + + + Ghrm_MessageToDo(Controller) + + Ghrm_MessageUser(Controller)