增加 aes 加密帮助类

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -17474,7 +17474,7 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
 
         #endregion
 
-        #region 团组接待意见调查 Grp_ReceptionOpinionSurvey
+        #region 团组接待意见调查
         /// <summary>
         /// 团组接待意见调查 - 信息管理
         /// 基础数据(团组)

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -5192,6 +5192,41 @@ WHERE
             return Ok(JsonView(briefData, total));
         }
 
+
+        /// <summary>
+        ///  团组数据统计
+        ///  当前时间团组所在城市   
+        /// </summary>
+        /// <param name="_dto"></param>
+        /// <returns></returns>
+        [HttpPost("StatisticsNowCityOfGroup")]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> StatisticsNowCityOfGroup(StatisticsNowCityOfGroupDto dto)
+        {
+            if (!SharingStaticData.PortTypes.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+            var nowLable = dto.Now;
+            var nowBool = DateTime.TryParse(nowLable, out DateTime now);
+            if (!nowBool) return Ok(JsonView(false, $"请传入有效的当前时间(2024-11-27)!"));
+
+            var data = await _sqlSugar.Queryable<Grp_AirTicketReservations>()
+                .LeftJoin<Grp_DelegationInfo>((atr, di) => atr.DIId == di.Id)
+                .Where((atr, di) => atr.IsDel == 0 && atr.FlightsDate.Trim().Equals(nowLable))
+                .Select((atr, di) => new
+                {
+                    atr.DIId,
+                    di.TeamName,
+                    atr.FlightsDate,
+                    atr.FlightsCode,
+                    atr.FlightsCity
+
+                })
+                .ToListAsync();
+
+
+
+            return Ok(JsonView(false));
+        }
+
         #endregion
     }
 }

OASystem/OASystem.Api/Program.cs

@@ -23,6 +23,7 @@ var basePath = AppContext.BaseDirectory;
 var _config = new ConfigurationBuilder()
                  .SetBasePath(basePath)
                  .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+                 .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true)
                  .AddEnvironmentVariables()
                  .Build();
 builder.Services.AddSingleton(new AppSettingsHelper(_config));

OASystem/OASystem.Api/appsettings.Development.json

@@ -4,5 +4,9 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "StringEncryptionOption": {
+    "SecretParameterEncryptKey": "1234#567qwerdfas", //（16位）
+    "SecretParameterIv": "1234567891011121"
   }
 }

OASystem/OASystem.Api/appsettings.json

@@ -1,369 +1,369 @@
 {
-    "ConnectionStrings": {
-        "OA2023DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2023DB;MultipleActiveResultSets=True;",
-        "OA2014DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2014;MultipleActiveResultSets=True;"
-    },
-    "JwtSecurityKey": "48d3f4fe770940a1068052f581536b81", //jwt密钥
-    "UseSwagger": "true", //启用Swagger
-    "GroupsConfig": {
-        "AutoCreate": "4",
-        "Leader": "149",
-        "ExBeginDays": "3",
-        "ExEndDays": "30",
-        "DefaultUser": "51",
-        "Boss": "21",
-        "FilterUser": "51,180"
-    },
-    "apple:securityKey": "MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQglyUl7hjI75YJUVMbZLN6TpkiFzuTXUN+UIjuJA7+y8ugCgYIKoZIzj0DAQehRANCAAS8GR7lKNst4KENCp45OXCMyiytvzK0qdRBrx0l+bMaHjiU+Upfox82G+Xy4wd8hI+0wMDh341aNelqEdYUUx3O",
-    "apple:kid": "RMV7Y4KM9V",
-    "apple:iss": "HKF372JSMK",
-    "apple:pushNotificationServer": "https://api.sandbox.push.apple.com:443/3/device/",
-    "apple:pushNotificationServer_Production": "https://api.push.apple.com:443/3/device/",
-    "DeleReminderConfig": {
-        "PhoneNumber": "17380669807,13683474118,18780121225",
-        "Test": "18477317582"
-    },
-    "RateCurrency": [
-        {
-            "CurrencyName": "人民币",
-            "CurrencyCode": "CNY"
-        },
-        {
-            "CurrencyName": "美元",
-            "CurrencyCode": "USD"
-        },
-        {
-            "CurrencyName": "欧元",
-            "CurrencyCode": "EUR"
-        },
-        {
-            "CurrencyName": "港币",
-            "CurrencyCode": "HKD"
-        },
-        {
-            "CurrencyName": "日元",
-            "CurrencyCode": "JPY"
-        },
-        {
-            "CurrencyName": "英镑",
-            "CurrencyCode": "GBP"
-        },
-        {
-            "CurrencyName": "澳大利亚元",
-            "CurrencyCode": "AUD"
-        },
-        {
-            "CurrencyName": "加拿大元",
-            "CurrencyCode": "CAD"
-        },
-        {
-            "CurrencyName": "泰国铢",
-            "CurrencyCode": "THB"
-        },
-        {
-            "CurrencyName": "新加坡元",
-            "CurrencyCode": "SGD"
-        },
-        {
-            "CurrencyName": "瑞士法郎",
-            "CurrencyCode": "CHK"
-        },
-        {
-            "CurrencyName": "丹麦克朗",
-            "CurrencyCode": "DKK"
-        },
-        {
-            "CurrencyName": "澳门元",
-            "CurrencyCode": "MOP"
-        },
-        {
-            "CurrencyName": "林吉特",
-            "CurrencyCode": "MYR"
-        },
-        {
-            "CurrencyName": "挪威克朗",
-            "CurrencyCode": "NOK"
-        },
-        {
-            "CurrencyName": "新西兰元",
-            "CurrencyCode": "NZD"
-        },
-        {
-            "CurrencyName": "卢布",
-            "CurrencyCode": "RUB"
-        },
-        {
-            "CurrencyName": "瑞典克朗",
-            "CurrencyCode": "SEK"
-        },
-        {
-            "CurrencyName": "菲律宾比索",
-            "CurrencyCode": "PHP"
-        },
-        {
-            "CurrencyName": "新台币",
-            "CurrencyCode": "TWD"
-        },
-        {
-            "CurrencyName": "巴西雷亚尔",
-            "CurrencyCode": "BRL"
-        },
-        {
-            "CurrencyName": "韩国元",
-            "CurrencyCode": "ZAR"
-        }
-    ],
-    "ExcelBaseUrl": "http://132.232.92.186:24/",
-    "ExcelBasePath": "D:/FTP/File/OA2023/Office/Excel/",
-    "ExcelFtpPath": "Office/Excel/",
-    "OfficeBaseUrl": "http://132.232.92.186:24/",
-    "OfficeTempBasePath": "D:/FTP/File/OA2023/Office/",
+  "ConnectionStrings": {
+    "OA2023DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2023DB;MultipleActiveResultSets=True;",
+    "OA2014DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2014;MultipleActiveResultSets=True;"
+  },
+  "JwtSecurityKey": "48d3f4fe770940a1068052f581536b81", //jwt密钥
+  "UseSwagger": "true", //启用Swagger
+  "GroupsConfig": {
+    "AutoCreate": "4",
+    "Leader": "149",
+    "ExBeginDays": "3",
+    "ExEndDays": "30",
+    "DefaultUser": "51",
+    "Boss": "21",
+    "FilterUser": "51,180"
+  },
+  "apple:securityKey": "MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQglyUl7hjI75YJUVMbZLN6TpkiFzuTXUN+UIjuJA7+y8ugCgYIKoZIzj0DAQehRANCAAS8GR7lKNst4KENCp45OXCMyiytvzK0qdRBrx0l+bMaHjiU+Upfox82G+Xy4wd8hI+0wMDh341aNelqEdYUUx3O",
+  "apple:kid": "RMV7Y4KM9V",
+  "apple:iss": "HKF372JSMK",
+  "apple:pushNotificationServer": "https://api.sandbox.push.apple.com:443/3/device/",
+  "apple:pushNotificationServer_Production": "https://api.push.apple.com:443/3/device/",
+  "DeleReminderConfig": {
+    "PhoneNumber": "17380669807,13683474118,18780121225",
+    "Test": "18477317582"
+  },
+  "RateCurrency": [
+    {
+      "CurrencyName": "人民币",
+      "CurrencyCode": "CNY"
+    },
+    {
+      "CurrencyName": "美元",
+      "CurrencyCode": "USD"
+    },
+    {
+      "CurrencyName": "欧元",
+      "CurrencyCode": "EUR"
+    },
+    {
+      "CurrencyName": "港币",
+      "CurrencyCode": "HKD"
+    },
+    {
+      "CurrencyName": "日元",
+      "CurrencyCode": "JPY"
+    },
+    {
+      "CurrencyName": "英镑",
+      "CurrencyCode": "GBP"
+    },
+    {
+      "CurrencyName": "澳大利亚元",
+      "CurrencyCode": "AUD"
+    },
+    {
+      "CurrencyName": "加拿大元",
+      "CurrencyCode": "CAD"
+    },
+    {
+      "CurrencyName": "泰国铢",
+      "CurrencyCode": "THB"
+    },
+    {
+      "CurrencyName": "新加坡元",
+      "CurrencyCode": "SGD"
+    },
+    {
+      "CurrencyName": "瑞士法郎",
+      "CurrencyCode": "CHK"
+    },
+    {
+      "CurrencyName": "丹麦克朗",
+      "CurrencyCode": "DKK"
+    },
+    {
+      "CurrencyName": "澳门元",
+      "CurrencyCode": "MOP"
+    },
+    {
+      "CurrencyName": "林吉特",
+      "CurrencyCode": "MYR"
+    },
+    {
+      "CurrencyName": "挪威克朗",
+      "CurrencyCode": "NOK"
+    },
+    {
+      "CurrencyName": "新西兰元",
+      "CurrencyCode": "NZD"
+    },
+    {
+      "CurrencyName": "卢布",
+      "CurrencyCode": "RUB"
+    },
+    {
+      "CurrencyName": "瑞典克朗",
+      "CurrencyCode": "SEK"
+    },
+    {
+      "CurrencyName": "菲律宾比索",
+      "CurrencyCode": "PHP"
+    },
+    {
+      "CurrencyName": "新台币",
+      "CurrencyCode": "TWD"
+    },
+    {
+      "CurrencyName": "巴西雷亚尔",
+      "CurrencyCode": "BRL"
+    },
+    {
+      "CurrencyName": "韩国元",
+      "CurrencyCode": "ZAR"
+    }
+  ],
+  "ExcelBaseUrl": "http://132.232.92.186:24/",
+  "ExcelBasePath": "D:/FTP/File/OA2023/Office/Excel/",
+  "ExcelFtpPath": "Office/Excel/",
+  "OfficeBaseUrl": "http://132.232.92.186:24/",
+  "OfficeTempBasePath": "D:/FTP/File/OA2023/Office/",
 
-    "WordBaseUrl": "http://132.232.92.186:24/",
-    "WordBasePath": "D:/FTP/File/OA2023/Office/Word/",
-    "WordFtpPath": "Office/Word/",
+  "WordBaseUrl": "http://132.232.92.186:24/",
+  "WordBasePath": "D:/FTP/File/OA2023/Office/Word/",
+  "WordFtpPath": "Office/Word/",
 
-    "GrpFileBaseUrl": "http://132.232.92.186:24/",
-    "GrpFileBasePath": "D:/FTP/File/OA2023/Office/GrpFile/",
-    "GrpFileFtpPath": "Office/GrpFile/",
+  "GrpFileBaseUrl": "http://132.232.92.186:24/",
+  "GrpFileBasePath": "D:/FTP/File/OA2023/Office/GrpFile/",
+  "GrpFileFtpPath": "Office/GrpFile/",
 
-    "ExcelTempPath": "D:/FTP/File/OA2023/Office/Excel/Template/",
-    "GrpListFileBasePath": "D:/FTP/File/OA2023/Office/GrpFile/GroupList/",
-    "GrpListFileFtpPath": "Office/GrpFile/GroupList/",
-    //D:\FTP\File\OA2023\Office\GrpFile
-    "VisaProgressImageBaseUrl": "http://132.232.92.186:24/",
-    "VisaProgressImageBasePath": "D:/FTP/File/OA2023/Image/Visa/",
-    "VisaProgressImageFtpPath": "Image/Visa/",
+  "ExcelTempPath": "D:/FTP/File/OA2023/Office/Excel/Template/",
+  "GrpListFileBasePath": "D:/FTP/File/OA2023/Office/GrpFile/GroupList/",
+  "GrpListFileFtpPath": "Office/GrpFile/GroupList/",
+  //D:\FTP\File\OA2023\Office\GrpFile
+  "VisaProgressImageBaseUrl": "http://132.232.92.186:24/",
+  "VisaProgressImageBasePath": "D:/FTP/File/OA2023/Image/Visa/",
+  "VisaProgressImageFtpPath": "Image/Visa/",
 
-    "WageSheetExcelBaseUrl": "http://132.232.92.186:24/",
-    "WageSheetExcelFptPath": "D:/FTP/File/OA2023/Office/WageSheetFile/",
+  "WageSheetExcelBaseUrl": "http://132.232.92.186:24/",
+  "WageSheetExcelFptPath": "D:/FTP/File/OA2023/Office/WageSheetFile/",
 
-    "WageSheetTaxExcelBaseUrl": "http://132.232.92.186:24/",
-    "WageSheetTaxExcelFptPath": "D:/FTP/File/OA2023/Office/Excel/WageSheetTaxFile/",
+  "WageSheetTaxExcelBaseUrl": "http://132.232.92.186:24/",
+  "WageSheetTaxExcelFptPath": "D:/FTP/File/OA2023/Office/Excel/WageSheetTaxFile/",
 
-    "CTableCorrelationPageDatas": [
-        {
-            "CTableId": 76, //CtableId 酒店预订
-            "PageIdDatas": [ //页面Ids
-                28
-            ]
-        },
-        {
-            "CTableId": 77, //CtableId  行程
-            "PageIdDatas": [ //页面Id
-            ]
-        },
-        {
-            "CTableId": 79, //CtableId 车/导游地接
-            "PageIdDatas": [ //页面Id
-                30
-            ]
-        },
-        {
-            "CTableId": 80, //CtableId  签证
-            "PageIdDatas": [ //页面Id
-            ]
-        },
-        {
-            "CTableId": 81, //CtableId 邀请/公务活动
-            "PageIdDatas": [ //页面Id
-            ]
-        },
-        {
-            "CTableId": 82, //CtableId 团组客户保险
-            "PageIdDatas": [ //页面Id
-            ]
-        },
-        {
-            "CTableId": 85, //CtableId 机票预订
-            "PageIdDatas": [ //页面Id
-            ]
-        },
-        {
-            "CTableId": 98, //CtableId 其他款项
-            "PageIdDatas": [ //页面Id
-                69
-            ]
-        },
-        {
-            "CTableId": 285, //CtableId 其他款项与收款退还
-            "PageIdDatas": [ //页面Id
-                //69
-            ]
-        },
-        {
-            "CTableId": 751, //CtableId 酒店早餐
-            "PageIdDatas": [ //页面Id
-            ]
-        },
-        {
-            "CTableId": 1015, //CtableId 超支费用
-            "PageIdDatas": [ //页面Id
-                174
-            ]
-        }
-    ],
+  "CTableCorrelationPageDatas": [
+    {
+      "CTableId": 76, //CtableId 酒店预订
+      "PageIdDatas": [ //页面Ids
+        28
+      ]
+    },
+    {
+      "CTableId": 77, //CtableId  行程
+      "PageIdDatas": [ //页面Id
+      ]
+    },
+    {
+      "CTableId": 79, //CtableId 车/导游地接
+      "PageIdDatas": [ //页面Id
+        30
+      ]
+    },
+    {
+      "CTableId": 80, //CtableId  签证
+      "PageIdDatas": [ //页面Id
+      ]
+    },
+    {
+      "CTableId": 81, //CtableId 邀请/公务活动
+      "PageIdDatas": [ //页面Id
+      ]
+    },
+    {
+      "CTableId": 82, //CtableId 团组客户保险
+      "PageIdDatas": [ //页面Id
+      ]
+    },
+    {
+      "CTableId": 85, //CtableId 机票预订
+      "PageIdDatas": [ //页面Id
+      ]
+    },
+    {
+      "CTableId": 98, //CtableId 其他款项
+      "PageIdDatas": [ //页面Id
+        69
+      ]
+    },
+    {
+      "CTableId": 285, //CtableId 其他款项与收款退还
+      "PageIdDatas": [ //页面Id
+        //69
+      ]
+    },
+    {
+      "CTableId": 751, //CtableId 酒店早餐
+      "PageIdDatas": [ //页面Id
+      ]
+    },
+    {
+      "CTableId": 1015, //CtableId 超支费用
+      "PageIdDatas": [ //页面Id
+        174
+      ]
+    }
+  ],
 
-    //消息通知类型
-    "MessageNotificationType": [
-        {
-            "TypeId": 1022, //系统公告
-            "MsgTypeIds": [
-                1 // 公告消息
-            ]
-        },
-        {
-            "TypeId": 1021, //操作通知
-            "MsgTypeIds": [
-                2, // 团组流程管控消息
-                3, // 团组业务操作消息
-                4, // 团组费用审核消息
-                5 // 团组签证进度更新消息
-            ]
-        },
-        {
-            "TypeId": 1020, //任务通知
-            "MsgTypeIds": [
-                6 //任务进度更新消息
-            ]
-        }
-    ],
+  //消息通知类型
+  "MessageNotificationType": [
+    {
+      "TypeId": 1022, //系统公告
+      "MsgTypeIds": [
+        1 // 公告消息
+      ]
+    },
+    {
+      "TypeId": 1021, //操作通知
+      "MsgTypeIds": [
+        2, // 团组流程管控消息
+        3, // 团组业务操作消息
+        4, // 团组费用审核消息
+        5 // 团组签证进度更新消息
+      ]
+    },
+    {
+      "TypeId": 1020, //任务通知
+      "MsgTypeIds": [
+        6 //任务进度更新消息
+      ]
+    }
+  ],
 
 
-    //职位默认页面权限
-    "DefaultPostPageData": [
-        {
-            "DepId": -1, //部门： 公司公共页面
-            "PostPageAuths": [
-                {
-                    "PostId": -1,
-                    "PageIds": [
-                        42 //Page： 日常费用付款申请
-                        //16 //Page： 员工资料列表
-                    ]
-                }
-            ]
-        },
-        {
-            "DepId": 0, //部门：人事部，信息部，策划部(部门页面一致归类在一起)
-            "PostPageAuths": [
-                {
-                    "PostId": 0, //职位：普通员工(除经理主管外/公共页面)
-                    "PageIds": [
-                        149 //Page： 主页(员工)
-                    ]
-                }
-            ]
-        },
-        {
-            "DepId": 1, //部门： 总经办
-            "PostPageAuths": [
-                {
-                    "PostId": 3, //职位： 总经理助理
-                    "PageIds": [
-                        150 //Page： 主页(总助)
-                    ]
-                }
-            ]
-        },
-        {
-            "DepId": 6, //部门：市场部
-            "PostPageAuths": [
-                {
-                    "PostId": 21, //职位：普通员工(除经理主管外)
-                    "PageIds": [
-                        //153, //Page： 主页(市场部)
-                        149, //Page： 主页(员工)
-                        118, //Page： 出入境费用明细
-                        168, //Page： 出入境国家三公费用标准
-                        89 //Page： 公司客户资料
-                    ]
-                }
-            ]
-        },
-        {
-            "DepId": 3, //部门：财务部
-            "PostPageAuths": [
-                {
-                    "PostId": 10, //职位：会计
-                    "PageIds": [
-                        151 //Page： 主页(财务)
-                    ]
-                }
-            ]
-        },
-        {
-            "DepId": 7, //国交部
-            "PostPageAuths": [
-                {
-                    "PostId": -1, //职位：部门公共页面
-                    "PageIds": [
-                        //154, //Page： 主页(国交)
-                        40, //Page： 其他款项
-                        174 //Page： 超支费用
-                    ]
-                },
-                {
-                    "PostId": 0, //职位：经理/主管
-                    "PageIds": [
-                        154, //Page： 主页(国交)
-                        27, //Page： 团组操作
-                        104, //Page： 接团客户名单
-                        118, //Page： 出入境费用明细
-                        168 //Page： 出入境国家三公费用标准
-                    ]
-                },
-                {
-                    "PostId": 26, //职位：签证
-                    "PageIds": [
-                        149, //Page： 主页(员工)
-                        31, //Page： 签证费用录入
-                        158, //Page： OCR识别
-                        32 //Page： 保险录入
-                    ]
-                },
-                {
-                    "PostId": 27, //职位：商邀
-                    "PageIds": [
-                        149, //Page： 主页(员工)
-                        25, //Page： 邀请资料
-                        29, //Page： 邀请公务费用
-                        166, //Page： 公务出访
-                        167 //Page：导出邀请函
-                    ]
-                },
-                {
-                    "PostId": 28, //职位：OP
-                    "PageIds": [
-                        149, //Page： 主页(员工)
-                        24, //Page： 导游地接资料
-                        30, //Page： 地接费用录入
-                        122, //Page： OP行程单
-                        111 //Page： 车公司资料
-                    ]
-                },
-                {
-                    "PostId": 24, //职位：机票
-                    "PageIds": [
-                        149, //Page： 主页(员工)
-                        114, //Page： 机票行程代码录
-                        120, //Page： 三字码资料表
-                        160, //Page： 代理出票合作方
-                        161 //Page： 机票费用录入
-                    ]
-                },
-                {
-                    "PostId": 25, //职位：酒店
-                    "PageIds": [
-                        149, //Page： 主页(员工)
-                        23, //Page： 酒店资料 
-                        28 //Page： 酒店预订
-                    ]
-                }
-            ]
+  //职位默认页面权限
+  "DefaultPostPageData": [
+    {
+      "DepId": -1, //部门： 公司公共页面
+      "PostPageAuths": [
+        {
+          "PostId": -1,
+          "PageIds": [
+            42 //Page： 日常费用付款申请
+            //16 //Page： 员工资料列表
+          ]
+        }
+      ]
+    },
+    {
+      "DepId": 0, //部门：人事部，信息部，策划部(部门页面一致归类在一起)
+      "PostPageAuths": [
+        {
+          "PostId": 0, //职位：普通员工(除经理主管外/公共页面)
+          "PageIds": [
+            149 //Page： 主页(员工)
+          ]
+        }
+      ]
+    },
+    {
+      "DepId": 1, //部门： 总经办
+      "PostPageAuths": [
+        {
+          "PostId": 3, //职位： 总经理助理
+          "PageIds": [
+            150 //Page： 主页(总助)
+          ]
+        }
+      ]
+    },
+    {
+      "DepId": 6, //部门：市场部
+      "PostPageAuths": [
+        {
+          "PostId": 21, //职位：普通员工(除经理主管外)
+          "PageIds": [
+            //153, //Page： 主页(市场部)
+            149, //Page： 主页(员工)
+            118, //Page： 出入境费用明细
+            168, //Page： 出入境国家三公费用标准
+            89 //Page： 公司客户资料
+          ]
+        }
+      ]
+    },
+    {
+      "DepId": 3, //部门：财务部
+      "PostPageAuths": [
+        {
+          "PostId": 10, //职位：会计
+          "PageIds": [
+            151 //Page： 主页(财务)
+          ]
+        }
+      ]
+    },
+    {
+      "DepId": 7, //国交部
+      "PostPageAuths": [
+        {
+          "PostId": -1, //职位：部门公共页面
+          "PageIds": [
+            //154, //Page： 主页(国交)
+            40, //Page： 其他款项
+            174 //Page： 超支费用
+          ]
+        },
+        {
+          "PostId": 0, //职位：经理/主管
+          "PageIds": [
+            154, //Page： 主页(国交)
+            27, //Page： 团组操作
+            104, //Page： 接团客户名单
+            118, //Page： 出入境费用明细
+            168 //Page： 出入境国家三公费用标准
+          ]
+        },
+        {
+          "PostId": 26, //职位：签证
+          "PageIds": [
+            149, //Page： 主页(员工)
+            31, //Page： 签证费用录入
+            158, //Page： OCR识别
+            32 //Page： 保险录入
+          ]
+        },
+        {
+          "PostId": 27, //职位：商邀
+          "PageIds": [
+            149, //Page： 主页(员工)
+            25, //Page： 邀请资料
+            29, //Page： 邀请公务费用
+            166, //Page： 公务出访
+            167 //Page：导出邀请函
+          ]
+        },
+        {
+          "PostId": 28, //职位：OP
+          "PageIds": [
+            149, //Page： 主页(员工)
+            24, //Page： 导游地接资料
+            30, //Page： 地接费用录入
+            122, //Page： OP行程单
+            111 //Page： 车公司资料
+          ]
+        },
+        {
+          "PostId": 24, //职位：机票
+          "PageIds": [
+            149, //Page： 主页(员工)
+            114, //Page： 机票行程代码录
+            120, //Page： 三字码资料表
+            160, //Page： 代理出票合作方
+            161 //Page： 机票费用录入
+          ]
+        },
+        {
+          "PostId": 25, //职位：酒店
+          "PageIds": [
+            149, //Page： 主页(员工)
+            23, //Page： 酒店资料 
+            28 //Page： 酒店预订
+          ]
         }
-    ],
+      ]
+    }
+  ],
 
-    //日付类型Data
-    "Dailypayment": "666,667"
+  //日付类型Data
+  "Dailypayment": "666,667"
 }

OASystem/OASystem.Domain/Dtos/Statistics/MarketingSalesDto.cs

@@ -221,4 +221,12 @@ namespace OASystem.Domain.Dtos.Statistics
         public string Search { get; set; }
     }
 
+    public class StatisticsNowCityOfGroupDto : PortDtoBase
+    {
+        /// <summary>
+        /// 当前时间
+        /// </summary>
+        public string Now { get; set; }
+    }
+
 }

OASystem/OASystem.Domain/Result.cs

@@ -13,6 +13,17 @@ namespace OASystem.Domain
         public dynamic? Data { get; set; } = new { };
     }
 
+    /// <summary>
+    /// 公共静态数据
+    /// </summary>
+    public static class SharingStaticData
+    {
+        /// <summary>
+        /// 端口静态数据
+        /// </summary>
+        public static List<int> PortTypes = new() { 1, 2, 3 };
+    }
+
 
     /// <summary>
     /// 消息 Tips

OASystem/OASystem.Infrastructure/OASystem.Infrastructure.csproj

@@ -19,6 +19,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.3.32" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
+    <PackageReference Include="XAct.Core.PCL" Version="0.0.5014" />
   </ItemGroup>
 
   <ItemGroup>

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaCommissionRepository.cs

@@ -2,6 +2,7 @@
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Groups;
+using OASystem.Infrastructure.Tools;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OASystem/OASystem.Infrastructure/Repositories/System/UsersRepository.cs

@@ -52,7 +52,6 @@ namespace OASystem.Infrastructure.Repositories.System
 
             if (portType == 1) //web
             {
-
                 string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
                                                         su.Id UserId,su.CnName,su.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
                                                       From Sys_Users su 

OASystem/OASystem.Infrastructure/Tools/AesEncryptionHelper.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Security.Cryptography;
+
+namespace OASystem.Infrastructure.Tools
+{
+    /// <summary>
+    /// Aes加密帮助类
+    /// </summary>
+    public static class AesEncryptionHelper
+    {
+        private readonly static string Key = "FANMEIGUOJIKEY01"; // 16 字节密钥
+        private readonly static string IV = "FANMEIGUOJIIVV01";    // 16 字节向量
+
+        /// <summary>
+        /// 加密
+        /// </summary>
+        /// <param name="plainText"></param>
+        /// <returns></returns>
+        public static string Encrypt(string plainText)
+        {
+            using var aes = Aes.Create();
+            aes.Key = Encoding.UTF8.GetBytes(Key);
+            aes.IV = Encoding.UTF8.GetBytes(IV);
+            using var encryptor = aes.CreateEncryptor();
+            var plainBytes = Encoding.UTF8.GetBytes(plainText);
+            var encryptedBytes = encryptor.TransformFinalBlock(plainBytes, 0, plainBytes.Length);
+            return Convert.ToBase64String(encryptedBytes);
+        }
+
+        /// <summary>
+        /// 解密
+        /// </summary>
+        /// <param name="cipherText"></param>
+        /// <returns></returns>
+        public static string Decrypt(string cipherText)
+        {
+            using var aes = Aes.Create();
+            aes.Key = Encoding.UTF8.GetBytes(Key);
+            aes.IV = Encoding.UTF8.GetBytes(IV);
+            using var decryptor = aes.CreateDecryptor();
+            var cipherBytes = Convert.FromBase64String(cipherText);
+            var plainBytes = decryptor.TransformFinalBlock(cipherBytes, 0, cipherBytes.Length);
+            return Encoding.UTF8.GetString(plainBytes);
+        }
+    }
+}

OASystem/OASystem.Infrastructure/Tools/CommonFun.cs

@@ -5,6 +5,7 @@ using System.Collections;
 using System.Globalization;
 using System.Reflection;
 using System.Reflection.Metadata;
+using System.Security.Cryptography;
 
 namespace OASystem.Infrastructure.Tools;