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

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -729,6 +729,7 @@ namespace OASystem.API.Controllers
                     {
                         sqlWhere += string.Format(@" And jp.DepId={0}", dto.DepId);
                     }
+                    sqlWhere += string.Format(@" And jp.IsDel={0}", 0);
                     if (!string.IsNullOrEmpty(sqlWhere.Trim()))
                     {
                         Regex r = new Regex("And");

OASystem/OASystem.Domain/Dtos/System/CompanyDto.cs

@@ -62,6 +62,11 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
 
         public int CreateUserId { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
     /// <summary>

OASystem/OASystem.Infrastructure/Repositories/CRM/VisaDeleClientCompanyRepository.cs

@@ -39,7 +39,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
             if (dto.PortType == 1 || dto.PortType == 2)
             {
                 string sql = string.Format(@"Select ccc.Id,ccc.CompanyName,ccc.Address,ccc.PostCodes,su.CnName UserName,ccc.CreateTime,ccc.Remark
-                                             From Crm_CustomerCompany ccc Inner Join Sys_Users su On ccc.CreateUserId = su.Id where ccc.IsDel=0");
+                                             From Crm_CustomerCompany ccc Inner Join Sys_Users su On ccc.CreateUserId = su.Id where ccc.IsDel=0 order by CreateTime Desc");
 
                 var _clientCompanyList = await _sqlSugar.SqlQueryable<CustomerCompanyListView>(sql).ToListAsync();
                 if (_clientCompanyList.Count > 0)

OASystem/OASystem.Infrastructure/Repositories/Groups/TaskAssignmentRepository.cs

@@ -30,7 +30,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             {
                 //团组下拉框
                 List<dynamic> _DelegationInfos = new List<dynamic>();
-                List<Grp_DelegationInfo> grp_DelegationInfos=_sqlSugar.Queryable<Grp_DelegationInfo>().Where(a=>a.IsDel == 0 && a.TourCode !="" && a.IsState == 0).ToList();
+                List<Grp_DelegationInfo> grp_DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(a => a.IsDel == 0 && a.TourCode != "" && a.IsState == 0).ToList();
                 foreach (var Item in grp_DelegationInfos)
                 {
                     var data = new
@@ -42,7 +42,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 //任务下拉框
                 List<dynamic> _SetData = new List<dynamic>();
-                List<Sys_SetData> sys_SetData = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.Name != "其他款项" && a.STid ==16).ToList();
+                List<Sys_SetData> sys_SetData = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.Name != "其他款项" && a.STid == 16).ToList();
                 foreach (var Item in sys_SetData)
                 {
                     var data = new
@@ -54,7 +54,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 //人员安排列表
                 List<dynamic> _User = new List<dynamic>();
-                List<Sys_Users> sys_User = _sqlSugar.Queryable<Sys_Users>().Where(a => a.IsDel == 0 &&a.Id!=4).ToList();
+                List<Sys_Users> sys_User = _sqlSugar.Queryable<Sys_Users>().Where(a => a.IsDel == 0 && a.Id != 4).ToList();
                 foreach (var Item in sys_User)
                 {
                     var data = new
@@ -66,11 +66,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 var dataList = new
                 {
-                    DelegationInfos=_DelegationInfos,
-                    SetData= _SetData,
-                    User= _User
+                    DelegationInfos = _DelegationInfos,
+                    SetData = _SetData,
+                    User = _User
                 };
-                result=new Result(){ Code = 0, Msg = "成功", Data = dataList };
+                result = new Result() { Code = 0, Msg = "成功", Data = dataList };
             }
             catch (Exception)
             {
@@ -82,11 +82,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
         public async Task<Result> GetTaskAssignmenOp(TaskAssignmenDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
-            try 
+            try
             {
                 List<int> id = new List<int>();
-                List<Grp_GroupsTaskAssignment> _GroupsTaskAssignments = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(a=>a.DIId==dto.DIId && a.CTId==dto.CTId && a.IsDel==0).ToList();
-                foreach(var Group in _GroupsTaskAssignments) 
+                List<Grp_GroupsTaskAssignment> _GroupsTaskAssignments = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(a => a.DIId == dto.DIId && a.CTId == dto.CTId && a.IsDel == 0).ToList();
+                foreach (var Group in _GroupsTaskAssignments)
                 {
                     id.Add(Group.UId);
                 }
@@ -96,7 +96,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 List<int> union = id.Union(dto.UIdStr).ToList();//并集
                 for (int i = 0; i < del.Count; i++)
                 {
-                   await _sqlSugar.Updateable<Grp_GroupsTaskAssignment>().Where(a => a.UId == del[i] && a.DIId==dto.DIId && a.CTId==dto.CTId).SetColumns(a => new Grp_GroupsTaskAssignment()
+                    await _sqlSugar.Updateable<Grp_GroupsTaskAssignment>().Where(a => a.UId == del[i] && a.DIId == dto.DIId && a.CTId == dto.CTId).SetColumns(a => new Grp_GroupsTaskAssignment()
                     {
                         IsDel = 1,
                         DeleteUserId = dto.CreateUserId,
@@ -117,13 +117,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 //需添加的
                 foreach (var item in union)
                 {
-                    Grp_GroupsTaskAssignment AddData= _mapper.Map<Grp_GroupsTaskAssignment>(dto);
+                    Grp_GroupsTaskAssignment AddData = _mapper.Map<Grp_GroupsTaskAssignment>(dto);
                     AddData.UId = item;
 
-                    Grp_GroupsTaskAssignment addQuery = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().First(a=>a.DIId==AddData.DIId && a.UId==AddData.UId && a.CTId==AddData.CTId);
+                    Grp_GroupsTaskAssignment addQuery = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().First(a => a.DIId == AddData.DIId && a.UId == AddData.UId && a.CTId == AddData.CTId);
                     if (addQuery != null)
                     {
-                        await _sqlSugar.Updateable<Grp_GroupsTaskAssignment>().Where(a =>a.Id==addQuery.Id).SetColumns(a => new Grp_GroupsTaskAssignment()
+                        await _sqlSugar.Updateable<Grp_GroupsTaskAssignment>().Where(a => a.Id == addQuery.Id).SetColumns(a => new Grp_GroupsTaskAssignment()
                         {
                             IsDel = 0,
                             DeleteUserId = 0,
@@ -135,7 +135,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     {
                         int AddId = await AddAsyncReturnId(AddData);
                     }
-                    
+
                 }
 
                 result = new Result() { Code = 0, Msg = "保存成功！" };
@@ -145,7 +145,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 result = new Result() { Code = -2, Msg = "保存失败,未知错误" };
             }
             return result;
-            
+
         }
 
         public async Task<Result> TaskAssignmenQuery(TaskAssignmenQueryDto dto)
@@ -154,7 +154,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             try
             {
                 string sqlWhere = string.Empty;
-                if (dto.DIId!=0)
+                if (dto.DIId != 0)
                 {
                     sqlWhere += string.Format(@" And DIId ={0}", dto.DIId);
                 }
@@ -162,15 +162,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     return result = new Result() { Code = -1, Msg = "暂无数据" };
                 }
-                if (dto.CTId!=0)
+                if (dto.CTId != 0)
                 {
                     sqlWhere += string.Format(@" And CTId ={0}", dto.CTId);
                 }
-                else
-                {
-                    return result = new Result() { Code = -1, Msg = "暂无数据" };
-                }
                 
+
                 sqlWhere += string.Format(@" And IsDel={0} ", 0);
                 if (!string.IsNullOrEmpty(sqlWhere.Trim()))
                 {
@@ -180,16 +177,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 string sql = string.Format(@"select * from Grp_GroupsTaskAssignment {0}", sqlWhere);
                 List<Grp_GroupsTaskAssignment> GroupsTaskAssignment = await _sqlSugar.SqlQueryable<Grp_GroupsTaskAssignment>(sql).ToListAsync();
                 Grp_DelegationInfo grp_DelegationInfo = new Grp_DelegationInfo();
-                if (GroupsTaskAssignment.Count!=0)
+                grp_DelegationInfo = _sqlSugar.Queryable<Grp_DelegationInfo>().First(a => a.Id == dto.DIId && a.IsDel == 0);
+
+
+                if (GroupsTaskAssignment.Count != 0)
                 {
                     List<int> UserId = new List<int>();
                     foreach (var item in GroupsTaskAssignment)
                     {
                         UserId.Add(item.UId);
                     }
-
-                    grp_DelegationInfo = _sqlSugar.Queryable<Grp_DelegationInfo>().First(a => a.Id == GroupsTaskAssignment[0].DIId && a.IsDel==0);
-                    
                     var data = new
                     {
                         TaskAssignment = GroupsTaskAssignment[0],
@@ -205,9 +202,21 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 else
                 {
-                    result = new Result() { Code = -1, Msg = "暂无数据" };
+                    var data = new
+                    {
+                        TaskAssignment = new List<Grp_GroupsTaskAssignment>(),
+                        UserStr = new List<int>(),
+                        DelegationInfo = grp_DelegationInfo
+                    };
+                    result = new Result()
+                    {
+                        Code = 0,
+                        Msg = "查询成功！",
+                        Data = data
+                    };
                 }
-                
+
+
             }
             catch (Exception)
             {