1

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

@@ -41,10 +41,10 @@ From DelegationInfo With(Nolock) {2}
             {
                 //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 = listComplete.Count;
+                int totalCount = 0;
 
 
                 //未作详细描述文本
@@ -63,17 +63,24 @@ From DelegationInfo With(Nolock) {2}
                         default:
                             break;
                     }
+                    totalCount += comCount.nums;
                 }
 
                 int comNums = totalCount - count_0;
 
-
-                item.CompletePNumber = string.Format(@"{0} / {1}", comNums, totalCount);
+                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;