解决冲突

OASystem/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# IDE0005: Using 指令是不需要的。
+dotnet_diagnostic.IDE0005.severity = suggestion

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Serialization;
+using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLibs;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Groups;
@@ -35,14 +36,14 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> PostSearchGrpSchedule(JsonDtoBase _jsonDto)
+        public async Task<IActionResult> PostSearchGrpSchedule(string paras)
         {
-            if (string.IsNullOrEmpty(_jsonDto.Paras))
+            if (string.IsNullOrEmpty(paras))
             {
                 return Ok(JsonView(false, "参数为空"));
             }
 
-            Grp_ScheduleDto _ScheduleDto = JsonConvert.DeserializeObject<Grp_ScheduleDto>(_jsonDto.Paras);
+            Grp_ScheduleDto _ScheduleDto = JsonConvert.DeserializeObject<Grp_ScheduleDto>(paras);
             if (_ScheduleDto != null)
             {
                 if (_ScheduleDto.SearchType == 2)//获取列表
@@ -212,7 +213,6 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Logs("请求：" + JsonConvert.SerializeObject(dto));
                 var groupData = await _groupRepository.GroupOperation(dto);
                 if (groupData.Code != 0)
                 {
@@ -295,14 +295,9 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, groupData.Msg));
             }
 
-            TeamCodeView teamCodeView = new TeamCodeView
-            {
-                TourCode = groupData.Data
-            }; 
-
             GroupStepForDelegation.CreateWorkStep(dto.GroupId); //创建管控流程
 
-            return Ok(JsonView(teamCodeView));
+            return Ok(JsonView(groupData.Data));
         }
 
         /// <summary>
@@ -319,7 +314,7 @@ namespace OASystem.API.Controllers
             {
                 return Ok(JsonView(false, groupData.Msg));
             }
-
+            
             return Ok(JsonView(groupData.Data, groupData.Data.Count));
         }
 
@@ -364,7 +359,7 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(groupData.Data));
         }
 
-
+       
 
         #endregion
     }

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1,7 +1,4 @@
-
-using OASystem.Infrastructure.Repositories.System;
-
-namespace OASystem.API.Controllers
+namespace OASystem.API.Controllers
 {
     /// <summary>
     /// 资料相关
@@ -37,61 +34,7 @@ namespace OASystem.API.Controllers
             _countryFeeRep = countryFeeRep;
             _setDataTypeRep = setDataTypeRep;
         }
-        #region 数据类型资料
-        /// <summary>
-        /// 根据类型查询数据
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> QuerySetData(SetDataDto dto)
-        {
-            try
-            {
-                if (dto.DataType == 0)
-                {
-                    return Ok(JsonView(false, "请传类型Id！"));
-                }
-                var setData = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => s.STid == dto.DataType).ToList();
-                if (setData.Count == 0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
-                return Ok(JsonView(true, "查询成功！", setData));
-            }
-            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> QuerySetDataType(DtoBase dto)
-        {
-            try
-            {
-                var setDataType = _setDataTypeRep.QueryDto<Sys_SetDataType, SetDataTypeView>().ToList();
-                if (setDataType.Count==0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
-                setDataType = setDataType.OrderByDescending(s => s.CreateTime).ToList();
-                return Ok(JsonView(true, "查询成功！", setDataType));
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
-        }
-        #endregion
+      
 
         #region 车公司资料板块
 

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Newtonsoft.Json.Linq;
 using OASystem.Domain.Dtos.System;
-using Org.BouncyCastle.Asn1.Cms;
+using Org.BouncyCastle.Asn1.Cms;
 using System.Collections;
 using System.Xml.Linq;
 using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
@@ -31,14 +31,14 @@ namespace OASystem.API.Controllers
         private readonly SystemMenuAndFunctionRepository _SystemMenuAndFunctionRepository;
         private readonly JobPostAuthorityRepository _JobPostAuthorityRepository;
         private readonly JobPostRepository _jobRep;
-
+        private readonly SetDataTypeRepository _setDataTypeRep;
         private readonly UserAuthorityRepository _UserAuthorityRepository;
 
         public SystemController( CompanyRepository syscom, DepartmentRepository sysDepRep, UsersRepository userRep,
             IMapper mapper, SetDataRepository setDataRepository, CompanyRepository companyRepository,
             SystemMenuPermissionRepository systemMenuPermissionRepository, PageFunctionPermissionRepository pageFunctionPermissionRepository,
             SystemMenuAndFunctionRepository systemMenuAndFunctionRepository, JobPostAuthorityRepository jobPostAuthorityRepository, 
-            JobPostRepository jobRep,UserAuthorityRepository userAuthorityRepository, MessageRepository messageRep)
+            JobPostRepository jobRep,UserAuthorityRepository userAuthorityRepository, MessageRepository messageRep,SetDataTypeRepository setDataTypeRep)
             
         {
             _syscomRep = syscom;
@@ -54,6 +54,7 @@ namespace OASystem.API.Controllers
             _JobPostAuthorityRepository = jobPostAuthorityRepository;
             _UserAuthorityRepository = userAuthorityRepository;
             _jobRep = jobRep;
+            _setDataTypeRep = setDataTypeRep;
         }
         #region 消息
 
@@ -134,7 +135,63 @@ namespace OASystem.API.Controllers
         }
         #endregion
 
-       
+        #region 数据类型资料
+        /// <summary>
+        /// 根据类型查询数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QuerySetData(SetDataDto dto)
+        {
+            try
+            {
+                if (dto.DataType == 0)
+                {
+                    return Ok(JsonView(false, "请传类型Id！"));
+                }
+                var setData = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => s.STid == dto.DataType).ToList();
+                if (setData.Count == 0)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                return Ok(JsonView(true, "查询成功！", setData));
+            }
+            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> QuerySetDataType(setDataTypeDto dto)
+        {
+            try
+            {
+                Result setDataType = await _setDataTypeRep.QuerySetDataType(dto);
+                if (setDataType.Code == 0)
+                {
+                    return Ok(JsonView(true, "查询成功", setDataType.Data));
+                }
+                else
+                {
+                    return Ok(JsonView(false, setDataType.Msg));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        #endregion
         #region 企业操作
         /// <summary>
         /// 查询企业数据

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.System
+{
+    public class setDataTypeDto:DtoBase
+    {
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        public string CnName { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/System/Sys_SetDataType.cs

@@ -16,7 +16,7 @@ namespace OASystem.Domain.Entities.System
         /// 是否启用
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public bool IsEnable { get; set; } = true;
+        public int IsEnable { get; set; } = 1;
     }
     /// <summary>
     /// 数据表子类型

OASystem/OASystem.Domain/OASystem.Domain.csproj

@@ -7,6 +7,10 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Autofac" Version="6.4.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />

OASystem/OASystem.Domain/ViewModels/Resource/SetDataTypeView.cs

@@ -1,13 +0,0 @@
-using OASystem.Domain.Entities.System;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OASystem.Domain.ViewModels.Resource
-{
-    public class SetDataTypeView: Sys_SetDataType
-    {
-    }
-}

OASystem/OASystem.Domain/ViewModels/System/SetDataTypeView.cs

@@ -0,0 +1,17 @@
+using OASystem.Domain.Entities.System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.System
+{
+    public class SetDataTypeView:Sys_SetDataType
+    {
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        public string CnName { get; set; }
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Resource/SetDataTypeRepository.cs

@@ -1,24 +0,0 @@
-using AutoMapper;
-using OASystem.Domain;
-using OASystem.Domain.Dtos.Resource;
-using OASystem.Domain.Entities.Resource;
-using OASystem.Domain.ViewModels.Resource;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OASystem.Infrastructure.Repositories.Resource
-{
-    public class SetDataTypeRepository: BaseRepository<Sys_SetDataType, SetDataTypeView>
-    {
-        private readonly IMapper _mapper;
-        public SetDataTypeRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
-        {
-            _mapper = mapper;
-        }
-     
-    }
-   
-}

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

@@ -0,0 +1,152 @@
+using AutoMapper;
+using OASystem.Domain;
+using OASystem.Domain.Dtos.Resource;
+using OASystem.Domain.Dtos.System;
+using OASystem.Domain.Entities.Resource;
+using OASystem.Domain.Entities.System;
+using OASystem.Domain.ViewModels.Resource;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Infrastructure.Repositories.Resource
+{
+    public class SetDataTypeRepository: BaseRepository<Sys_SetDataType, SetDataTypeView>
+    {
+        private readonly IMapper _mapper;
+        public SetDataTypeRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
+        {
+            _mapper = mapper;
+        }
+
+        public async Task<Result> QuerySetDataType(setDataTypeDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                string sqlWhere = string.Empty;
+                if (!string.IsNullOrWhiteSpace(dto.Name))
+                {
+                    sqlWhere += string.Format(@" And s.Name like '%{0}%'", dto.Name);
+                }
+                if (!string.IsNullOrWhiteSpace(dto.Name))
+                {
+                    sqlWhere += string.Format(@" And u.CnName like '%{0}%'", dto.Name);
+                }
+                sqlWhere += string.Format(@" And s.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 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)
+                    {
+                        return result = new Result() { Code = -1, Msg = "暂无数据" };
+                    }
+                    SetDataType = SetDataType.OrderByDescending(x => x.CreateTime).ToList();
+
+                    if (dto.PageSize == 0 && dto.PageIndex == 0)
+                    {
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = SetDataType,
+                        };
+                    }
+                    else
+                    {
+                        int count = SetDataType.Count;
+                        float totalPage = (float)count / dto.PageSize;//总页数
+                        if (totalPage == 0) totalPage = 1;
+                        else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                        List<SetDataTypeView> _SetDataTypeView = new List<SetDataTypeView>();
+                        for (int i = 0; i < dto.PageSize; i++)
+                        {
+                            var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                            if (RowIndex < SetDataType.Count)
+                            {
+                                _SetDataTypeView.Add(SetDataType[RowIndex]);
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _SetDataTypeView },
+                        };
+                    }
+
+                }
+                else if (dto.PortType == 2)
+                {
+                    string sql = string.Format(@"select * from Res_HotelData {0}", sqlWhere);
+                    List<Res_HotelData> HotelDataData = await _sqlSugar.SqlQueryable<Res_HotelData>(sql).ToListAsync();
+                    if (HotelDataData.Count == 0)
+                    {
+                        return result = new Result() { Code = -1, Msg = "暂无数据" };
+                    }
+                    HotelDataData = HotelDataData.OrderByDescending(x => x.CreateTime).ToList();
+
+                    if (dto.PageSize == 0 && dto.PageIndex == 0)
+                    {
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = HotelDataData,
+                        };
+                    }
+                    else
+                    {
+                        int count = HotelDataData.Count;
+                        float totalPage = (float)count / dto.PageSize;//总页数
+                        if (totalPage == 0) totalPage = 1;
+                        else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                        List<Res_HotelData> _HotelData = new List<Res_HotelData>();
+                        for (int i = 0; i < dto.PageSize; i++)
+                        {
+                            var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                            if (RowIndex < HotelDataData.Count)
+                            {
+                                _HotelData.Add(HotelDataData[RowIndex]);
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        return result = new Result()
+                        {
+                            Code = 0,
+                            Msg = "查询成功",
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _HotelData },
+                        };
+                    }
+                }
+                else
+                {
+                    return result = new Result() { Code = -2, Msg = "请传入PortType参数！1:Web，2:Android,3:IOS" };
+                }
+            }
+            catch (Exception)
+            {
+                return result;
+                throw;
+            }
+        }
+    }
+   
+}