|
@@ -2178,7 +2178,7 @@ namespace OASystem.API.Controllers
|
|
|
if (sd_transfer != null)
|
|
|
{
|
|
|
item.transferParentId = sd_transfer.STid;
|
|
|
- item.transferParentIdStr = sd_transfer.STid == 62 ? "公转" : sd_transfer.STid == 63 ? "私转" : "";
|
|
|
+ item.transferParentIdStr = sd_transfer.STid == 0 ? "公转" : sd_transfer.STid == 1 ? "私转" : "";
|
|
|
}
|
|
|
}
|
|
|
else
|
|
@@ -2188,7 +2188,7 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
item.transferTypeIdStr = sd_transfer.Name;
|
|
|
item.transferParentId = sd_transfer.STid;
|
|
|
- item.transferParentIdStr = sd_transfer.STid == 62 ? "公转" : sd_transfer.STid == 63 ? "私转" : "";
|
|
|
+ item.transferParentIdStr = sd_transfer.STid == 0 ? "公转" : sd_transfer.STid == 1 ? "私转" : "";
|
|
|
dic_setData.Add(item.transferTypeId, sd_transfer.Name);
|
|
|
}
|
|
|
}
|
|
@@ -2207,8 +2207,8 @@ namespace OASystem.API.Controllers
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- decimal total_gz = DailyFeePaymentData.Where(s => s.transferParentId == 62).Sum(d => d.SumPrice ?? 0M);
|
|
|
- decimal total_sz = DailyFeePaymentData.Where(s => s.transferParentId == 63).Sum(d => d.SumPrice ?? 0M);
|
|
|
+ decimal total_gz = DailyFeePaymentData.Where(s => s.transferParentId == 0).Sum(d => d.SumPrice ?? 0M);
|
|
|
+ decimal total_sz = DailyFeePaymentData.Where(s => s.transferParentId == 1).Sum(d => d.SumPrice ?? 0M);
|
|
|
|
|
|
var result = new tree_Fin_DailyFeePaymentResult() { gz = total_gz, sz = total_sz, dataList = DailyFeePaymentData };
|
|
|
|