Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -171,7 +171,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> QuerySetDataType(setDataTypeDto dto)
+        public async Task<IActionResult> QuerySetDataType(SetDataTypeDto dto)
         {
             try
             {
@@ -191,6 +191,144 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
+
+        /// <summary>
+        /// 数据类型表操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OperationSetDataType(OperationSetDataTypeDto dto)
+        {
+            try
+            {
+                if (dto.Name == "")
+                {
+                    return Ok(JsonView(false, "请检查类型名称是否填写！"));
+                }
+                Result result = await _setDataTypeRep.OperationSetDataType(dto);
+                if (result.Code != 0)
+                {
+                    return Ok(JsonView(false, result.Msg));
+                }
+                return Ok(JsonView(true, result.Msg));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 数据类型表操作删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelSetDataType(DelSetDataTypeDto dto)
+        {
+            try
+            {
+                var res = await _setDataTypeRep.SoftDeleteByIdAsync<Sys_SetDataType>(dto.Id.ToString(), dto.DeleteUserId);
+                if (!res)
+                {
+                    return Ok(JsonView(false, "删除失败"));
+                }
+                return Ok(JsonView(true, "删除成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        #endregion
+
+        #region 数据类型板块
+        /// <summary>
+        /// 数据类型板块表查询
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QuerySetDataInfo(SetDataIDto dto)
+        {
+            try
+            {
+                Result setData = await _setDataRepository.QuerySetData(dto);
+                if (setData.Code == 0)
+                {
+                    return Ok(JsonView(true, "查询成功", setData.Data));
+                }
+                else
+                {
+                    return Ok(JsonView(false, setData.Msg));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 数据类型板块表操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OperationSetData(OperationSetDataDto dto)
+        {
+            try
+            {
+                if (dto.Name == "")
+                {
+                    return Ok(JsonView(false, "请检查板块名称是否填写！"));
+                }
+                Result result = await _setDataRepository.OperationSetData(dto);
+                if (result.Code != 0)
+                {
+                    return Ok(JsonView(false, result.Msg));
+                }
+                return Ok(JsonView(true, result.Msg));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 数据类型表操作删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelSetData(DelSetDataDto dto)
+        {
+            try
+            {
+                var res = await _setDataRepository.SoftDeleteByIdAsync<Sys_SetData>(dto.Id.ToString(), dto.DeleteUserId);
+                if (!res)
+                {
+                    return Ok(JsonView(false, "删除失败"));
+                }
+                return Ok(JsonView(true, "删除成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
         #endregion
 
         #region 企业操作

OASystem/OASystem.Api/OAMethodLib/GroupStepForDelegation.cs

@@ -1,6 +1,5 @@
 using Google.Protobuf.WellKnownTypes;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using OASystem.API.OAMethodLib;
 using OASystem.Domain.Common;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Groups;
@@ -9,7 +8,7 @@ using OASystem.Infrastructure.Repositories.Groups;
 using System.Configuration;
 using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
 
-namespace OASystem.API.OAMethodLibs
+namespace OASystem.API.OAMethodLib
 {
 
     /// <summary>
@@ -67,7 +66,7 @@ namespace OASystem.API.OAMethodLibs
                     #endregion
                     #region 经费预算
                     Grp_ScheduleDetailInfo grp_budget202 = _model.DeepClone();
-                    grp_budget202.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BudgetChild02);
+                    grp_budget202.JobContent = GrpSchedulePrimaryStepEnum.BudgetChild02.GetEnumDescription();
                     grp_budget202.ParentStep = (int)GrpSchedulePrimaryStepEnum.Budget;
                     grp_budget202.Step = (int)GrpSchedulePrimaryStepEnum.BudgetChild02;
                     grp_budget202.SLevel = 2;
@@ -76,7 +75,7 @@ namespace OASystem.API.OAMethodLibs
                     #region 市场部人员报价对接/反馈
                     //上传明细单
                     Grp_ScheduleDetailInfo grp_feedback302 = _model.DeepClone();
-                    grp_feedback302.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.FeedbackChild02);
+                    grp_feedback302.JobContent = GrpSchedulePrimaryStepEnum.FeedbackChild02.GetEnumDescription();
                     grp_feedback302.ParentStep = (int)GrpSchedulePrimaryStepEnum.Feedback;
                     grp_feedback302.Step = (int)GrpSchedulePrimaryStepEnum.FeedbackChild02;
                     grp_feedback302.SLevel = 2;
@@ -84,7 +83,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //录入最终总经费预算
                     Grp_ScheduleDetailInfo grp_feedback303 = _model.DeepClone();
-                    grp_feedback303.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.FeedbackChild03);
+                    grp_feedback303.JobContent = GrpSchedulePrimaryStepEnum.FeedbackChild03.GetEnumDescription();
                     grp_feedback303.ParentStep = (int)GrpSchedulePrimaryStepEnum.Feedback;
                     grp_feedback303.Step = (int)GrpSchedulePrimaryStepEnum.FeedbackChild03;
                     grp_feedback303.SLevel = 2;
@@ -92,7 +91,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //完成报价对接/反馈
                     Grp_ScheduleDetailInfo grp_feedback304 = _model.DeepClone();
-                    grp_feedback304.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.FeedbackChild04);
+                    grp_feedback304.JobContent = GrpSchedulePrimaryStepEnum.FeedbackChild04.GetEnumDescription();
                     grp_feedback304.ParentStep = (int)GrpSchedulePrimaryStepEnum.Feedback;
                     grp_feedback304.Step = (int)GrpSchedulePrimaryStepEnum.FeedbackChild04;
                     grp_feedback304.SLevel = 2;
@@ -104,7 +103,7 @@ namespace OASystem.API.OAMethodLibs
                     #region 护照/签证
                     //收集资料
                     Grp_ScheduleDetailInfo grp_visa502 = _model.DeepClone();
-                    grp_visa502.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild02);
+                    grp_visa502.JobContent = GrpSchedulePrimaryStepEnum.VisaChild02.GetEnumDescription();
                     grp_visa502.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa502.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild02;
                     grp_visa502.SLevel = 2;
@@ -112,7 +111,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //取护照资料
                     Grp_ScheduleDetailInfo grp_visa503 = _model.DeepClone();
-                    grp_visa503.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild03);
+                    grp_visa503.JobContent = GrpSchedulePrimaryStepEnum.VisaChild03.GetEnumDescription();
                     grp_visa503.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa503.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild03;
                     grp_visa503.SLevel = 2;
@@ -120,7 +119,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //填资料
                     Grp_ScheduleDetailInfo grp_visa504 = _model.DeepClone();
-                    grp_visa504.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild04);
+                    grp_visa504.JobContent = GrpSchedulePrimaryStepEnum.VisaChild04.GetEnumDescription();
                     grp_visa504.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa504.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild04;
                     grp_visa504.SLevel = 2;
@@ -128,7 +127,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //送签
                     Grp_ScheduleDetailInfo grp_visa505 = _model.DeepClone();
-                    grp_visa505.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild05);
+                    grp_visa505.JobContent = GrpSchedulePrimaryStepEnum.VisaChild05.GetEnumDescription();
                     grp_visa505.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa505.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild05;
                     grp_visa505.SLevel = 2;
@@ -136,7 +135,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //出签+取护照
                     Grp_ScheduleDetailInfo grp_visa506 = _model.DeepClone();
-                    grp_visa506.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild06);
+                    grp_visa506.JobContent = GrpSchedulePrimaryStepEnum.VisaChild06.GetEnumDescription();
                     grp_visa506.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa506.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild06;
                     grp_visa506.SLevel = 2;
@@ -144,7 +143,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //归还护照
                     Grp_ScheduleDetailInfo grp_visa507 = _model.DeepClone();
-                    grp_visa507.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild07);
+                    grp_visa507.JobContent = GrpSchedulePrimaryStepEnum.VisaChild07.GetEnumDescription();
                     grp_visa507.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa507.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild07;
                     grp_visa507.SLevel = 2;
@@ -152,7 +151,7 @@ namespace OASystem.API.OAMethodLibs
 
                     //签证费用录入 
                     Grp_ScheduleDetailInfo grp_visa508 = _model.DeepClone();
-                    grp_visa508.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.VisaChild08);
+                    grp_visa508.JobContent = GrpSchedulePrimaryStepEnum.VisaChild08.GetEnumDescription();
                     grp_visa508.ParentStep = (int)GrpSchedulePrimaryStepEnum.Visa;
                     grp_visa508.Step = (int)GrpSchedulePrimaryStepEnum.VisaChild08;
                     grp_visa508.SLevel = 2;
@@ -161,35 +160,35 @@ namespace OASystem.API.OAMethodLibs
                     #region 业务操作
                     //机票
                     Grp_ScheduleDetailInfo grp_busJP601 = _model.DeepClone();
-                    grp_busJP601.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJP);
+                    grp_busJP601.JobContent = GrpSchedulePrimaryStepEnum.BusinessJP.GetEnumDescription();
                     grp_busJP601.ParentStep = (int)GrpSchedulePrimaryStepEnum.Business;
                     grp_busJP601.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJP;
                     grp_busJP601.SLevel = 2;
                     entityList.Add(grp_busJP601);
                     //机票-询价并导入黑屏代码
                     Grp_ScheduleDetailInfo grp_busJP6012 = _model.DeepClone();
-                    grp_busJP6012.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJPChild02);
+                    grp_busJP6012.JobContent = GrpSchedulePrimaryStepEnum.BusinessJPChild02.GetEnumDescription();
                     grp_busJP6012.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessJP;
                     grp_busJP6012.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJPChild02;
                     grp_busJP6012.SLevel = 3;
                     entityList.Add(grp_busJP6012);
                     //机票-机票已占位
                     Grp_ScheduleDetailInfo grp_busJP6013 = _model.DeepClone();
-                    grp_busJP6013.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJPChild03);
+                    grp_busJP6013.JobContent = GrpSchedulePrimaryStepEnum.BusinessJPChild03.GetEnumDescription();
                     grp_busJP6013.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessJP;
                     grp_busJP6013.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJPChild03;
                     grp_busJP6013.SLevel = 3;
                     entityList.Add(grp_busJP6013);
                     //机票-已出票
                     Grp_ScheduleDetailInfo grp_busJP6014 = _model.DeepClone();
-                    grp_busJP6014.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJPChild04);
+                    grp_busJP6014.JobContent = GrpSchedulePrimaryStepEnum.BusinessJPChild04.GetEnumDescription();
                     grp_busJP6014.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessJP;
                     grp_busJP6014.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJPChild04;
                     grp_busJP6014.SLevel = 3;
                     entityList.Add(grp_busJP6014);
                     //机票-机票费用录入
                     Grp_ScheduleDetailInfo grp_busJP6015 = _model.DeepClone();
-                    grp_busJP6015.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJPChild05);
+                    grp_busJP6015.JobContent = GrpSchedulePrimaryStepEnum.BusinessJPChild05.GetEnumDescription();
                     grp_busJP6015.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessJP;
                     grp_busJP6015.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJPChild05;
                     grp_busJP6015.SLevel = 3;
@@ -197,14 +196,14 @@ namespace OASystem.API.OAMethodLibs
 
                     //酒店
                     Grp_ScheduleDetailInfo grp_busJD602 = _model.DeepClone();
-                    grp_busJD602.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJD);
+                    grp_busJD602.JobContent = GrpSchedulePrimaryStepEnum.BusinessJD.GetEnumDescription();
                     grp_busJD602.ParentStep = (int)GrpSchedulePrimaryStepEnum.Business;
                     grp_busJD602.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJD;
                     grp_busJD602.SLevel = 2;
                     entityList.Add(grp_busJD602);
                     //酒店-酒店费用录入
                     Grp_ScheduleDetailInfo grp_busJD6022 = _model.DeepClone();
-                    grp_busJD6022.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessJDChild02);
+                    grp_busJD6022.JobContent = GrpSchedulePrimaryStepEnum.BusinessJDChild02.GetEnumDescription();
                     grp_busJD6022.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessJD;
                     grp_busJD6022.Step = (int)GrpSchedulePrimaryStepEnum.BusinessJDChild02;
                     grp_busJD6022.SLevel = 3;
@@ -212,21 +211,21 @@ namespace OASystem.API.OAMethodLibs
 
                     //OP
                     Grp_ScheduleDetailInfo grp_busOP603 = _model.DeepClone();
-                    grp_busOP603.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessOP);
+                    grp_busOP603.JobContent = GrpSchedulePrimaryStepEnum.BusinessOP.GetEnumDescription();
                     grp_busOP603.ParentStep = (int)GrpSchedulePrimaryStepEnum.Business;
                     grp_busOP603.Step = (int)GrpSchedulePrimaryStepEnum.BusinessOP;
                     grp_busOP603.SLevel = 2;
                     entityList.Add(grp_busOP603);
                     //OP-OP询价
                     Grp_ScheduleDetailInfo grp_busOP6032 = _model.DeepClone();
-                    grp_busOP6032.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessOPChild02);
+                    grp_busOP6032.JobContent = GrpSchedulePrimaryStepEnum.BusinessOPChild02.GetEnumDescription();
                     grp_busOP6032.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessOP;
                     grp_busOP6032.Step = (int)GrpSchedulePrimaryStepEnum.BusinessOPChild02;
                     grp_busOP6032.SLevel = 3;
                     entityList.Add(grp_busOP6032);
                     //OP-OP费用录入
                     Grp_ScheduleDetailInfo grp_busOP6033 = _model.DeepClone();
-                    grp_busOP6033.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessOPChild03);
+                    grp_busOP6033.JobContent = GrpSchedulePrimaryStepEnum.BusinessOPChild03.GetEnumDescription();
                     grp_busOP6033.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessOP;
                     grp_busOP6033.Step = (int)GrpSchedulePrimaryStepEnum.BusinessOPChild03;
                     grp_busOP6033.SLevel = 3;
@@ -234,21 +233,21 @@ namespace OASystem.API.OAMethodLibs
 
                     //商邀
                     Grp_ScheduleDetailInfo grp_busSY604 = _model.DeepClone();
-                    grp_busSY604.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessSY);
+                    grp_busSY604.JobContent = GrpSchedulePrimaryStepEnum.BusinessSY.GetEnumDescription();
                     grp_busSY604.ParentStep = (int)GrpSchedulePrimaryStepEnum.Business;
                     grp_busSY604.Step = (int)GrpSchedulePrimaryStepEnum.BusinessSY;
                     grp_busSY604.SLevel = 2;
                     entityList.Add(grp_busSY604);
                     //商邀-商邀报批
                     Grp_ScheduleDetailInfo grp_busSY6042 = _model.DeepClone();
-                    grp_busSY6042.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessSYChild02);
+                    grp_busSY6042.JobContent = GrpSchedulePrimaryStepEnum.BusinessSYChild02.GetEnumDescription();
                     grp_busSY6042.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessSY;
                     grp_busSY6042.Step = (int)GrpSchedulePrimaryStepEnum.BusinessSYChild02;
                     grp_busSY6042.SLevel = 3;
                     entityList.Add(grp_busSY6042);
                     //商邀-商邀费用录入
                     Grp_ScheduleDetailInfo grp_busSY6043 = _model.DeepClone();
-                    grp_busSY6043.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessSYChild03);
+                    grp_busSY6043.JobContent = GrpSchedulePrimaryStepEnum.BusinessSYChild03.GetEnumDescription();
                     grp_busSY6043.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessSY;
                     grp_busSY6043.Step = (int)GrpSchedulePrimaryStepEnum.BusinessSYChild03;
                     grp_busSY6043.SLevel = 3;
@@ -259,7 +258,7 @@ namespace OASystem.API.OAMethodLibs
                     #region 费用审批
                     //机票费用审批
                     Grp_ScheduleDetailInfo grp_cost702 = _model.DeepClone();
-                    grp_cost702.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CostAuditChild02);
+                    grp_cost702.JobContent = GrpSchedulePrimaryStepEnum.CostAuditChild02.GetEnumDescription();
                     grp_cost702.ParentStep = (int)GrpSchedulePrimaryStepEnum.CostAudit;
                     grp_cost702.Step = (int)GrpSchedulePrimaryStepEnum.CostAuditChild02;
                     grp_cost702.Duty = _groupConfig.Boss;
@@ -267,7 +266,7 @@ namespace OASystem.API.OAMethodLibs
                     entityList.Add(grp_cost702);
                     //酒店费用审批
                     Grp_ScheduleDetailInfo grp_cost703 = _model.DeepClone();
-                    grp_cost703.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CostAuditChild03);
+                    grp_cost703.JobContent = GrpSchedulePrimaryStepEnum.CostAuditChild03.GetEnumDescription();
                     grp_cost703.ParentStep = (int)GrpSchedulePrimaryStepEnum.CostAudit;
                     grp_cost703.Step = (int)GrpSchedulePrimaryStepEnum.CostAuditChild03;
                     grp_cost703.Duty = _groupConfig.Boss;
@@ -275,7 +274,7 @@ namespace OASystem.API.OAMethodLibs
                     entityList.Add(grp_cost703);
                     //OP费用审批
                     Grp_ScheduleDetailInfo grp_cost704 = _model.DeepClone();
-                    grp_cost704.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CostAuditChild04);
+                    grp_cost704.JobContent = GrpSchedulePrimaryStepEnum.CostAuditChild04.GetEnumDescription();
                     grp_cost704.ParentStep = (int)GrpSchedulePrimaryStepEnum.CostAudit;
                     grp_cost704.Step = (int)GrpSchedulePrimaryStepEnum.CostAuditChild04;
                     grp_cost704.Duty = _groupConfig.Boss;
@@ -283,7 +282,7 @@ namespace OASystem.API.OAMethodLibs
                     entityList.Add(grp_cost704);
                     //OP费用审批
                     Grp_ScheduleDetailInfo grp_cost705 = _model.DeepClone();
-                    grp_cost705.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CostAuditChild05);
+                    grp_cost705.JobContent = GrpSchedulePrimaryStepEnum.CostAuditChild05.GetEnumDescription();
                     grp_cost705.ParentStep = (int)GrpSchedulePrimaryStepEnum.CostAudit;
                     grp_cost705.Step = (int)GrpSchedulePrimaryStepEnum.CostAuditChild05;
                     grp_cost705.Duty = _groupConfig.Boss;
@@ -291,7 +290,7 @@ namespace OASystem.API.OAMethodLibs
                     entityList.Add(grp_cost705);
                     //增减款项审批
                     Grp_ScheduleDetailInfo grp_cost706 = _model.DeepClone();
-                    grp_cost706.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CostAuditChild06);
+                    grp_cost706.JobContent = GrpSchedulePrimaryStepEnum.CostAuditChild06.GetEnumDescription();
                     grp_cost706.ParentStep = (int)GrpSchedulePrimaryStepEnum.CostAudit;
                     grp_cost706.Step = (int)GrpSchedulePrimaryStepEnum.CostAuditChild06;
                     grp_cost706.Duty = _groupConfig.Boss;
@@ -301,21 +300,21 @@ namespace OASystem.API.OAMethodLibs
                     #region 付款给供应商
                     //OP费用付款
                     Grp_ScheduleDetailInfo grp_pay802 = _model.DeepClone();
-                    grp_pay802.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.PayChild02);
+                    grp_pay802.JobContent = GrpSchedulePrimaryStepEnum.PayChild02.GetEnumDescription();
                     grp_pay802.ParentStep = (int)GrpSchedulePrimaryStepEnum.Pay;
                     grp_pay802.Step = (int)GrpSchedulePrimaryStepEnum.PayChild02;
                     grp_pay802.SLevel = 2;
                     entityList.Add(grp_pay802);
                     //商邀费用付款
                     Grp_ScheduleDetailInfo grp_pay803 = _model.DeepClone();
-                    grp_pay803.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.PayChild03);
+                    grp_pay803.JobContent = GrpSchedulePrimaryStepEnum.PayChild03.GetEnumDescription();
                     grp_pay803.ParentStep = (int)GrpSchedulePrimaryStepEnum.Pay;
                     grp_pay803.Step = (int)GrpSchedulePrimaryStepEnum.PayChild03;
                     grp_pay803.SLevel = 2;
                     entityList.Add(grp_pay803);
                     //增减款项付款
                     Grp_ScheduleDetailInfo grp_pay804 = _model.DeepClone();
-                    grp_pay804.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.PayChild04);
+                    grp_pay804.JobContent = GrpSchedulePrimaryStepEnum.PayChild04.GetEnumDescription();
                     grp_pay804.ParentStep = (int)GrpSchedulePrimaryStepEnum.Pay;
                     grp_pay804.Step = (int)GrpSchedulePrimaryStepEnum.PayChild04;
                     grp_pay804.SLevel = 2;
@@ -333,7 +332,7 @@ namespace OASystem.API.OAMethodLibs
                     #region 收款
                     //收款完成
                     Grp_ScheduleDetailInfo grp_col01 = _model.DeepClone();
-                    grp_col01.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CollectChild01);
+                    grp_col01.JobContent = GrpSchedulePrimaryStepEnum.CollectChild01.GetEnumDescription();
                     grp_col01.ParentStep = (int)GrpSchedulePrimaryStepEnum.Collect;
                     grp_col01.Step = (int)GrpSchedulePrimaryStepEnum.CollectChild01;
                     grp_col01.ExpectBeginDt = dftEndDt;

OASystem/OASystem.Api/OAMethodLib/TencentCloudAPI/TencentOCRTools.cs

@@ -1,5 +1,4 @@
 using OASystem.Domain.Dtos.Tencent;
-using OASystem.TencentOCR;
 using TencentCloud.Common;
 using TencentCloud.Ocr.V20181119.Models;
 using TencentCloud.Ocr.V20181119;

OASystem/OASystem.Api/Program.cs

@@ -5,9 +5,6 @@ using OASystem.API;
 using OASystem.RedisRepository.RedisAsyncHelper;
 using OASystem.RedisRepository.Config;
 using OASystem.API.OAMethodLib;
-using System.Text.Json.Serialization;
-using OASystem.API.OAMethodLibs;
-using OASystem.Domain.Dtos.Groups;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using OASystem.API.OAMethodLib.JuHeAPI;

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -27,7 +27,10 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<Sys_Message, DepartmentIView>();
             CreateMap<Sys_MessageReadAuth, DepartmentIView>();
             #endregion
-
+            #region 数据类型板块
+            CreateMap<OperationSetDataTypeDto, Sys_SetDataType>();
+            CreateMap<OperationSetDataDto, Sys_SetData>();
+            #endregion
             #region 公司板块
             CreateMap<Sys_Company, CompanyView>();
             CreateMap<AddCompanyDto, Sys_Company>();

OASystem/OASystem.Domain/Dtos/System/SetDataDto.cs

@@ -16,4 +16,57 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public int DataType { get; set; }
     }
+    /// <summary>
+    /// 类型表参数
+    /// </summary>
+    public class SetDataIDto:DtoBase
+    {
+        /// <summary>
+        /// 数据类型
+        /// </summary>
+        public int STid { get; set; }
+    }
+    public class OperationSetDataDto
+    {
+        /// <summary>
+        /// 操作状态
+        /// 1 添加 
+        /// 2 修改 
+        /// </summary>
+        public int Status { get; set; }
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 子类型名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Sys_SetDataType.id 数据类型表Id
+        /// </summary>
+        public int STid { get; set; }
+      
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+     
+    }
+    public class DelSetDataDto
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 删除者Id
+        /// </summary>
+        public int DeleteUserId { get; set; }
+    }
 }

OASystem/OASystem.Domain/Dtos/System/setDataTypeDto.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.Dtos.System
 {
-    public class setDataTypeDto:DtoBase
+    public class SetDataTypeDto:DtoBase
     {
         /// <summary>
         /// 类型名称
@@ -17,4 +17,50 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public string CnName { get; set; }
     }
+    public class OperationSetDataTypeDto
+    {
+        /// <summary>
+        /// 操作状态
+        /// 1 添加 
+        /// 2 修改 
+        /// </summary>
+        public int Status { get; set; }
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int IsEnable { get; set; } = 1;
+
+        
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+     
+        public int CreateUserId { get; set; }
+      
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+       
+    }
+
+    public class DelSetDataTypeDto
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 删除者Id
+        /// </summary>
+        public int DeleteUserId { get; set; }
+    }
 }

OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.Entities.System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -96,4 +97,10 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public List<int> FunArr { get; set; }
     }
+
+    public class SetDataIView:Sys_SetData
+    {
+        public string StName { get; set; }
+        public string CnName { get;set; }
+    }
 }

OASystem/OASystem.Infrastructure/Repositories/System/SetDataRepository.cs

@@ -1,6 +1,9 @@
 
+using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.Dtos.System;
 using OASystem.Domain.Dtos.UserDto;
+using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.System;
 
@@ -8,9 +11,10 @@ namespace OASystem.Infrastructure.Repositories.System
 {
     public class SetDataRepository : BaseRepository<Sys_SetData, SetDataView>
     {
-        public SetDataRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
+        private readonly IMapper _mapper;
+        public SetDataRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
         {
-
+            _mapper = mapper;
         }
 
         /// <summary>
@@ -94,7 +98,181 @@ namespace OASystem.Infrastructure.Repositories.System
 
             return result;
         }
-        
 
+        public async Task<Result> QuerySetData(SetDataIDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                string sqlWhere = string.Empty;
+                if (dto.STid!=0)
+                {
+                    sqlWhere += string.Format(@" And s2.STid ={0}=", dto.STid);
+                }
+                sqlWhere += string.Format(@" And s1.IsDel={0} And  s2.IsDel={0}", 0);
+                if (!string.IsNullOrEmpty(sqlWhere.Trim()))
+                {
+                    Regex r = new Regex("And");
+                    sqlWhere = r.Replace(sqlWhere, "Where", 1);
+                }
+                if (dto.PortType == 1)
+                {
+                    string sql = string.Format(@"select s2.*,s1.Name as 'StName',u.CnName from Sys_setDataType s1 left join Sys_SetData s2 on s1.Id=s2.STid left join Sys_Users u on s2.CreateUserId=u.Id {0}", sqlWhere);
+                    List<SetDataIView> SetData = await _sqlSugar.SqlQueryable<SetDataIView>(sql).ToListAsync();
+                    if (SetData.Count == 0)
+                    {
+                        return result = new Result() { Code = -1, Msg = "暂无数据" };
+                    }
+                    SetData = SetData.OrderByDescending(x => x.CreateTime).ToList();
+
+                    if (dto.PageSize == 0 && dto.PageIndex == 0)
+                    {
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = SetData,
+                        };
+                    }
+                    else
+                    {
+                        int count = SetData.Count;
+                        float totalPage = (float)count / dto.PageSize;//总页数
+                        if (totalPage == 0) totalPage = 1;
+                        else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                        List<SetDataIView> _SetData = new List<SetDataIView>();
+                        for (int i = 0; i < dto.PageSize; i++)
+                        {
+                            var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                            if (RowIndex < SetData.Count)
+                            {
+                                _SetData.Add(SetData[RowIndex]);
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _SetData },
+                        };
+                    }
+
+                }
+                else if (dto.PortType == 2)
+                {
+                    string sql = string.Format(@"select s2.*,s1.Name as 'StName' from Sys_setDataType s1 left join Sys_SetData s2 on s1.Id=s2.STid {0}", sqlWhere);
+                    List<SetDataIView> SetData = await _sqlSugar.SqlQueryable<SetDataIView>(sql).ToListAsync();
+                    if (SetData.Count == 0)
+                    {
+                        return result = new Result() { Code = -1, Msg = "暂无数据" };
+                    }
+                    SetData = SetData.OrderByDescending(x => x.CreateTime).ToList();
+
+                    if (dto.PageSize == 0 && dto.PageIndex == 0)
+                    {
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = SetData,
+                        };
+                    }
+                    else
+                    {
+                        int count = SetData.Count;
+                        float totalPage = (float)count / dto.PageSize;//总页数
+                        if (totalPage == 0) totalPage = 1;
+                        else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                        List<SetDataIView> _SetData = new List<SetDataIView>();
+                        for (int i = 0; i < dto.PageSize; i++)
+                        {
+                            var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                            if (RowIndex < SetData.Count)
+                            {
+                                _SetData.Add(SetData[RowIndex]);
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _SetData },
+                        };
+                    }
+                }
+                else
+                {
+                    return result = new Result() { Code = -2, Msg = "请传入PortType参数！1:Web，2:Android,3:IOS" };
+                }
+            }
+            catch (Exception)
+            {
+                return result;
+                throw;
+            }
+        }
+
+        public async Task<Result> OperationSetData(OperationSetDataDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                if (dto.Status == 1)//添加
+                {
+                    string selectSql = string.Format(@"select * from Sys_SetData where Name='{0}' and IsDel='{1}'"
+                                                       , dto.Name, 0);
+                    var SetData = await _sqlSugar.SqlQueryable<Sys_SetData>(selectSql).FirstAsync();//查询是否存在
+                    if (SetData != null)
+                    {
+                        return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
+
+                    }
+                    else//不存在，可添加
+                    {
+                        Sys_SetData _SetData = _mapper.Map<Sys_SetData>(dto);
+                        int id = await AddAsyncReturnId(_SetData);
+                        if (id == 0)
+                        {
+                            return result = new Result() { Code = -1, Msg = "添加失败！" };
+
+                        }
+                        result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
+                    }
+                }
+                else if (dto.Status == 2)//修改
+                {
+                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Sys_SetData
+                    {
+                        Name = dto.Name,
+                        STid = dto.STid,
+                        Remark = dto.Remark,
+                    });
+                    if (!res)
+                    {
+                        return result = new Result() { Code = -1, Msg = "修改失败！" };
+                    }
+                    result = new Result() { Code = 0, Msg = "修改成功！" };
+                }
+                else
+                {
+                    return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                }
+            }
+            catch (Exception ex)
+            {
+                return result = new Result() { Code = -2, Msg = "程序错误！" };
+            }
+            return result;
+        }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/SetDataTypeRepository.cs

@@ -11,17 +11,79 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OASystem.Infrastructure.Repositories.Resource
+namespace OASystem.Infrastructure.Repositories.System
 {
-    public class SetDataTypeRepository: BaseRepository<Sys_SetDataType, SetDataTypeView>
+    public class SetDataTypeRepository : BaseRepository<Sys_SetDataType, SetDataTypeView>
     {
         private readonly IMapper _mapper;
         public SetDataTypeRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
         {
             _mapper = mapper;
         }
+        /// <summary>
+        /// 数据类型种类修改添加炒作
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<Result> OperationSetDataType(OperationSetDataTypeDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                if (dto.Status == 1)//添加
+                {
+                    string selectSql = string.Format(@"select * from Sys_SetDataType where Name='{0}' and IsDel='{1}'"
+                                                       , dto.Name, 0);
+                    var SetDataType = await _sqlSugar.SqlQueryable<Sys_SetDataType>(selectSql).FirstAsync();//查询是否存在
+                    if (SetDataType != null)
+                    {
+                        return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
+
+                    }
+                    else//不存在，可添加
+                    {
+                        Sys_SetDataType _SetDataType = _mapper.Map<Sys_SetDataType>(dto);
+                        int id = await AddAsyncReturnId(_SetDataType);
+                        if (id == 0)
+                        {
+                            return result = new Result() { Code = -1, Msg = "添加失败！" };
 
-        public async Task<Result> QuerySetDataType(setDataTypeDto dto)
+                        }
+                        result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
+                    }
+                }
+                else if (dto.Status == 2)//修改
+                {
+                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Sys_SetDataType
+                    {
+                        Name = dto.Name,
+                        IsEnable = dto.IsEnable,
+                        Remark = dto.Remark,
+                    });
+                    if (!res)
+                    {
+                        return result = new Result() { Code = -1, Msg = "修改失败！" };
+                    }
+                    result = new Result() { Code = 0, Msg = "修改成功！" };
+                }
+                else
+                {
+                    return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                }
+            }
+            catch (Exception ex)
+            {
+                return result = new Result() { Code = -2, Msg = "程序错误！" };
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询数据类型种类
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<Result> QuerySetDataType(SetDataTypeDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
             try
@@ -43,7 +105,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 }
                 if (dto.PortType == 1)
                 {
-                    string sql = string.Format(@"select s.*,u.CnName from Sys_setDataType s left join Sys_Users u on s.CreateUserId=u.Id  {0}", sqlWhere);
+                    string sql = string.Format(@"select s.*,u.CnName from Sys_SetDataType s left join Sys_Users u on s.CreateUserId=u.Id  {0}", sqlWhere);
                     List<SetDataTypeView> SetDataType = await _sqlSugar.SqlQueryable<SetDataTypeView>(sql).ToListAsync();
                     if (SetDataType.Count == 0)
                     {
@@ -91,7 +153,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 }
                 else if (dto.PortType == 2)
                 {
-                    string sql = string.Format(@"select s.*,u.CnName from Sys_setDataType s left join Sys_Users u on s.CreateUserId=u.Id  {0}", sqlWhere);
+                    string sql = string.Format(@"select s.*,u.CnName from Sys_SetDataType s left join Sys_Users u on s.CreateUserId=u.Id  {0}", sqlWhere);
                     List<SetDataTypeView> SetDataType = await _sqlSugar.SqlQueryable<SetDataTypeView>(sql).ToListAsync();
                     if (SetDataType.Count == 0)
                     {
@@ -148,5 +210,5 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
         }
     }
-   
+
 }

OASystem/_Doc/OA2023数据字典.docx

@@ -531,7 +531,7 @@ Null
 是否由职位模板导入
 是否由职位模板导入
 
-9) 岗位权限表：Sys_JobPostAuthority（新增）
+9) 岗位权限表：（新增）
                                    字段名
                                  类型长度
                                  字段属性