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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2459,7 +2459,6 @@ namespace OASystem.API.Controllers
             }
         }
 
-
         /// <summary>
         /// 团组模块 - 出入境费用 - 基础数据源(团组名称/币种类型)
         /// </summary>
@@ -2590,30 +2589,30 @@ namespace OASystem.API.Controllers
                                                                 Where gntf.Isdel = 0");
                 var nationalTravelFeeData = await _sqlSugar.SqlQueryable<NationalTravelFeeInfoView>(nationalTravelFeeSql).ToListAsync();
 
-                var nationalTravel = nationalTravelFeeData.GroupBy(it => it.Country).Select(it1 => it1.FirstOrDefault());
+                //var nationalTravel = nationalTravelFeeData.GroupBy(it => it.Country).Select(it1 => it1.FirstOrDefault());
 
-                List<dynamic> nationalTravelFeeData1 = new List<dynamic>();
+                //List<dynamic> nationalTravelFeeData1 = new List<dynamic>();
 
-                foreach (var item in nationalTravel)
-                {
-                    var cityData = nationalTravelFeeData.Where(it => it.Country == item.Country).ToList();
-                    var otherData = cityData.Where(it => it.City.Contains("其他城市")).FirstOrDefault();
-                    if (otherData != null)
-                    {
-                        cityData.Remove(otherData);
-                        cityData.Add(otherData);
-                    }
+                //foreach (var item in nationalTravel)
+                //{
+                //    var cityData = nationalTravelFeeData.Where(it => it.Country == item.Country).ToList();
+                //    var otherData = cityData.Where(it => it.City.Contains("其他城市")).FirstOrDefault();
+                //    if (otherData != null)
+                //    {
+                //        cityData.Remove(otherData);
+                //        cityData.Add(otherData);
+                //    }
 
 
-                    nationalTravelFeeData1.Add(new
-                    {
-                        Country = item.Country,
-                        CityData = cityData
-                    });
-                }
+                //    nationalTravelFeeData1.Add(new
+                //    {
+                //        Country = item.Country,
+                //        CityData = cityData
+                //    });
+                //}
 
                 sw.Stop();
-                return Ok(JsonView(true, "查询成功！耗时:" + sw.ElapsedMilliseconds + "ms", nationalTravelFeeData1));
+                return Ok(JsonView(true, "查询成功！耗时:" + sw.ElapsedMilliseconds + "ms", nationalTravelFeeData));
             }
             catch (Exception ex)
             {

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -627,22 +627,33 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 上传个税
+        /// 下载个税模板
         /// </summary>
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> UploadTax(IFormFile file,string yearMonth)
+        public async Task<IActionResult> WageSheetTaxTemplate()
         {
+            string serverUrl = AppSettingsHelper.Get("WageSheetExcelBaseUrl");
+            return Ok(JsonView(true, "操作成功!",new { FileUrl = serverUrl + "Office/WageSheetFile/个税导入模板.xlsx" }));
+        }
 
-            string ymFormat = "yyyy-MM";
-            DateTime yearMonthDt;
-            bool yearMonthDtIsValid = DateTime.TryParseExact(yearMonth, ymFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out yearMonthDt);
-            if (!yearMonthDtIsValid) return Ok(JsonView(false, "年月格式错误!正确时间格式：yyyy-MM  "));
-
+        /// <summary>
+        /// 上传个税
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> UploadTax(IFormFile file)
+        {
             try
             {
-                var TypeName = Request.Headers["TypeName"].ToString();
+                var yearMonth = Request.Headers["YearMonth"].ToString();
+                //string yearMonth = "2023-10";
+                string ymFormat = "yyyy-MM";
+                DateTime yearMonthDt;
+                bool yearMonthDtIsValid = DateTime.TryParseExact(yearMonth, ymFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out yearMonthDt);
+                if (!yearMonthDtIsValid) return Ok(JsonView(false, "年月格式错误!正确时间格式：yyyy-MM  "));
                 if (file != null)
                 {
                     var fileDir = AppSettingsHelper.Get("WageSheetExcelFptPath");
@@ -708,7 +719,7 @@ namespace OASystem.API.Controllers
                                          Left Join Sys_Department sd On sys_u1.DepId = sd.Id
                                          Where pm_ws.IsDel = 0 And pm_ws.YearMonth = '{0}'
                                          Order By UserId Asc ", yearMonth);
-                                    var wageSheetList = await _wageSheetRep._sqlSugar.SqlQueryable<WageSheetItemInfoView>(sql).ToListAsync();
+                                    var wageSheetList = await _wageSheetRep._sqlSugar.SqlQueryable<WageSheetInfoView>(sql).ToListAsync();
 
                                     if (wageSheetList.Count <= 0)
                                     {
@@ -719,19 +730,22 @@ namespace OASystem.API.Controllers
                                     {
                                         string name = taxData.Rows[i][0].ToString().Trim();
 
-                                        List<WageSheetItemInfoView> wageSheets = new List<WageSheetItemInfoView>();
+                                        List<WageSheetInfoView> wageSheets = new List<WageSheetInfoView>();
                                         wageSheets = wageSheetList.Where(it => it.Name.Equals(name)).ToList();
                                         if (wageSheets.Count > 0)
                                         {
                                             wageSheetList.Where(it => it.Name.Equals(name))
-                                                .Select(it =>
-                                                {
-                                                    it.WithholdingTax = Convert.ToDecimal(taxData.Rows[i][1].ToString());
-                                                    return it;
-                                                })
-                                                .ToList();
+                                            .Select(it =>
+                                             {
+                                                 //修改 绩效不等于0.00M的数据
+
+                                                 decimal tax = Convert.ToDecimal(taxData.Rows[i][1].ToString());
+                                                 it.WithholdingTax = tax;
+                                                 it.AfterTax -= tax;
+                                                 return it;
+                                             })
+                                            .ToList();
                                         }
-
                                     }
                                     List<Pm_WageSheet> wageSheets1 = new List<Pm_WageSheet>();
                                     wageSheets1 = _mapper.Map<List<Pm_WageSheet>>(wageSheetList);

OASystem/OASystem.Api/appsettings.json

@@ -124,7 +124,7 @@
   "VisaProgressImageBaseUrl": "http://132.232.92.186:24/",
   "VisaProgressImageFtpPath": "Image/Visa/",
 
-  "WageSheetExcelBaseUrl": "C:/Server/File/OA2023/Office/WageSheetFile/",
+  "WageSheetExcelBaseUrl": "http://132.232.92.186:24/",
   "WageSheetExcelFptPath": "C:/Server/File/OA2023/Office/WageSheetFile/",
 
   //节假日

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -215,7 +215,7 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<WageAddOrEditDto, Pm_WageSheet>();
             CreateMap<WageSheetInfos, Pm_WageSheet>();
             CreateMap<SalaryCalculatorSingleDto, Pm_WageSheet>();
-            CreateMap<WageSheetItemInfoView, Pm_WageSheet>();
+            CreateMap<WageSheetInfoView, Pm_WageSheet>();
             CreateMap<Pm_WageSheet, WageSheetInfoView>();
 
             CreateMap<Pm_WageSheet, WageSheetInfoView>();