1、日付申请-->查看勾选-->bug调整

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1,58 +1,28 @@
 using Aspose.Cells;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Aspose.Words;
+using EyeSoft.Extensions;
+using FluentValidation;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLib.File;
-using OASystem.Domain;
+using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
 using OASystem.Domain.Dtos.Financial;
 using OASystem.Domain.Dtos.Groups;
+using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
-using OASystem.Domain.ViewModels.SmallFun;
 using OASystem.Infrastructure.Repositories.Financial;
 using OASystem.Infrastructure.Repositories.Groups;
-using SqlSugar;
-using StackExchange.Redis;
-using System.Data;
-using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
-using System.Web;
-using Aspose.Words;
-using NPOI.HSSF.Util;
-using OASystem.Domain.Entities.Customer;
-using System.IO.Compression;
-using NPOI.SS.UserModel;
-using System.Net.Http;
-using Google.Protobuf;
-using NPOI.SS.Formula.Functions;
-using System.Globalization;
-using NPOI.POIFS.Properties;
-using SixLabors.ImageSharp.ColorSpaces;
-using OASystem.Domain.ViewModels.QiYeWeChat;
-using System.Diagnostics;
-using System.Security.Cryptography;
-using NPOI.POIFS.Crypt.Dsig;
-using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
-using Org.BouncyCastle.Asn1.Ocsp;
-using FluentValidation;
-using AutoMapper;
-using NetTaste;
-using EyeSoft.Runtime.InteropServices;
-using NPOI.HPSF;
-using System.Data.OleDb;
-using Org.BouncyCastle.Crypto;
 using OfficeOpenXml;
-using Org.BouncyCastle.Asn1.Crmf;
-using EyeSoft.Extensions;
-using System.Collections;
 using SqlSugar.Extensions;
-using System.Linq.Expressions;
-using MathNet.Numerics.Distributions;
-using System.Diagnostics.Metrics;
-using EyeSoft.Collections.Generic;
-using Microsoft.Extensions.Hosting;
-using System.Runtime.Intrinsics.Arm;
+using System.Collections;
+using System.Data;
+using System.Data.OleDb;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO.Compression;
 
 namespace OASystem.API.Controllers
 {
@@ -369,8 +339,8 @@ namespace OASystem.API.Controllers
         {
             var dailyInfos = await _sqlSugar.Queryable<Fin_DailyFeePayment>()
                                              .LeftJoin<Sys_Users>((dfp, u) => dfp.CreateUserId == u.Id)
-                                             //.Where(dfp => dfp.IsDel == 0 && dfp.IsPay == 0 && dfp.FAudit == 1 && dfp.MAudit != 1)
-                                             .Where(dfp => dfp.IsDel == 0 && 
+                                             .Where(dfp => dfp.IsDel == 0 &&
+                                                           //dfp.FAudit == 1 &&
                                                            //dfp.IsPay == 0 && 
                                                            dfp.MAudit == 0
                                                    )
@@ -2053,6 +2023,10 @@ namespace OASystem.API.Controllers
                 if (checkedStr != null)
                 {
                     checkedView = JsonConvert.DeserializeObject<PaymentRequestCheckedView>(checkedStr.ToString());
+                    if (checkedView.GroupIds.Count > 0)
+                    {
+                        checkedView.GroupIds = checkedView.GroupIds.OrderBy(x => x).ToList();
+                    }
                 }
 
                 tree_Fin_DailyFeePaymentResult dailyResult = PayRequest_DailyByDateRange(dto.Status, checkedView.DailyPaymentIds, dto.beginDt, dto.endDt);
@@ -2126,7 +2100,13 @@ namespace OASystem.API.Controllers
                 if (_hotelSubIds.Count > 1)
                 {
                     var hrIds = _sqlSugar.Queryable<Grp_HotelReservationsContent>().Where(it => _hotelSubIds.Contains(it.Id)).Select(it => it.HrId).Distinct().ToList();
-                    _groupIds = _sqlSugar.Queryable<Grp_CreditCardPayment>().Where(it => it.CTable == 76 && hrIds.Contains(it.CId)).Select(it => it.Id).ToList();
+
+
+                    var hrIds1 = _sqlSugar.Queryable<Grp_CreditCardPayment>().Where(it => it.CTable == 76 && hrIds.Contains(it.CId)).Select(it => it.Id).ToList();
+                    if (hrIds1.Count > 1)
+                    {
+                        _groupIds.AddRange(hrIds1);
+                    }
                 }
 
                 if (_groupIds.Count < 1)

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1,17 +1,5 @@
-
-using AutoMapper.Execution;
-using EyeSoft.Collections.Generic;
-using Google.Protobuf.WellKnownTypes;
-using Microsoft.AspNetCore.Mvc.Formatters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Newtonsoft.Json.Linq;
-using OASystem.Domain.Dtos.System;
-using OASystem.Domain.ViewModels.QiYeWeChat;
-using Org.BouncyCastle.Asn1.Cms;
 using System.Collections;
-using System.Xml.Linq;
 using static OASystem.API.OAMethodLib.GeneralMethod;
-using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
 
 namespace OASystem.API.Controllers
 {