收款退还与其他款项

Ctable == 98 更改为 CTable == 285

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -112,10 +112,9 @@ namespace OASystem.API.Controllers
         /// <summary>
         /// 团组汇率 币种 Item (来源：团组汇率)
         /// 根据 团组Id And 业务类型(CTable)Id
+        /// api处理CTable = 285,默认返回CNY
         /// </summary>
-        /// <param name="portType"> 1 Web 2 Android 3 Ios; </param>
-        /// <param name="diId"> 团组Id </param>
-        /// <param name="CTbale"> CTableType Id  </param>
+        /// <param name="dto"> 请求参数Dto </param>
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
@@ -151,6 +150,31 @@ namespace OASystem.API.Controllers
                     TeamRateModelGeneralView teamRateModels = new TeamRateModelGeneralView();
 
 
+                    #region 单独处理Ctable 币种汇率 默认 为CNY
+                    if (dto.CTbale == 285)
+                    {
+                        teamRateModels = new TeamRateModelGeneralView()
+                        {
+                            Id = 0,
+                            CTableId = 285,
+                            CTableName = "其他款项与收款退还",
+                            TeamRates = new List<TeamRateDescAddCurrencyIdView>() {
+                                new TeamRateDescAddCurrencyIdView()
+                                {
+                                    CurrencyId = 836,
+                                    CurrencyCode = "CNY",
+                                    CurrencyName = "人民币",
+                                    Rate = 1.0000M,
+                                }
+                            }
+                        };
+                        return Ok(JsonView(true, "操作成功!", teamRateModels));
+                    }
+
+
+                    #endregion
+
+
                     List<SetDataInfoView> currencyDatas = new List<SetDataInfoView>();    
                     #region 获取所有币种
 

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -607,6 +607,31 @@ namespace OASystem.API.OAMethodLib
                                 }
                             }
 
+                            #region 年假测试数据
+                            leaveDetails.Add(new LeaveDetails() { 
+                                TypeId = 1,
+                                TypeName = "年假",
+                                StartDt = Convert.ToDateTime("2023-11-21 09:00:00"),
+                                EndDt = Convert.ToDateTime("2023-11-21 12:00:00"),
+                                DtType = "halfday",
+                                Unit = "天",
+                                New_Duration = 0.50M
+                            });
+
+                            leaveDetails.Add(new LeaveDetails()
+                            {
+                                TypeId = 1,
+                                TypeName = "年假",
+                                StartDt = Convert.ToDateTime("2023-11-21 12:00:00"),
+                                EndDt = Convert.ToDateTime("2023-11-23 18:00:00"),
+                                DtType = "halfday",
+                                Unit = "天",
+                                New_Duration = 2.50M
+                            });
+
+
+                            #endregion
+
                             if (leaveDetails.Count > 0)
                             {
                                 foreach (LeaveDetails leave_item in leaveDetails)
@@ -658,7 +683,6 @@ namespace OASystem.API.OAMethodLib
                                 ex_Items_jq.Ex_ItemInfo = ex_ItemInfos.OrderBy(it => it.StartTimeDt).ThenBy(it => it.Apply_time_dt).ToList();
                                 ex_Items.Add(ex_Items_jq);
                             }
-
                         }
 
                         //打卡补卡
@@ -1184,11 +1208,16 @@ namespace OASystem.API.OAMethodLib
                         } 
                         else // 多天
                         {
-                            mealDeduction = 10 * duration;
+                            var njManyDaysItem = leaveDetails.Where(it => it.StartDt.ToString("yyyy-MM-dd") == startTime.ToString("yyyy-MM-dd")).ToList();
+                            if (njManyDaysItem.Count > 1)
+                            {
+                                mealDeduction = 10 * Math.Floor(duration);
+                            }
+                            else
+                            {
+                                mealDeduction = 10 * Math.Ceiling(duration);
+                            }
                         }
-
-                        
-
                     }
 
                     break;

OASystem/OASystem.Api/appsettings.json

@@ -171,6 +171,12 @@
     },
     {
       "CTableId": 98, //CtableId 其他款项
+      "PageIdDatas": [ //页面Id
+        
+      ]
+    },
+    {
+      "CTableId": 285, //CtableId 其他款项与收款退还
       "PageIdDatas": [ //页面Id
         69
       ]

OASystem/OASystem.Infrastructure/Repositories/Financial/PaymentRefundAndOtherMoneyRepository.cs

@@ -57,7 +57,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
 				                         Left Join Sys_Users u On u.Id = prom.CreateUserId 
 				                         Left Join Sys_SetData sd On prom.CurrencyId = sd.Id
 					                     Left Join Grp_CreditCardPayment ccp 
-                                         On ccp.CTable = 98 And ccp.CId = prom.Id And ccp.DIId = prom.DiId
+                                         On ccp.CTable = 285 And ccp.CId = prom.Id And ccp.DIId = prom.DiId
 				                         Where prom.IsDel = 0 And u.IsDel = 0 And sd.IsDel = 0 And  ccp.IsDel = 0
 					                     And prom.DiId = {0}", diId);
 
@@ -195,7 +195,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
 										 ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
 										 From Fin_PaymentRefundAndOtherMoney prom 
-										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 98 And ccp.IsDel = 0
+										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 285 And ccp.IsDel = 0
 										 Where prom.IsDel = 0 And ccp.DIId = prom.DiId And prom.Id = {0}", dto.Id);
                 var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).FirstAsync();
 
@@ -263,7 +263,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                         return _result;
                     }
 
-                    var teamReteData1 = teamReteDatas.Where(it => it.CTableId == 98).FirstOrDefault();
+                    var teamReteData1 = teamReteDatas.Where(it => it.CTableId == 285).FirstOrDefault();
                     if (teamReteData1 == null)
                     {
                         _result.Msg = "该团下的“其他款项”未设置团组汇率,请先设置!";
@@ -287,7 +287,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                     //Id = dto.CcpId,
                     //CId = dto.CcpId,
                     DIId = dto.DiId,
-                    CTable = 98,
+                    CTable = 285,
                     PayDId = dto.PayDId,
                     ConsumptionPatterns = dto.ConsumptionPatterns,
                     ConsumptionDate = string.Empty,
@@ -338,7 +338,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                     string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
 										 ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
 										 From Fin_PaymentRefundAndOtherMoney prom 
-										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 98 
+										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 285 
 										 Where prom.IsDel = 0 And ccp.IsDel = 0 And ccp.DIId = prom.DiId And prom.PriceName = '{0}'",
                                          _PaymentRefundAndOtherMoney.PriceName);
                     var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).FirstAsync();