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

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -311,11 +311,9 @@ namespace OASystem.API.Controllers
         //public async Task<IActionResult> UpdateUserDataOldOAToNewOA()
         //{
         //    dynamic view = null;
-
         //    try
         //    {
         //        var _sqlSuar = _loginRep._sqlSugar;
-
         //        var oldOaUsersData = await _sqlSuar.Queryable<OA2014UsersView>().AS("OA2014.dbo.Users").ToListAsync();
         //        var newOaCompanyData = await _sqlSuar.Queryable<Sys_Company>().ToListAsync();
         //        var newOaDepartmentData = await _sqlSuar.Queryable<Sys_Department>().ToListAsync();

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4614,202 +4614,296 @@ namespace OASystem.API.Controllers
 
                         decimal insidePayTotal = _EnterExitCosts.InsidePay;
 
-                        string row1_1 = "";
-                        if (_EnterExitCosts.Visa > 0)
+                        //境内费用(其他费用)
+                        if (_EnterExitCosts.ChoiceOne == 1)
                         {
-                            //insidePayTotal += _EnterExitCosts.Visa;
-                            row1_1 = $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
-                            if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
+                            string row1_1 = "";
+                            if (_EnterExitCosts.Visa > 0)
                             {
-                                row1_1 += $"\t签证费用描述: ： {_EnterExitCosts.VisaRemark} 人民币/人";
+                                //insidePayTotal += _EnterExitCosts.Visa;
+                                row1_1 = $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
+                                if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
+                                {
+                                    row1_1 += $"\t签证费用描述: ： {_EnterExitCosts.VisaRemark} 人民币/人";
+                                }
                             }
-                        }
 
-                        string row1_2 = "";
-                        if (_EnterExitCosts.YiMiao > 0)
-                        {
-                            //insidePayTotal += _EnterExitCosts.YiMiao;
-                            row1_2 += $"疫苗费：{_EnterExitCosts.YiMiao.ToString("#0.00")} 人民币/人";
+                            string row1_2 = "";
+                            if (_EnterExitCosts.YiMiao > 0)
+                            {
+                                //insidePayTotal += _EnterExitCosts.YiMiao;
+                                row1_2 += $"疫苗费：{_EnterExitCosts.YiMiao.ToString("#0.00")} 人民币/人";
+                            }
+                            if (_EnterExitCosts.HeSuan > 0)
+                            {
+                                //insidePayTotal += _EnterExitCosts.HeSuan;
+                                row1_2 += $"核酸检测费：{_EnterExitCosts.HeSuan.ToString("#0.00")} 人民币/人";
+                            }
+                            if (_EnterExitCosts.Service > 0)
+                            {
+                                //insidePayTotal += _EnterExitCosts.Service;
+                                row1_2 += $"服务费：{_EnterExitCosts.Service.ToString("#0.00")} 人民币/人";
+                            }
+
+                            string row1_3 = "";
+                            if (_EnterExitCosts.Safe > 0)
+                            {
+                                //insidePayTotal += _EnterExitCosts.Safe;
+                                row1_3 += $"保险费：{_EnterExitCosts.Safe.ToString("#0.00")} 人民币/人";
+                            }
+                            if (_EnterExitCosts.Ticket > 0)
+                            {
+                                //insidePayTotal += _EnterExitCosts.Ticket;
+                                row1_3 += $"参展门票：{_EnterExitCosts.Ticket.ToString("#0.00")} 人民币/人";
+                            }
+                            string row1 = "";
+                            if (!string.IsNullOrEmpty(row1_1)) row1 += $"{row1_1}\r\n";
+                            if (!string.IsNullOrEmpty(row1_2)) row1 += $"{row1_2}\r\n";
+                            if (!string.IsNullOrEmpty(row1_3)) row1 += $"{row1_3}";
+
+                            dic.Add("InsidePay", insidePayTotal.ToString("#0.00"));
+                            dic.Add("Row1Str", row1);
                         }
-                        if (_EnterExitCosts.HeSuan > 0)
+
+                        //经济舱
+                        if (_EnterExitCosts.SumJJC == 1)
                         {
-                            //insidePayTotal += _EnterExitCosts.HeSuan;
-                            row1_2 += $"核酸检测费：{_EnterExitCosts.HeSuan.ToString("#0.00")} 人民币/人";
+                            dic.Add("OutsideJJ", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
+                            dic.Add("AirJJ", _EnterExitCosts.AirJJ.ToString("#0.00"));
+                            
                         }
-                        if (_EnterExitCosts.Service > 0)
+                        //公务舱
+                        if (_EnterExitCosts.SumGWC == 1)
                         {
-                            //insidePayTotal += _EnterExitCosts.Service;
-                            row1_2 += $"服务费：{_EnterExitCosts.Service.ToString("#0.00")} 人民币/人";
+                            dic.Add("OutsaideGW", _EnterExitCosts.OutsaideGWPay.ToString("#0.00"));
+                            dic.Add("AirGW", _EnterExitCosts.AirGW.ToString("#0.00"));
                         }
 
-                        string row1_3 = "";
-                        if (_EnterExitCosts.Safe > 0)
+                        if (_EnterExitCosts.SumGWC == 1 || _EnterExitCosts.SumJJC == 1)
                         {
-                            //insidePayTotal += _EnterExitCosts.Safe;
-                            row1_3 += $"保险费：{_EnterExitCosts.Safe.ToString("#0.00")} 人民币/人";
-                        }
-                        if (_EnterExitCosts.Ticket > 0)
-                        {
-                            //insidePayTotal += _EnterExitCosts.Ticket;
-                            row1_3 += $"参展门票：{_EnterExitCosts.Ticket.ToString("#0.00")} 人民币/人";
+                            if (_EnterExitCosts.CityTranffic != 0)
+                            {
+                                dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
+                            }
                         }
-                        string row1 = "";
-                        if (!string.IsNullOrEmpty(row1_1)) row1 += $"{row1_1}\r\n";
-                        if (!string.IsNullOrEmpty(row1_2)) row1 += $"{row1_2}\r\n";
-                        if (!string.IsNullOrEmpty(row1_3)) row1 += $"{row1_3}";
 
+                        NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
+                        Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
+                        int table1Row = 0,
+                            table2Row = 0,
+                            table3Row = 0,
+                            table4Row = 0;
+                        //住宿费
+                        if (_EnterExitCosts.ChoiceThree == 1)
+                        {
+                            dic.Add("SubZS", stayFeeTotal.ToString("#0.00"));
+                            table1Row = dac1.Count;
+                            #region 填充word表格内容
+                            for (int i = 0; i < dac1.Count; i++)
+                            {
 
-                        dic.Add("InsidePay", insidePayTotal.ToString("#0.00"));
-                        dic.Add("Row1Str", row1);
+                                Grp_DayAndCost dac = dac1[i];
+                                if (dac == null) continue;
 
-                        dic.Add("OutsideJJ", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
-                        dic.Add("OutsaideGW", _EnterExitCosts.OutsaideGWPay.ToString("#0.00"));
-                        dic.Add("AirJJ", _EnterExitCosts.AirJJ.ToString("#0.00"));
-                        dic.Add("AirGW", _EnterExitCosts.AirGW.ToString("#0.00"));
-                        dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
-                        dic.Add("SubZS", stayFeeTotal.ToString("#0.00"));
-                        dic.Add("SubHS", mealsFeeTotal.ToString("#0.00"));
+                                builder.MoveToCell(0, i, 0, 0);
+                                builder.Write("第" + dac.Days.ToString() + "晚：");
 
-                        string miscellaneousFeeTotalStr = miscellaneousFeeTotal.ToString("#0.00");
-                        dic.Add("SubGZF", miscellaneousFeeTotalStr);
-                        //dic.Add("SubPX", tainFeeTotal.ToString("#0.00"));
+                                builder.MoveToCell(0, i, 1, 0);
+                                //builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
+                                //builder.Write(dac.Place == null ? "" : dac.Place);
+                                builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
 
-                        decimal subJJC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideJJPay;
-                        decimal subGWC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsaideGWPay;
-                        dic.Add("SubJJC", subJJC.ToString("#0.00"));
-                        dic.Add("SubGWC", subGWC.ToString("#0.00"));
 
-                        #region 填充word模板书签内容
-                        foreach (var key in dic.Keys)
+                                builder.MoveToCell(0, i, 2, 0);
+                                builder.Write("费用标准：");
+
+                                string curr = "";
+                                var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
+                                if (currData != null)
+                                {
+                                    curr = currData.Name;
+                                }
+                                builder.MoveToCell(0, i, 3, 0);
+                                builder.Write(dac.Cost.ToString("#0.00") + curr);
+
+                                builder.MoveToCell(0, i, 4, 0);
+                                builder.Write("费用小计：");
+
+                                builder.MoveToCell(0, i, 5, 0);
+                                builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
+                            }
+                            
+                            #endregion
+                        }else dic.Add("SubZS","0.00");
+                        //删除多余行
+                        while (table1.Rows.Count > table1Row)
                         {
-                            builder.MoveToBookmark(key);
-                            builder.Write(dic[key]);
+                            table1.Rows.RemoveAt(table1Row);
                         }
 
-                        #endregion
+                        //伙食费
+                        Aspose.Words.Tables.Table table2 = allTables[1] as Aspose.Words.Tables.Table;
+                        if (_EnterExitCosts.ChoiceFour == 1)
+                        {
+                            dic.Add("SubHS", mealsFeeTotal.ToString("#0.00"));
+                            table2Row = dac2.Count;
+                            #region 填充word表格内容
 
-                        #region 填充word表格内容
+                            for (int i = 0; i < dac2.Count; i++)
+                            {
 
-                        ////获读取指定表格方法二
-                        NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
-                        Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
-                        for (int i = 0; i < dac1.Count; i++)
-                        {
+                                Grp_DayAndCost dac = dac2[i];
+                                if (dac == null) continue;
 
-                            Grp_DayAndCost dac = dac1[i];
-                            if (dac == null) continue;
+                                builder.MoveToCell(1, i, 0, 0);
+                                builder.Write("第" + dac.Days.ToString() + "天：");
 
-                            builder.MoveToCell(0, i, 0, 0);
-                            builder.Write("第" + dac.Days.ToString() + "晚：");
+                                builder.MoveToCell(1, i, 1, 0);
+                                builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
 
-                            builder.MoveToCell(0, i, 1, 0);
-                            //builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
-                            //builder.Write(dac.Place == null ? "" : dac.Place);
-                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
+                                builder.MoveToCell(1, i, 2, 0);
+                                builder.Write("费用标准：");
 
+                                string curr = "";
+                                var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
+                                if (currData != null)
+                                {
+                                    curr = currData.Name;
+                                }
+                                builder.MoveToCell(1, i, 3, 0);
+                                builder.Write(dac.Cost.ToString("#0.00") + curr);
 
-                            builder.MoveToCell(0, i, 2, 0);
-                            builder.Write("费用标准：");
+                                builder.MoveToCell(1, i, 4, 0);
+                                builder.Write("费用小计：");
 
-                            string curr = "";
-                            var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
-                            if (currData != null)
-                            {
-                                curr = currData.Name;
-                            }
-                            builder.MoveToCell(0, i, 3, 0);
-                            builder.Write(dac.Cost.ToString("#0.00") + curr);
+                                builder.MoveToCell(1, i, 5, 0);
+                                builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
 
-                            builder.MoveToCell(0, i, 4, 0);
-                            builder.Write("费用小计：");
+                            }
 
-                            builder.MoveToCell(0, i, 5, 0);
-                            builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
-                        }
+                            #endregion
+                        }else dic.Add("SubHS","0.00");
 
                         //删除多余行
-                        while (table1.Rows.Count > dac1.Count)
+                        while (table2.Rows.Count > table2Row)
                         {
-                            table1.Rows.RemoveAt(dac1.Count);
+                            table2.Rows.RemoveAt(table2Row);
                         }
 
-                        Aspose.Words.Tables.Table table2 = allTables[1] as Aspose.Words.Tables.Table;
-                        for (int i = 0; i < dac2.Count; i++)
+                        //公杂费
+                        Aspose.Words.Tables.Table table3 = allTables[2] as Aspose.Words.Tables.Table;
+                        if (_EnterExitCosts.ChoiceFive == 1)
                         {
+                            dic.Add("SubGZF", miscellaneousFeeTotal.ToString("#0.00"));
+                            table3Row = dac3.Count;
+                            #region 填充word表格内容
 
-                            Grp_DayAndCost dac = dac2[i];
-                            if (dac == null) continue;
+                            for (int i = 0; i < dac3.Count; i++)
+                            {
+                                Grp_DayAndCost dac = dac3[i];
+                                if (dac == null) continue;
 
-                            builder.MoveToCell(1, i, 0, 0);
-                            builder.Write("第" + dac.Days.ToString() + "天：");
+                                builder.MoveToCell(2, i, 0, 0);
+                                builder.Write("第" + dac.Days.ToString() + "天：");
 
-                            builder.MoveToCell(1, i, 1, 0);
-                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
+                                builder.MoveToCell(2, i, 1, 0);
 
-                            builder.MoveToCell(1, i, 2, 0);
-                            builder.Write("费用标准：");
+                                builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
 
-                            string curr = "";
-                            var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
-                            if (currData != null)
-                            {
-                                curr = currData.Name;
-                            }
-                            builder.MoveToCell(1, i, 3, 0);
-                            builder.Write(dac.Cost.ToString("#0.00") + curr);
+                                builder.MoveToCell(2, i, 2, 0);
+                                builder.Write("费用标准：");
+
+                                string curr = "";
+                                var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
+                                if (currData != null)
+                                {
+                                    curr = currData.Name;
+                                }
+                                builder.MoveToCell(2, i, 3, 0);
+                                builder.Write(dac.Cost.ToString("#0.00") + curr);
 
-                            builder.MoveToCell(1, i, 4, 0);
-                            builder.Write("费用小计：");
+                                builder.MoveToCell(2, i, 4, 0);
+                                builder.Write("费用小计：");
 
-                            builder.MoveToCell(1, i, 5, 0);
-                            builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
+                                builder.MoveToCell(2, i, 5, 0);
+                                builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
 
-                        }
+                            }
+                            //删除多余行
+                            while (table3.Rows.Count > table3Row)
+                            {
+                                table3.Rows.RemoveAt(table3Row);
+                            }
+                            #endregion
+                        }else dic.Add("SubGZF", "0.00");
 
                         //删除多余行
-                        while (table2.Rows.Count > dac2.Count)
+                        while (table3.Rows.Count > table4Row)
                         {
-                            table2.Rows.RemoveAt(dac2.Count);
+                            table3.Rows.RemoveAt(table4Row);
                         }
 
-                        Aspose.Words.Tables.Table table3 = allTables[2] as Aspose.Words.Tables.Table;
-                        for (int i = 0; i < dac3.Count; i++)
+                        //培训费
+                        Aspose.Words.Tables.Table table4 = allTables[3] as Aspose.Words.Tables.Table;
+                        if (_EnterExitCosts.ChoiceSix == 1)
                         {
+                            dic.Add("SubPX", tainFeeTotal.ToString("#0.00"));
 
-                            Grp_DayAndCost dac = dac3[i];
-                            if (dac == null) continue;
+                            table4Row = dac4.Count;
+                            #region 填充word表格内容
 
-                            builder.MoveToCell(2, i, 0, 0);
-                            builder.Write("第" + dac.Days.ToString() + "天：");
+                            for (int i = 0; i < dac4.Count; i++)
+                            {
+                                Grp_DayAndCost dac = dac4[i];
+                                if (dac == null) continue;
 
-                            builder.MoveToCell(2, i, 1, 0);
+                                builder.MoveToCell(3, i, 0, 0);
+                                builder.Write("第" + dac.Days.ToString() + "天：");
 
-                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
+                                builder.MoveToCell(3, i, 1, 0);
 
-                            builder.MoveToCell(2, i, 2, 0);
-                            builder.Write("费用标准：");
+                                builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
 
-                            string curr = "";
-                            var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
-                            if (currData != null)
-                            {
-                                curr = currData.Name;
-                            }
-                            builder.MoveToCell(2, i, 3, 0);
-                            builder.Write(dac.Cost.ToString("#0.00") + curr);
+                                builder.MoveToCell(3, i, 2, 0);
+                                builder.Write("费用标准：");
+
+                                string curr = "";
+                                var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
+                                if (currData != null)
+                                {
+                                    curr = currData.Name;
+                                }
+                                builder.MoveToCell(3, i, 3, 0);
+                                builder.Write(dac.Cost.ToString("#0.00") + curr);
 
-                            builder.MoveToCell(2, i, 4, 0);
-                            builder.Write("费用小计：");
+                                builder.MoveToCell(3, i, 4, 0);
+                                builder.Write("费用小计：");
 
-                            builder.MoveToCell(2, i, 5, 0);
-                            builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
+                                builder.MoveToCell(3, i, 5, 0);
+                                builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
 
+                            }
+                            
+                            #endregion
                         }
-
+                        else dic.Add("SubPX","0.00");
                         //删除多余行
-                        while (table3.Rows.Count > dac3.Count)
+                        while (table4.Rows.Count > table4Row)
+                        {
+                            table4.Rows.RemoveAt(table4Row);
+                        }
+
+                        decimal subJJC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideJJPay;
+                        dic.Add("SubJJC", subJJC.ToString("#0.00"));
+
+                        decimal subGWC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsaideGWPay;
+                        dic.Add("SubGWC", subGWC.ToString("#0.00"));
+
+                        #region 填充word模板书签内容
+                        foreach (var key in dic.Keys)
                         {
-                            table3.Rows.RemoveAt(dac3.Count);
+                            builder.MoveToBookmark(key);
+                            builder.Write(dic[key]);
                         }
 
                         #endregion

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -3025,7 +3025,6 @@ Order By Count Desc");
             }
         }
 
-
         /// <summary>
         /// 日付类型数据 Save
         /// </summary>
@@ -3155,10 +3154,7 @@ Where dfp.IsDel = 0 And dfp.IsPay = 1
                                               .ToList();
                     });
 
-
-
-
-                    return Ok(JsonView(true, "操作成功!", _view, total));
+                    return Ok(JsonView(true, "操作成功!", new { data = _view ,total = _view.Sum(x => x.SumPrice) }  , total));
                 }
                 else if (_dto.Type == 2) //view
                 {

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1125,6 +1125,20 @@ namespace OASystem.API.Controllers
 
         }
 
+
+        /// <summary>
+        /// 员工信息 All信息修改
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> EditUserInfo()
+        {
+
+            return Ok(JsonView(false,"操作失败!"));
+        }
+
+
         /// <summary>
         /// 修改用户信息（上级修改/分配 公司、部门、岗位、工号等信息）
         /// </summary>

OASystem/OASystem.Domain/Dtos/System/UserDto.cs

@@ -1,4 +1,5 @@
-using System;
+using FluentValidation;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -242,4 +243,158 @@ namespace OASystem.Domain.Dtos.System
     {
         public int DepartId { get; set; }
     }
+
+
+    public class EditUserInfoDto
+    {
+        public int CurrUserId { get; set; }
+
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 中文姓名
+        /// </summary>
+        public string CnName { get; set; }
+        /// <summary>
+        /// 英文姓名
+        /// </summary>
+        public string EnName { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string Number { get; set; }
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int DepId { get; set; }
+        /// <summary>
+        /// 岗位Id
+        /// </summary>
+        public int JobPostId { get; set; }
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password { get; set; }
+        /// <summary>
+        /// 确认密码
+        /// </summary>
+        public string ComfirmPassword { get; set; }
+
+        /// <summary>
+        /// 性别0 男 1 女  2 未设置
+        /// </summary>
+        public int Sex { get; set; }
+        /// <summary>
+        /// 分机号
+        /// </summary>
+        public string Ext { get; set; }
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string Phone { get; set; }
+        /// <summary>
+        /// 紧急联系人 手机号
+        /// </summary>
+        public string UrgentPhone { get; set; }
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
+        /// <summary>
+        /// 住址
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 入职时间
+        /// </summary>
+        public DateTime Edate { get; set; }
+        /// <summary>
+        /// 离职时间
+        /// </summary>
+        public DateTime Rdate { get; set; }
+        /// <summary>
+        /// 工龄
+        /// </summary>
+        public int Seniority { get; set; }
+        /// <summary>
+        /// 生日
+        /// </summary> 
+        public DateTime? Birthday { get; set; }
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IDCard { get; set; }
+        /// <summary>
+        /// 开始工作时
+        /// </summary>
+        public string? StartWorkDate { get; set; }
+        /// <summary>
+        /// 毕业学校
+        /// </summary>
+        public string GraduateInstitutions { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public string Professional { get; set; }
+
+        /// <summary>
+        /// 学历
+        /// 0 未设置 1 小学、2 初中、3 高中、4 专科、5 本科、6 研究生
+        /// </summary>
+        public int Education { get; set; }
+        /// <summary>
+        /// 学历类型
+        ///0 未设置 1 成教 2 统招 3 留学
+        /// </summary>
+        public int TheOrAdultEducation { get; set; }
+        /// <summary>
+        /// 婚姻状态
+        /// </summary>
+        public string MaritalStatus { get; set; }
+        /// <summary>
+        /// 家庭地址
+        /// </summary>
+        public string HomeAddress { get; set; }
+        /// <summary>
+        /// 试用期
+        /// </summary>
+        public string UsePeriod { get; set; }
+        /// <summary>
+        /// 工作经历
+        /// </summary>
+        public string WorkExperience { get; set; }
+        /// <summary>
+        /// 证书上传
+        /// </summary>
+        public string Certificate { get; set; }
+        /// <summary>
+        /// 企微Id
+        /// </summary>
+        public string QiyeChatUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+
+    public class EditUserInfoDtoValidator : AbstractValidator<EditUserInfoDto>
+    {
+        public EditUserInfoDtoValidator() 
+        {
+            RuleFor(x => x.CnName).NotEmpty().WithMessage("姓名不能为空!");
+            RuleFor(x => x.EnName).NotEmpty().WithMessage("英文名不能为空!");
+            RuleFor(x => x.Number).NotEmpty().WithMessage("工号不能为空!");
+            RuleFor(x => x.Password).NotEmpty().WithMessage("密码不能为空!")
+                                    .Length(6, 20).WithMessage("密码长度必须在6到20个字符之间!");
+            RuleFor(x => x.ComfirmPassword).NotEmpty().WithMessage("确认密码不能为空!")
+                                           .Equal(x => x.Password).WithMessage("两次密码输入不一致!");
+
+            RuleFor(x => x.Sex).InclusiveBetween(0,2).WithMessage("性别：0 男；1 女；2 未设置；");
+
+        }
+    }
 }

OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -516,7 +516,13 @@ namespace OASystem.Domain.ViewModels.Financial
     [SqlSugar.SugarTable("Fin_DailyFeePayment")]
     public class DailyFeePaymentRangeView
     {
-        public string ViewStr { get; set; }
+        public string ViewStr
+        {
+            get
+            {
+                return $"{RowIndex}、【{CompanyName}】【{TransferType}】【{FeeType}】【{Instructions}】【{SumPrice.ToString("#0.00")}】【申请人：{Applicant}  申请时间：{ApplicantDt.ToString("yyyy-MM-dd HH:mm:ss")}】";
+            }
+        }
 
         [SugarColumn(IsIgnore = true)]//需要加上
         public int RowIndex { get; set; } //行号 序号
@@ -538,19 +544,16 @@ namespace OASystem.Domain.ViewModels.Financial
 
         [Navigate(NavigateType.OneToMany, nameof(DailyFeePaymentContentView.DFPId))]//BookA表中的studenId
         public List<DailyFeePaymentContentView> Contents { get; set; }
+
+
+        //public string ContentStr { get; set; }
     }
 
 
     [SqlSugar.SugarTable("Fin_DailyFeePaymentContent")]
     public class DailyFeePaymentContentView
     {
-        /// <summary>
-        /// 示例：费用名称：[2024.07.11招商信用卡还款]   单价:[20000.00]   数量:[1.00]   小计:[20000.00]   备注:[]
-        /// </summary>
-        public string ViewStr { get {
-
-                return $"费用名称：[{PriceName}]   单价:[{Price.ToString("#0.00")}]   数量:[{Quantity.ToString("#0.00")}]   小计:[{ItemTotal.ToString("#0.00")}]   备注:[{Remark}]";
-            } }
+        
         //[SugarColumn(IsIgnore = true)]//需要加上
         //public int RowIndex { get; set; } //行号 序号
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
@@ -569,6 +572,19 @@ namespace OASystem.Domain.ViewModels.Financial
         public string Remark { get; set; }
 
         //public int IsDel { get; set; }
+
+        /// <summary>
+        /// 示例：费用名称：[2024.07.11招商信用卡还款]   单价:[20000.00]   数量:[1.00]   小计:[20000.00]   备注:[]
+        /// </summary>
+        //public string ViewStr
+        //{
+        //    get
+        //    {
+        //        return $"费用名称：[{PriceName}]   单价:[{Price.ToString("#0.00")}]   数量:[{Quantity.ToString("#0.00")}]   小计:[{ItemTotal.ToString("#0.00")}]   备注:[{Remark}]";
+        //    }
+        //}
+
+        //public string ViewSubStr { get; set; }
     }