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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1,8 +1,12 @@
 using Aspose.Cells;
 using Aspose.Words;
+using Aspose.Words.Drawing;
 using EyeSoft.Extensions;
+using EyeSoft.Runtime.InteropServices;
 using FluentValidation;
 using Microsoft.EntityFrameworkCore.Query.Internal;
+using NPOI.HPSF;
+using NPOI.SS.Formula.PTG;
 using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLib.File;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
@@ -4623,7 +4627,7 @@ Group by PriceType ", dto.diId);
                 foreach (var airArr in groupByid)
                 {
                     var groupAirCount = 0; //团组航段数量
-                    var infos = new ArrayList();
+                    var infos = new List<string>();
                     foreach (var air in airArr)
                     {
                         var airCount = 0; // 单条航段数量
@@ -4759,7 +4763,7 @@ Group by PriceType ", dto.diId);
 
                 foreach (var group in groupByid)
                 {
-                    var infos = new ArrayList();
+                    var infos = new List<string>();
                     var totalPrice = 0.00M;
 
                     foreach (var item in group)
@@ -4816,11 +4820,15 @@ Group by PriceType ", dto.diId);
                 {
                     var price = LvArr.Find(x => x.Id == groupinfo.OpRoyaltyLv)?.Name.ObjToInt() ?? 0;
                     string temp = $"本团等级为{teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name} 提成金额为{price} {(string.IsNullOrWhiteSpace(groupinfo.OpRoyaltyRemark) ? "" : "提成说明:" + groupinfo.OpRoyaltyRemark )}";
+                    if (price == 0)
+                    {
+                        temp = $"本团等级为{teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name} op提成选项未选择！" ;
+                    }
                     resultArr.Add(new ComputeRoyaltiesView
                     {
                         TeamName = groupinfo.TeamName,
                         Id = groupinfo.Id,
-                        chiArr = new ArrayList (){ temp },
+                        chiArr = new List<string>() { temp },
                         teamLvStr = teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate = groupinfo.VisitDate,
                         temp = temp,
@@ -4876,7 +4884,7 @@ Group by PriceType ", dto.diId);
                     bool isBasics = operUserMax == userId;
                     var money = 0;
 
-                    var infos = new ArrayList();
+                    var infos = new List<string>();
                     foreach (var item in group)
                     {
                         if (item.CreateUserId != user.Id)
@@ -4961,7 +4969,7 @@ Group by PriceType ", dto.diId);
                     var groupinfo = listVisa.First(x => x.Id == visaArr.Key);
                     var singlePrice = existsCountry.Where(x => groupinfo.VisitCountry.Contains(x)).Count() > 0 ? 50 : 30;
                     int count = 0, money = 0;
-                    var arr = new ArrayList();
+                    var arr = new List<string>();
                     foreach (var visa in visaArr)
                     {
                         if (visa.VisaPrice > 0)
@@ -5044,23 +5052,65 @@ Group by PriceType ", dto.diId);
             {
                 var apiArr = (parseApiResult.Data?.GetType().GetProperty("resultArr")?.GetValue(parseApiResult.Data)) as List<ComputeRoyaltiesView>;
 
+                var user = _sqlSugar.Queryable<Sys_Users>().First(x => x.Id == dto.UserId);
+
                 if (apiArr != null && apiArr.Count > 0)
                 {
+                    Dictionary<string, string> dic = new Dictionary<string, string>();
+                    //dic.Add("Name", "人员：" + user.CnName);
+                    dic.Add("startTime", dto.StartDate);
+                    dic.Add("endTime", dto.EndDate);
+                    dic.Add("operName", user.CnName);
+                    dic.Add("timeNow", DateTime.Now.ToString("yyyy年MM月dd日"));
+                    //dic.Add("DowntimeNow", DateTime.Now.ToString("yyyy年MM月dd日"));
+                    dic.Add("totalPrice",( "总金额：" +  parseApiResult.Data?.GetType().GetProperty("totalPrice")?.GetValue(parseApiResult.Data).ObjToDecimal().ToString() ?? "0") +" 元");
+
+                    ArrayList ToTableArr = new ArrayList();
+                    int No = 1;
                     //打开excel模板
                     foreach (var item in apiArr)
                     {
                         //载入数据
+                        ToTableArr.Add(new
+                        {
+                            No,
+                            item.TeamName,
+                            item.VisitDate,
+                            item.teamLvStr,
+                            item.temp,
+                            infos =  string.Join("\r\n",item.chiArr),
+                            price = item.price + "元",
+                        });
+
+                        No++;
+                    }
+
+                    DataTable TbData =CommonFun.ToDataTableArray(ToTableArr);
+                    TbData.TableName = "TbData";
+
+                    WorkbookDesigner designer = new WorkbookDesigner();
+                    designer.Workbook = new Workbook(AppSettingsHelper.Get("ExcelBasePath") + "Template/提成结算template.xlsx");
+
+                    foreach (var key in dic.Keys)
+                    {
+                        designer.SetDataSource(key, dic[key]);
                     }
 
+                    //数据源 
+                    designer.SetDataSource(TbData);
+                    designer.Process();
+
+                    designer.Workbook.Save(AppSettingsHelper.Get("ExcelBasePath") + "RoyaltyExcel/" + user.CnName + "_提成结算.xlsx" );
+
                     jw = JsonView(true, "success!", new
                     {
-                        Url = "",
+                        Url = AppSettingsHelper.Get("ExcelBaseUrl") + AppSettingsHelper.Get("ExcelFtpPath")+ "RoyaltyExcel/" + user.CnName + "_提成结算.xlsx",
                     });
                 }
             }
             else
             {
-                jw.Msg = "获取提成信息error";
+                jw.Msg = "获取提成信息error " + jw.Msg;
             }
 
             return Ok(jw);

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1711,7 +1711,7 @@ namespace OASystem.API.Controllers
             //List<string> templist = new List<string>() { 234.ToString() };
             //await AppNoticeLibrary.SendUserMsg_GroupStatus_AuditFee(14090, templist, QiyeWeChatEnum.TestChat);
 
-            await AppNoticeLibrary.SendUserMsg_GroupShare_ToJob(_dto.DiId); ;
+            //await AppNoticeLibrary.SendUserMsg_GroupShare_ToJob(_dto.DiId); ;
 
 
             //DeleReminderMessage.PostMessageByWebhook();
@@ -1719,18 +1719,19 @@ namespace OASystem.API.Controllers
 
             //创建群聊
 
-            //List<string> userList1 = new List<string>() {  "Feint", "amy.zhu@pan-american-intl.com", "judy.zeng@pan-american-intl.com", "FuHongJin" };
+            //List<string> userList1 = new List<string>() { "Feint", "amy.zhu@pan-american-intl.com", "judy.zeng@pan-american-intl.com", "FuHongJin" };
             //List<string> userList2 = new List<string>() {  "Feint", "ZhaoYaQi", "LiaoWenYa" };
             //List<string> userList3 = new List<string>() {  "Feint", "amy.zhu@pan-american-intl.com", "judy.zeng@pan-american-intl.com", "FuHongJin", "ZhaoYaQi", "LiaoWenYa" };
 
-            //GroupStatus_CreateChatView rst1 = await _qiYeWeChatApiService.GroupStatus_CreateChat("OA通知-财务部", "Feint", userList1, "CaiWuChat01");
+            //GroupStatus_CreateChatView rst1 = await _qiYeWeChatApiService.GroupStatus_CreateChat("团组通知", "Feint", userList1, "CaiWuChat01");
             //GroupStatus_CreateChatView rst2 = await _qiYeWeChatApiService.GroupStatus_CreateChat("OA通知-国交部", "Feint", userList2, "GuoJiaoLeader01");
             //GroupStatus_CreateChatView rst3 = await _qiYeWeChatApiService.GroupStatus_CreateChat("OA通知-团组(公司客户)", "Feint", userList3, "CompanyCRMChat01");
 
             //推送消息(模板)
 
             //List<string> userList = new List<string>() { "Feint", "huaju.liu", "johnny.yang@pan-american-intl.com" };
-            List<string> userList = new List<string>() { "Feint", "johnny.yang@pan-american-intl.com" };
+            //List<string> userList = new List<string>() { "Feint", "johnny.yang@pan-american-intl.com", "huaju.liu" };
+            //GroupStatus_CreateChatView rst1 = await _qiYeWeChatApiService.GroupStatus_CreateChat("团组出行通知", "Feint", userList, "CaiWuChat02");
 
             //团组出发
             //AppNoticeLibrary.SendUserMsg_GroupStatus_Create(2358, userList);
@@ -1739,7 +1740,8 @@ namespace OASystem.API.Controllers
             //AppNoticeLibrary.SendChatMsg_GroupStatus_ApplyFee(_dto.DiId, QiyeWeChatEnum.TestChat);
 
             //费用审核结果通知（通过情况下发送财务群）
-            //AppNoticeLibrary.SendUserMsg_GroupStatus_AuditFee(_dto.DiId, userList, QiyeWeChatEnum.TestChat);
+            List<string> userList = new List<string>() { "234" };
+            AppNoticeLibrary.SendUserMsg_GroupStatus_AuditFee(_dto.DiId, userList, QiyeWeChatEnum.CaiWuChat02);
 
             //4、财务付款时:(1)对应版块人员【单独发,状态为已付款才发】
             //AppNoticeLibrary.SendUserMsg_GroupStatus_PayResult(_dto.DiId, userList);
@@ -1754,7 +1756,7 @@ namespace OASystem.API.Controllers
 
 
             //日付申请提醒财务群
-            //AppNoticeLibrary.DailyPayReminders_Create_ToCaiwuChat(_dto.DiId, QiyeWeChatEnum.TestChat);
+            //AppNoticeLibrary.DailyPayReminders_Create_ToCaiwuChat(_dto.DiId, QiyeWeChatEnum.CaiWuChat02);
             //日付申请结果推送用户、成功通知财务群
             //AppNoticeLibrary.DailyPayReminder_Audit_ToUser(_dto.DiId, userList, QiyeWeChatEnum.TestChat);
             //AppNoticeLibrary.DailyPayReminder_Pay_ToUser(_dto.DiId, userList);

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Config.cs

@@ -30,6 +30,12 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
         [Description("CaiWuChat01")]
         CaiWuChat,
 
+        /// <summary>
+        /// 团组通知-财务群（财务部全员）,发送条件(团组出访时间出发-7 天，结束-3 天，第二天，通知财务三人签合同、收尾款)
+        /// </summary>
+        [Description("CaiWuChat02")]
+        CaiWuChat02,
+
         /// <summary>
         /// 团组通知-国交管理群(国交部经理、主管),发送条件(1.费用审核-提交)
         /// </summary>
@@ -165,10 +171,11 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
         /// 团组出发前一周提醒财务检查合同、尾款
         /// </summary>
         /// <returns></returns>
-        public static string GroupRemindersToCaiwuChat(List<Grp_DelegationInfo> list_7day, List<Grp_DelegationInfo> list_3day)
+        public static string GroupRemindersToCaiwuChat(List<Grp_DelegationInfo> list_7day, List<Grp_DelegationInfo> list_3day, List<Grp_DelegationInfo> list_minus1day)
         {
             string teamNames1 = "><font color='comment'>暂无</font>";
             string teamNames2 = "><font color='comment'>暂无</font>";
+            string teamNames3 = "><font color='comment'>暂无</font>";
 
             if (list_7day.Count > 0)
             {
@@ -193,6 +200,16 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
                 //list_3day.ForEach(s => teamNames2 += ">" + s.TeamName + "\n\n");
             }
 
+            if (list_minus1day.Count > 0)
+            {
+                teamNames3 = "";
+                foreach (var item in list_minus1day)
+                {
+                    string endDt = item.VisitEndDate.ToString("yyyy-MM-dd");
+                    teamNames2 += ">(" + endDt + ")" + item.TeamName + " \n\n";
+                }
+            }
+
 
             string result = string.Format(@" `团组状态提醒`  
 
@@ -202,9 +219,12 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
 ><font color='warning'> - 下列团组将于3天内结束：</font>
 {1}
 
+><font color='warning'> - 下列团组已于昨日结束行程：</font>
+{2}
+
 <font color='info'>请注意检查合同、尾款状态</font>
 
-[详细信息请前往OA系统查看](http://oa.pan-american-intl.com:4399/)  ", teamNames1, teamNames2);
+[详细信息请前往OA系统查看](http://oa.pan-american-intl.com:4399/)  ", teamNames1, teamNames2, teamNames3);
 
             return result;
         }

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Library.cs

@@ -614,11 +614,11 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
 
         #region 团组出发、结束提醒（财务群）
 
-        public static async Task<bool> SendChatMsg_GroupRemindersToCaiwu(List<Grp_DelegationInfo> list_7day, List<Grp_DelegationInfo> list_3day, QiyeWeChatEnum qwEnum)
+        public static async Task<bool> SendChatMsg_GroupRemindersToCaiwu(List<Grp_DelegationInfo> list_7day, List<Grp_DelegationInfo> list_3day, List<Grp_DelegationInfo> list_minus1day, QiyeWeChatEnum qwEnum)
         {
             string chatId = qwEnum.GetEnumDescription();
 
-            ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendChatMsg_Markdown(chatId, MarkdownLib.GroupRemindersToCaiwuChat(list_7day, list_3day));
+            ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendChatMsg_Markdown(chatId, MarkdownLib.GroupRemindersToCaiwuChat(list_7day, list_3day, list_minus1day));
             if (result.errcode != 0)
             {
                 //抄送日志 

OASystem/OASystem.Api/OAMethodLib/Quartz/Business/DeleReminderMessage.cs

@@ -95,6 +95,7 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
             string now = dtNow.ToString("yyyy-MM-dd");
             string add3day = dtNow.AddDays(2).ToString("yyyy-MM-dd"); //结束出访前3天（含今天）
             string add7day = dtNow.AddDays(6).ToString("yyyy-MM-dd"); //开始出访7天内（含今天）
+            string minus1day = dtNow.AddDays(-1).ToString("yyyy-MM-dd"); //于昨日结束
 
             //string sql = string.Format(@" Select * From Grp_DelegationInfo With(Nolock) Where IsDel=0 And VisitEndDate ='{0}' Or VisitStartDate='{1}' ", add3day, add7day);
             //List<Grp_DelegationInfo> list_source = _grpDeleRep._sqlSugar.SqlQueryable<Grp_DelegationInfo>(sql).ToList();
@@ -103,11 +104,14 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
 
             string sql7day = string.Format(@" Select * From Grp_DelegationInfo With(Nolock) where IsDel = 0 And VisitStartDate Between '{0} 00:00:00' And  '{1} 23:59:59' Order By VisitStartDate Asc ", now, add7day);
             string sql3day = string.Format(@" Select * From Grp_DelegationInfo With(Nolock) where IsDel = 0 And VisitEndDate Between '{0} 00:00:00' And  '{1} 23:59:59' Order By VisitEndDate Asc ", now, add3day);
+            string sqlm1day = string.Format(@" Select * From Grp_DelegationInfo With(Nolock) where IsDel = 0 And VisitEndDate Between '{0} 00:00:00' And  '{1} 23:59:59' Order By VisitEndDate Asc ", minus1day, minus1day);
+
 
             List<Grp_DelegationInfo> listAdd7day = _grpDeleRep._sqlSugar.SqlQueryable<Grp_DelegationInfo>(sql7day).ToList();
             List<Grp_DelegationInfo> listAdd3day = _grpDeleRep._sqlSugar.SqlQueryable<Grp_DelegationInfo>(sql3day).ToList();
+            List<Grp_DelegationInfo> listMinus1day = _grpDeleRep._sqlSugar.SqlQueryable<Grp_DelegationInfo>(sqlm1day).ToList();
 
-            await AppNoticeLibrary.SendChatMsg_GroupRemindersToCaiwu(listAdd7day, listAdd3day, QiyeWeChatEnum.CaiWuChat);
+            await AppNoticeLibrary.SendChatMsg_GroupRemindersToCaiwu(listAdd7day, listAdd3day, listMinus1day, QiyeWeChatEnum.CaiWuChat02);
 
         }
     }

OASystem/OASystem.Domain/Dtos/Financial/ComputeRoyaltiesDto.cs

@@ -26,7 +26,7 @@ namespace OASystem.Domain.Dtos.Financial
         public decimal price { get; set; }
         public string TeamName { get; set; }
         public int Id { get; set; }
-        public ArrayList chiArr { get; set; }
+        public List<string> chiArr { get; set; }
         public string? teamLvStr { get; set; }
         public DateTime VisitDate { get; set; }
         public string temp { get; set; }

OASystem/OASystem.Infrastructure/Tools/CommonFun.cs

@@ -1,6 +1,7 @@
 using NPOI.SS.Formula.Functions;
 using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
+using System.Collections;
 using System.Globalization;
 using System.Reflection;
 using System.Reflection.Metadata;
@@ -522,5 +523,33 @@ public static class CommonFun
 
     }
 
+    /// <summary>
+    /// List to DataTable
+    /// 集合转换成datatable
+    /// </summary>
+    public static DataTable ToDataTableArray(IList list)
+    {
+        DataTable result = new DataTable();
+        if (list.Count > 0)
+        {
+            PropertyInfo[] propertys = list[0].GetType().GetProperties();
+            foreach (PropertyInfo pi in propertys)
+            {
+                result.Columns.Add(pi.Name, pi.PropertyType);
+            }
+            for (int i = 0; i < list.Count; i++)
+            {
+                ArrayList tempList = new ArrayList();
+                foreach (PropertyInfo pi in propertys)
+                {
+                    object obj = pi.GetValue(list[i], null);
+                    tempList.Add(obj);
+                }
+                object[] array = tempList.ToArray();
+                result.LoadDataRow(array, true);
+            }
+        }
+        return result;
+    }
 
 }