费用审核 下方合计调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2610,14 +2610,14 @@ FROM
                         if (currencyName.Equals("CNY"))
                         {
                             //已审核费用
-                            auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.AuditedFundsOriginal).ToString("#0.00"), currencyName);
+                            auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.ThisPayment).ToString("#0.00"), currencyName);
                             //未审核费用
                             unAuditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.UnAuditFundsOriginal).ToString("#0.00"), currencyName);
                         }
                         else
                         {
                             //已审核费用
-                            auditedFundsStr += string.Format(@"{0}{1}({2}CNY) |", strs.Sum(x => x.AuditedFundsOriginal).ToString("#0.00"), currencyName, strs.Sum(x => x.AuditedFunds).ToString("#0.00"));
+                            auditedFundsStr += string.Format(@"{0}{1}({2}CNY) |", strs.Sum(x => x.ThisPayment).ToString("#0.00"), currencyName, strs.Sum(x => x.AuditedFunds).ToString("#0.00"));
                             //未审核费用
                             unAuditedFundsStr += string.Format(@"{0}{1}({2}CNY) |", strs.Sum(x => x.UnAuditFundsOriginal).ToString("#0.00"), currencyName, strs.Sum(x => x.UnAuditFundsCNY).ToString("#0.00"));
                         }
@@ -8502,8 +8502,9 @@ FROM
             var jw = JsonView(false);
 
             var groupNameDatas = await _groupRepository.EnterExitCostGroupNameAsync();
-            var draftDatas = await _sqlSugar.Queryable<Grp_EnterExitCostDraft>().Where(x => x.IsDel == 0).OrderByDescending(x => x.CreateTime).ToListAsync();
+            var draftDatas = await _sqlSugar.Queryable<Grp_EnterExitCostDraft>().Where(x => x.IsDel == 0).OrderByDescending(x => x.CreateTime).Select(x => new {x.Id,x.DraftName }).ToListAsync();
             jw.Code = StatusCodes.Status200OK;
+            jw.Msg = "操作成功!";
             jw.Data = new { groupNameDatas= groupNameDatas.Data, draftNames = draftDatas };
             return Ok(jw);
         }

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -1107,8 +1107,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
       WHERE
         IsDel = 0
         AND DiId = di.Id
-    ) > 0 THEN 'true'
-    ELSE 'false'
+    ) > 0 THEN 'false'
+    ELSE 'true'
   END AS [IsNull]
 FROM
   Grp_DelegationInfo di