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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -625,10 +625,13 @@ namespace OASystem.API.Controllers
                     if (updCount > 0 && dto.publishCode == 1) {
 
                         _delegationVisaRep.ChangeDataBase(DBEnum.OA2014DB); //切换到新OA后删除
-                        GroupInfoDto grpDto = new GroupInfoDto() { Id = dto.diId };
-                        var groupData = await _groupRepository.GetGroupInfo(grpDto);
+                        
+                        string sqlDelegation = string.Format(@" Select * From DelegationInfo With(Nolock) Where Id = {0} ", dto.diId);
+                        OA2021_DelegationInfo groupData = _sqlSugar.SqlQueryable<OA2021_DelegationInfo>(sqlDelegation).First();
+                        //GroupInfoDto grpDto = new GroupInfoDto() { Id = dto.diId };
+                        //var groupData = await _groupRepository.GetGroupInfo(grpDto);
                         _delegationVisaRep.ChangeDataBase(DBEnum.OA2023DB); //切换到新OA后删除
-                        if (groupData.Code != 0)
+                        if (groupData == null)
                         {
                             _delegationVisaRep.RollbackTran();
                         }

OASystem/OASystem.Domain/Entities/Groups/Grp_Ommission.cs

@@ -26,12 +26,12 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 团组结束时间，即团组最后一天
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string GroupDate { get; set; }
         /// <summary>
         /// 团组级别
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string GroupLvl { get; set; }
         /// <summary>
         /// 提成明细
@@ -46,7 +46,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 提成发放至工资的月份
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string WageYearMonth { get; set; }
         /// <summary>
         /// 造成损失标识

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationVisaRepository.cs

@@ -39,15 +39,48 @@ From DelegationInfo With(Nolock) {2}
 
             foreach (var item in dataSource)
             {
-                string sql2 = string.Format(@" Select * From Grp_VisaProgressCustomer With(Nolock) Where DiId={0} And IsDel=0 ", item.DiId);
-                List<Grp_VisaProgressCustomer> listComplete = _sqlSugar.SqlQueryable<Grp_VisaProgressCustomer>(sql2).ToList();
+                //string sql2 = string.Format(@" Select * From Grp_VisaProgressCustomer With(Nolock) Where DiId={0} And IsDel=0 ", item.DiId);
+                //List<Grp_VisaProgressCustomer> listComplete = _sqlSugar.SqlQueryable<Grp_VisaProgressCustomer>(sql2).ToList();
+                ChangeDataBase(DBEnum.OA2023DB);
+                string sql2 = string.Format(@" Select WorkStatus as code,COUNT(1) as nums From Grp_VisaProgressCustomer With(Nolock) Where DiId={0} And IsDel=0 Group by WorkStatus ", item.DiId);
+                List<dynamic> listComplete = _sqlSugar.SqlQueryable<dynamic>(sql2).ToList();
+                int totalCount = 0;
+
+
+                //未作详细描述文本
+                int count_0 = 0;
+                int count_1 = 0;
+                int count_2 = 0;
+                int count_3 = 0;
+                foreach (var comCount in listComplete)
+                {
+                    switch (comCount.code)
+                    {
+                        case 0: count_0 = comCount.nums; break;
+                        case 1: count_1 = comCount.nums; break;
+                        case 2: count_2 = comCount.nums; break;
+                        case 3: count_3 = comCount.nums; break;
+                        default:
+                            break;
+                    }
+                    totalCount += comCount.nums;
+                }
 
-                item.CompletePNumber = string.Format(@"已完成{0}人", listComplete.Count);
+                int comNums = totalCount - count_0;
+
+                if (comNums > 0)
+                {
+                    item.CompletePNumber = string.Format(@"{0} / {1}", comNums, totalCount);
+                }
+                else {
+                    item.CompletePNumber = "跳转配置";
+                }
             }
             rst.DataList = new List<Grp_DelegationVisaView>(dataSource);
 
             if (rst.DataList.Count > 0)
             {
+                ChangeDataBase(DBEnum.OA2014DB);
                 string sqlCount = string.Format(@" Select Id as DiId From DelegationInfo With(Nolock) {0} ", sqlWhere);
                 int dataCount = _sqlSugar.SqlQueryable<Grp_DelegationVisaView>(sqlCount).Count();
                 rst.DataCount = dataCount;