首款退还 添加优化

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -106,42 +106,43 @@ namespace OASystem.API.Controllers
         private readonly ForeignReceivablesRepository _ffrRep;  //对外收款账单仓库
         private readonly OpinionaireRepository _opinionaireRep;  //对外收款账单仓库
 
-        public GroupsController(ILogger<GroupsController> logger, 
-                                IMapper mapper, 
-                                SqlSugarClient sqlSugar, 
-                                GrpScheduleRepository grpScheduleRep, 
-                                DelegationInfoRepository groupRepository,
-                                TaskAssignmentRepository taskAssignmentRep, 
-                                AirTicketResRepository airTicketResRep, 
-                                DecreasePaymentsRepository decreasePaymentsRep,
-                                InvitationOfficialActivitiesRepository InvitationOfficialActivitiesRep, 
-                                DelegationEnDataRepository delegationEnDataRep, 
-                                EnterExitCostRepository enterExitCostRep, 
-                                DelegationVisaRepository delegationVisaRep,
-                                MessageRepository message, 
-                                VisaPriceRepository visaPriceRep, 
-                                CarTouristGuideGroundRepository carTouristGuideGroundRep,
-                                CheckBoxsRepository checkBoxs, 
-                                GroupCostRepository GroupCostRepository, 
-                                CostTypeHotelNumberRepository CostTypeHotelNumberRepository,
-                                GroupCostParameterRepository GroupCostParameterRepository,
-                                HotelPriceRepository hotelPriceRep, 
-                                CustomersRepository customersRep, 
-                                SetDataRepository setDataRep,
-                                TourClientListRepository tourClientListRep, 
-                                TeamRateRepository teamRateRep,
-                                IHubContext<ChatHub, IChatClient> hubContext, 
-                                UsersRepository usersRep, IJuHeApiService juHeApi,
-                                InvertedListRepository invertedListRep, 
-                                VisaFeeInfoRepository visaFeeInfoRep, 
-                                TicketBlackCodeRepository ticketBlackCodeRep, 
-                                HotelInquiryRepository hotelInquiryRep,
-                                ThreeCodeRepository threeCodeRepository, 
-                                FeeAuditRepository feeAuditRep, 
-                                VisaCommissionRepository visaCommissionRep, 
-                                ForeignReceivablesRepository ffrRep,
-                                OpinionaireRepository opinionaireRep
-                                )
+        public GroupsController(
+            ILogger<GroupsController> logger, 
+            IMapper mapper,
+            IHubContext<ChatHub, IChatClient> hubContext,
+            SqlSugarClient sqlSugar, 
+            GrpScheduleRepository grpScheduleRep, 
+            DelegationInfoRepository groupRepository,
+            TaskAssignmentRepository taskAssignmentRep, 
+            AirTicketResRepository airTicketResRep, 
+            DecreasePaymentsRepository decreasePaymentsRep,
+            InvitationOfficialActivitiesRepository InvitationOfficialActivitiesRep, 
+            DelegationEnDataRepository delegationEnDataRep, 
+            EnterExitCostRepository enterExitCostRep, 
+            DelegationVisaRepository delegationVisaRep,
+            MessageRepository message, 
+            VisaPriceRepository visaPriceRep, 
+            CarTouristGuideGroundRepository carTouristGuideGroundRep,
+            CheckBoxsRepository checkBoxs, 
+            GroupCostRepository GroupCostRepository, 
+            CostTypeHotelNumberRepository CostTypeHotelNumberRepository,
+            GroupCostParameterRepository GroupCostParameterRepository,
+            HotelPriceRepository hotelPriceRep, 
+            CustomersRepository customersRep, 
+            SetDataRepository setDataRep,
+            TourClientListRepository tourClientListRep, 
+            TeamRateRepository teamRateRep,
+            UsersRepository usersRep, IJuHeApiService juHeApi,
+            InvertedListRepository invertedListRep, 
+            VisaFeeInfoRepository visaFeeInfoRep, 
+            TicketBlackCodeRepository ticketBlackCodeRep, 
+            HotelInquiryRepository hotelInquiryRep,
+            ThreeCodeRepository threeCodeRepository, 
+            FeeAuditRepository feeAuditRep, 
+            VisaCommissionRepository visaCommissionRep, 
+            ForeignReceivablesRepository ffrRep,
+            OpinionaireRepository opinionaireRep
+            )
         {
             _logger = logger;
             _mapper = mapper;

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -51,14 +51,15 @@ namespace OASystem.API.Controllers
         /// <param name="hubContext"></param>
         /// <param name="goodsRep"></param>
         /// <param name="sqlSugar"></param>
-        public PersonnelModuleController(IQiYeWeChatApiService qiYeWeChatApiService,
-                                         WageSheetRepository wageSheetRep,
-                                         UsersRepository usersRep,
-                                         IMapper mapper,
-                                         TaskAllocationRepository taskAllocationRep,
-                                         IHubContext<ChatHub, IChatClient> hubContext,
-                                         GoodsRepository goodsRep,
-                                         SqlSugarClient sqlSugar
+        public PersonnelModuleController(
+            IHubContext<ChatHub, IChatClient> hubContext,
+            IMapper mapper,
+            IQiYeWeChatApiService qiYeWeChatApiService,
+            WageSheetRepository wageSheetRep,
+            UsersRepository usersRep,
+            TaskAllocationRepository taskAllocationRep,
+            GoodsRepository goodsRep,
+            SqlSugarClient sqlSugar
             )
         {
             _mapper = mapper;

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -39,25 +39,27 @@ namespace OASystem.API.Controllers
         private readonly DelegationInfoRepository _delegationInfoRep;
         private readonly TranslatorLibraryRepository _translatorRep;
 
-        public ResourceController(IMapper mapper, 
-                                  IConfiguration config, 
-                                  SqlSugarClient sqlSugar,
-                                  CarDataRepository carDataRep, 
-                                  LocalGuideDataRepository localGuideDataRep,
-                                  ThreeCodeRepository threeCodeRep, 
-                                  HotelDataRepository hotelDataRep, 
-                                  ResItemInfoRepository resItemInfoRep, 
-                                  SetDataRepository setDataRepository,
-                                  CountryFeeRepository countryFeeRep, 
-                                  SetDataTypeRepository setDataTypeRep, 
-                                  AirTicketAgentRepository airTicketAgentRep,
-                                  InvitationOfficialActivityDataRepository invitationOfficialActivityDataRep, 
-                                  OfficialActivitiesRepository officialActivitiesRep, 
-                                  AskDataRepository askDataRep,
-                                  TicketBlackCodeRepository ticketBlackCodeRep, 
-                                  TourClientListRepository tourClientListRep, 
-                                  DelegationInfoRepository delegationInfoRep,
-                                  TranslatorLibraryRepository translatorRep)
+        public ResourceController(
+            IMapper mapper, 
+            IConfiguration config, 
+            SqlSugarClient sqlSugar,
+            CarDataRepository carDataRep, 
+            LocalGuideDataRepository localGuideDataRep,
+            ThreeCodeRepository threeCodeRep, 
+            HotelDataRepository hotelDataRep, 
+            ResItemInfoRepository resItemInfoRep, 
+            SetDataRepository setDataRepository,
+            CountryFeeRepository countryFeeRep, 
+            SetDataTypeRepository setDataTypeRep, 
+            AirTicketAgentRepository airTicketAgentRep,
+            InvitationOfficialActivityDataRepository invitationOfficialActivityDataRep, 
+            OfficialActivitiesRepository officialActivitiesRep, 
+            AskDataRepository askDataRep,
+            TicketBlackCodeRepository ticketBlackCodeRep, 
+            TourClientListRepository tourClientListRep, 
+            DelegationInfoRepository delegationInfoRep,
+            TranslatorLibraryRepository translatorRep
+            )
         {
             _mapper = mapper;
             _config = config;

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -36,7 +36,15 @@ namespace OASystem.API.Controllers
         /// <param name="sqlSugar"></param>
         /// <param name="groupRep"></param>
         /// <param name="setDataRep"></param>
-        public StatisticsController(IMapper mapper, IConfiguration config, SqlSugarClient sqlSugar, DelegationInfoRepository groupRep, SetDataRepository setDataRep, TeamRateRepository teamRate, VisitingClientsRepository visitingClientsRep)
+        public StatisticsController(
+            IMapper mapper, 
+            IConfiguration config, 
+            SqlSugarClient sqlSugar, 
+            DelegationInfoRepository groupRep, 
+            SetDataRepository setDataRep, 
+            TeamRateRepository teamRate, 
+            VisitingClientsRepository visitingClientsRep
+            )
         {
             _mapper = mapper;
             _config = config;

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -43,21 +43,23 @@ namespace OASystem.API.Controllers
         private readonly List<int> _taskTypeList = new List<int>() { 6 };//任务通知 TaskNotification
 
 
-        public SystemController(CompanyRepository syscom, 
-                                DepartmentRepository sysDepRep, 
-                                UsersRepository userRep,
-                                IMapper mapper, 
-                                SqlSugarClient sqlSugar, 
-                                SetDataRepository setDataRepository, 
-                                CompanyRepository companyRepository,
-                                SystemMenuPermissionRepository systemMenuPermissionRepository,
-                                PageFunctionPermissionRepository pageFunctionPermissionRepository,
-                                SystemMenuAndFunctionRepository systemMenuAndFunctionRepository, 
-                                JobPostAuthorityRepository jobPostAuthorityRepository,
-                                JobPostRepository jobRep, 
-                                UserAuthorityRepository userAuthorityRepository, 
-                                MessageRepository messageRep, 
-                                SetDataTypeRepository setDataTypeRep )
+        public SystemController(
+            CompanyRepository syscom,
+            DepartmentRepository sysDepRep,
+            UsersRepository userRep,
+            IMapper mapper,
+            SqlSugarClient sqlSugar,
+            SetDataRepository setDataRepository,
+            CompanyRepository companyRepository,
+            SystemMenuPermissionRepository systemMenuPermissionRepository,
+            PageFunctionPermissionRepository pageFunctionPermissionRepository,
+            SystemMenuAndFunctionRepository systemMenuAndFunctionRepository,
+            JobPostAuthorityRepository jobPostAuthorityRepository,
+            JobPostRepository jobRep,
+            UserAuthorityRepository userAuthorityRepository,
+            MessageRepository messageRep,
+            SetDataTypeRepository setDataTypeRep
+            )
         {
             _syscomRep = syscom;
             _sysDepRep = sysDepRep;
@@ -2522,6 +2524,50 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
                 }
                 else if (department.Equals("国交部"))//国交部
                 {
+                    /*
+                     * 名称：团组费用录入提示
+                     * 描述：团组费用录入提醒(根据团组结束时间 - 3天 如果对应的数据表里没有这个团组的费用信息)
+                     * 条件：时间范围不限制、 根据团组结束时间 - 3天 == 当前天数
+                     */
+                    var groupModlue = new List<int>() {
+                        76,  //酒店预订
+                        79,  //车/导游地接
+                        80,  //签证
+                        81,  //邀请/公务活动
+                        //82,  //团组客户保险
+                        85,  //机票预订
+                        98,  //其他款项
+                        //285 ,//收款退还
+                        //1015,//超支费用
+                    };
+                    var crrDate = DateTime.Now.ToString("yyyy-MM-dd");
+                    var groupFeeData = await _sqlSugar.Queryable<Grp_DelegationInfo>()
+                        .LeftJoin< Grp_CreditCardPayment>((di, ccp) => di.Id == ccp.DIId)
+                        .LeftJoin<Sys_SetData>((di, ccp,  sd) => ccp.CTable == sd.Id)
+                        .Where((di, ccp, sd) => ccp.IsDel == 0 && 
+                                                di.IsDel == 0 &&
+                                                groupModlue.Contains(ccp.CTable) && 
+                                                di.VisitEndDate.AddDays(-3).ToString("yyyy-MM-dd").Equals(crrDate)
+                         )
+                        .Select((di, ccp, sd) => new { 
+                            diId = di.Id,
+                            groupName = di.TeamName,
+                            groupType = ccp.CTable,
+                            groupTypeName = sd.Name
+                        })
+                        .ToListAsync();
+
+
+
+                    //经理、主管(部门下所有人员) --> 日付(-:未审核提示)、团组费用录入提醒(根据团组结束时间-3天 如果对应的数据表里没有这个团组的费用信息)、团组相关费用(-:未审核提示)
+                    //计调(myself) --> 暂定
+                    //机票(myself) --> 日付(-:未审核提示)、机票费用(-:未审核提示)
+                    //酒店(myself) --> 日付(-:未审核提示)、酒店费用(-:未审核提示)、酒店资源信息(-:新增提示)
+                    //签证(myself) --> 日付(-:未审核提示)、签证费用(-:未审核提示)、签证资源信息(-:新增提示)
+                    //商邀(myself) --> 日付(-:未审核提示)、商邀费用(-:未审核提示)、(公务、翻译人)(-:新增提示)
+                    //OP(myself) --> 日付(-:未审核提示)、OP费用(-:未审核提示)、(导游、车)资源信息(-:新增提示)
+
+
                     return Ok(JsonView(false, "国交部消息提示正在开发者中......"));
                 }
                 else if (department.Equals("财务部"))//总经办

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

@@ -355,14 +355,15 @@ 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();
-
-                    if (data != null)
-                    {
-                        _view.Msg = "费用名称已存在,请勿重新添加!";
-                        return _view;
-                    }
+  AND ccp.DIId = {0}
+  AND prom.PriceName = '{1}'", _PaymentRefundAndOtherMoney.DiId,_PaymentRefundAndOtherMoney.PriceName);
+                    //var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).FirstAsync();
+
+                    //if (data != null)
+                    //{
+                    //    _view.Msg = "费用名称已存在,请勿重新添加!";
+                    //    return _view;
+                    //}
                    
                     #endregion