问卷题库池新增查询维护表单信息接口

1 month ago · a1a69c0a7c
parent d0b67351c7
commit a1a69c0a7c
7 changed files with 219 additions and 13 deletions
--- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyQuestionPoolController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyQuestionPoolController.cs
@ -23,8 +23,8 @@ public class Ghre_SurveyQuestionPoolController : BaseController<IGhre_SurveyQues
    /// </summary>
    /// <param name="Id"></param>
    /// <returns></returns>
-    [HttpPost("QueryFrom/{Id}")]
-    public async Task<ServiceResult<InsertGhre_SurveyQuestionExtend>> QueryFrom(long Id)
+    [HttpPost("QueryForm/{Id}")]
+    public async Task<ServiceResult<FromGhre_SurveyQuestionPoolInput>> QueryFrom(long Id)
    {
        return await _service.QueryFrom(Id);
    }
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@ -41898,6 +41898,16 @@
            修改信息 
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.FromGhre_SurveyQuestionPoolBaseData.CreateDataInfo">
+            <summary>
+            创建信息 
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.FromGhre_SurveyQuestionPoolBaseData.UpdateDataInfo">
+            <summary>
+            修改信息 
+            </summary>
+        </member>
        <member name="P:Tiobon.Core.Model.Ghre_CreditPointTotal.Id">
            <summary>
            员工id
--- a/Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs
+++ b/Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs
@ -12,5 +12,5 @@ public interface IGhre_SurveyQuestionPoolServices : IBaseServices<Ghre_SurveyQue

    Task<ServiceResult> InsertFrom(InsertGhre_SurveyQuestionExtend insertModel);

-    Task<ServiceResult<InsertGhre_SurveyQuestionExtend>> QueryFrom(long Id);
+    Task<ServiceResult<FromGhre_SurveyQuestionPoolInput>> QueryFrom(long Id);
 }
--- a/Tiobon.Core.Model/ViewModels/Extend/FromGhre_QuestionInput.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/FromGhre_QuestionInput.cs
@ -1,4 +1,6 @@
-namespace Tiobon.Core.Model;
+using Tiobon.Core.Model.ViewModels.Extend;
+
+namespace Tiobon.Core.Model;

 public class FromGhre_QuestionInput
 {
@ -65,4 +67,37 @@ public class FromGhre_QuestionQuestionAnswerList
    public string imageUrl { get; set; }
    public string imgWidthPc { get; set; }
    public string imgWidthApp { get; set; }
+}
+
+public class FromGhre_SurveyQuestionPoolInput
+{
+    public List<FromGhre_QuestionColumn> Column { get; set; } = new List<FromGhre_QuestionColumn>();
+    public FromGhre_SurveyQuestionPoolPageData PageData { get; set; } = new FromGhre_SurveyQuestionPoolPageData();
+
+}
+
+public class FromGhre_SurveyQuestionPoolPageData
+{
+    public FromGhre_SurveyQuestionPoolBaseData baseData { get; set; } = new FromGhre_SurveyQuestionPoolBaseData();
+    public List<FromGhre_SurveyQuestionPoolType> questionType { get; set; } = new List<FromGhre_SurveyQuestionPoolType> { };
+}
+public class FromGhre_SurveyQuestionPoolBaseData
+{
+    public int? BuiltIn { get; set; }
+
+
+    /// <summary>
+    /// 创建信息 
+    /// </summary>
+    public string CreateDataInfo { get; set; }
+
+    /// <summary>
+    /// 修改信息 
+    /// </summary>
+    public string UpdateDataInfo { get; set; }
+
+}
+public class FromGhre_SurveyQuestionPoolType: InsertGhre_SurveyQuestionExtend
+{ 
+    public int isActive { get; set; } = 0;  
 }
--- a/Tiobon.Core.Model/ViewModels/Extend/InsertGhre_SurveyExtend.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/InsertGhre_SurveyExtend.cs
@ -208,7 +208,7 @@ public class InsertGhre_SurveyQuestionExtend : Ghre_SurveyQuestionExtendBase
    /// <summary>
    /// 问卷调查选项
    /// </summary>
-    public List<InsertGhre_SurveyOptionExtend> Options { get; set; }
+    public List<InsertGhre_SurveyOptionExtend> Options { get; set; } = new List<InsertGhre_SurveyOptionExtend>();
 }

 /// <summary>
@ -244,7 +244,7 @@ public class InsertGhre_SurveyOptionExtend
    /// <summary>
    /// 是否其他选项
    /// </summary>
-    public bool? IsOther { get; set; }
+    public bool? IsOther { get; set; } = false;

    /// <summary>
    /// 其他选项内容
--- a/Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs
@ -1,4 +1,8 @@
-namespace Tiobon.Core.Services;
+using Newtonsoft.Json;
+using System.Net;
+using Tiobon.Core.IServices;
+
+namespace Tiobon.Core.Services;

 /// <summary>
 /// 问卷题库 (服务)
@ -52,16 +56,163 @@ public class Ghre_SurveyQuestionPoolServices : BaseServices<Ghre_SurveyQuestionP
    /// </summary>
    /// <param name="Id"></param>
    /// <returns></returns>
-    public async Task<ServiceResult<InsertGhre_SurveyQuestionExtend>> QueryFrom(long Id)
+    public async Task<ServiceResult<FromGhre_SurveyQuestionPoolInput>> QueryFrom(long Id)
    {
-        var data = new InsertGhre_SurveyQuestionExtend();
+        var data = new FromGhre_SurveyQuestionPoolInput();
+
+        #region Column
+        data.Column.Add(new FromGhre_QuestionColumn()
+        {
+            label = "系统内置",
+            field = "BuiltIn",
+            elementType = "Switch",
+            required = false,
+            multipleSelect = false,
+            editable = true,
+            dataSource = "",
+            placeholder = "保存后自动生成"
+        });
+
+        #endregion
+
+        #region PageData
+
+
+        var options = new List<InsertGhre_SurveyOptionExtend>
+        {
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo= "A",
+                OptionContent="非常满意",
+                Score=5
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="B",
+                OptionContent= "满意",
+                Score= 4,
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="C",
+                OptionContent= "一般",
+                Score= 3,
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="D",
+                OptionContent= "不满意",
+                Score= 2,
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="E",
+                OptionContent= "非常不满意",
+                Score=1
+            }
+        };
+
+
+        var options1 = new List<InsertGhre_SurveyOptionExtend>
+        {
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo= "A",
+                OptionContent="非常满意",
+                Score=5
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="B",
+                OptionContent= "满意",
+                Score= 4,
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="C",
+                OptionContent= "一般",
+                Score= 3,
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="D",
+                OptionContent= "不满意",
+                Score= 2,
+            },
+            new InsertGhre_SurveyOptionExtend()
+            {
+                OptionNo="E",
+                OptionContent= "非常不满意",
+                Score=1
+            }
+        };
+        data.PageData.questionType = new List<FromGhre_SurveyQuestionPoolType>
+        {
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "单选题",
+                QuestionType = "Single",
+                isActive = 1,
+                Options=options
+            },
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "多选题",
+                QuestionType = "Multiple",
+                isActive = 0,
+              Options=options
+            },
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "简答",
+                QuestionType = "ShortAnswer",
+                isActive = 0
+            },
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "单选评分",
+                QuestionType = "SingleScore",
+                isActive = 0,
+                Options=options
+            },
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "多选评分",
+                QuestionType = "MultipleScore",
+                isActive = 0,
+                Options=options
+            },
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "评分",
+                QuestionType = "Rate",
+                isActive = 0,
+                StartTips= "很不满意",
+                EndTips="非常满意",
+                QuestionIcon="ghr-survey-icon0"
+            },
+            new FromGhre_SurveyQuestionPoolType()
+            {
+                QuestionContent = "量表",
+                QuestionType = "Scale",
+                isActive = 0,
+                StartTips= "很不满意",
+                EndTips="非常满意",
+                QuestionIcon="ghr-survey-icon0"
+            }
+        };

-        if (Id > 0)
+        if (Id != 0)
        {
-            var options = await Db.Queryable<Ghre_SurveyQuestionPoolOption>().OrderBy(x => x.SortNo).Where(x => x.SurveyQuestionPoolId == Id).ToListAsync();
-            data.Options = Mapper.Map(options).ToANew<List<InsertGhre_SurveyOptionExtend>>();
+            var question = await base.QueryById(Id);
+            data.PageData.questionType.ForEach(x => x.isActive = 0);
+
+            data.PageData.baseData.CreateDataInfo = question.CreateDataInfo;
+            data.PageData.baseData.UpdateDataInfo = question.UpdateDataInfo;
+            data.PageData.baseData.BuiltIn = question.BuiltIn;
        }
-        return ServiceResult<InsertGhre_SurveyQuestionExtend>.OprateSuccess("查询成功！", data);
+        #endregion
+        return ServiceResult<FromGhre_SurveyQuestionPoolInput>.OprateSuccess("查询成功！", data);
    }

    public async Task<ServiceResult> InsertFrom(InsertGhre_SurveyQuestionExtend insertModel)
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@ -41898,6 +41898,16 @@
            修改信息 
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.FromGhre_SurveyQuestionPoolBaseData.CreateDataInfo">
+            <summary>
+            创建信息 
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.FromGhre_SurveyQuestionPoolBaseData.UpdateDataInfo">
+            <summary>
+            修改信息 
+            </summary>
+        </member>
        <member name="P:Tiobon.Core.Model.Ghre_CreditPointTotal.Id">
            <summary>
            员工id