Explorar o código

修改C表修改了字段引发的问题

wangh hai 1 ano
pai
achega
e0044be8db

+ 1 - 1
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -721,7 +721,7 @@ namespace OASystem.API.Controllers
                 var result = await _grpScheduleRep._sqlSugar.Updateable<Grp_CreditCardPayment>()
                 .SetColumns(it => it.IsAuditGM == _dto.AuditCode)
                 .SetColumns(it => it.AuditGMOperate == _dto.User)
-                .SetColumns(it => it.AuditGMDate == dtNow)
+                .SetColumns(it => it.AuditGMDate == dtNow.ToString())
                 .Where(s => s.Id == CreditId)
                 .ExecuteCommandAsync();
                 if (result < 1)

+ 13 - 13
OASystem/OASystem.Domain/Entities/Groups/Grp_CreditCardPayment.cs

@@ -25,8 +25,8 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 消费日期
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime ConsumptionDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public String ConsumptionDate { get; set; }
         /// <summary>
         /// 卡类型
         /// </summary>
@@ -85,8 +85,8 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 财务操作时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime MFOperatorDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string MFOperatorDate { get; set; }
         /// <summary>
         /// 部门经理是否审核 0否1是
         /// </summary>
@@ -100,8 +100,8 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 部门经理审核时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime AuditDMDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string AuditDMDate { get; set; }
         /// <summary>
         /// 财务部是否审核  0否1是
         /// </summary>
@@ -115,8 +115,8 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 财务部审核时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime AuditMFDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string AuditMFDate { get; set; }
         /// <summary>
         /// 总经理是否审核  0否1是
         /// </summary>
@@ -130,8 +130,8 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 总经理审核时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime AuditGMDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string AuditGMDate { get; set; }
         /// <summary> 
         /// 是否付款  0否1是
         /// </summary> 
@@ -175,8 +175,8 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 上次付款时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime UpdateDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string UpdateDate { get; set; }
         /// <summary>
         /// 收款方
         /// </summary>
@@ -190,7 +190,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 费用标识
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int OrbitalPrivateTransfer { get; set; }
         /// <summary>
         /// 超出预算比例

+ 10 - 10
OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -367,7 +367,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 0;
-                                grp_CreditCard.AuditGMDate = DateTime.Now;
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 0;
                             }
                             else
@@ -377,7 +377,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = new DateTime();
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 0;
                             }
 
@@ -389,7 +389,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = DateTime.Now;
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 0;
                             }
                             else
@@ -399,7 +399,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = new DateTime();
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 0;
                             }
                         }
@@ -420,7 +420,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         {
                             grp_CreditCard.PayPercentageOld = 0;// 上次付款百分比 查询并计算最近一次
                             grp_CreditCard.PayThenMoneyOld = 0;// 上次付款金额 查询上一次
-                            grp_CreditCard.UpdateDate = new DateTime();// 上次付款时间 查询上一次
+                            grp_CreditCard.UpdateDate = "";// 上次付款时间 查询上一次
                         }
 
                         id = await _sqlSugar.Insertable(grp_CreditCard).ExecuteReturnIdentityAsync();
@@ -510,7 +510,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 0;
-                                grp_CreditCard.AuditGMDate = DateTime.Now;
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 1;
                             }
                             else
@@ -520,7 +520,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = new DateTime();
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 1;
                             }
 
@@ -532,7 +532,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = DateTime.Now;
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 1;
                             }
                             else
@@ -542,7 +542,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = new DateTime();
+                                grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 1;
                             }
                         }
@@ -563,7 +563,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         {
                             grp_CreditCard.PayPercentageOld = 0;// 上次付款百分比 查询并计算最近一次
                             grp_CreditCard.PayThenMoneyOld = 0;// 上次付款金额 查询上一次
-                            grp_CreditCard.UpdateDate = new DateTime();// 上次付款时间 查询上一次
+                            grp_CreditCard.UpdateDate = "";// 上次付款时间 查询上一次
                         }
                         int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.Id == dto.CardPaymentOpData.Id).SetColumns(a => new Grp_CreditCardPayment
                         {

+ 7 - 7
OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -130,7 +130,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             Grp_CreditCardPayment C = new Grp_CreditCardPayment();
                             C.PayDId = dto.PayDId;
                             C.ConsumptionPatterns = "";
-                            C.ConsumptionDate = new DateTime();
+                            C.ConsumptionDate = "";
                             C.CTDId = 0;
                             C.BankNo = "";
                             C.CardholderName = "";
@@ -148,16 +148,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             C.Remark = "";
                             C.CreateUserId = grp_Decrease.CreateUserId;
                             C.MFOperator = "";
-                            C.MFOperatorDate = new DateTime();
+                            C.MFOperatorDate = "";
                             C.IsAuditDM = 0;
                             C.AuditDMOperate = 0;
-                            C.AuditDMDate = new DateTime();
+                            C.AuditDMDate = "";
                             C.IsAuditMF = 0;
                             C.AuditMFOperate = 0;
-                            C.AuditMFDate = new DateTime();
+                            C.AuditMFDate = "";
                             C.IsAuditGM = 0;
                             C.AuditGMOperate = 21;
-                            C.AuditGMDate = new DateTime();
+                            C.AuditGMDate = "";
                             C.IsPay = 0;
                             C.DIId = grp_Decrease.DiId;
                             C.CId = id;
@@ -166,7 +166,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             C.PayThenMoney = 0;
                             C.PayPercentageOld = 0;
                             C.PayThenMoneyOld = 0;
-                            C.UpdateDate = new DateTime();
+                            C.UpdateDate = "";
                             C.Payee = dto.Payee;
                             C.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
                             C.ExceedBudget = 0;
@@ -322,7 +322,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 };
                 result = new Result() { Code = 0, Msg = "查询成功!", Data = data };
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 result = new Result() { Code = -2, Msg = "程序错误" };
                 throw;

+ 6 - 6
OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -163,7 +163,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 Grp_CreditCardPayment C = new Grp_CreditCardPayment();
                                 C.PayDId = dto.PayDId;
                                 C.ConsumptionPatterns = "";
-                                C.ConsumptionDate = new DateTime();
+                                C.ConsumptionDate = "";
                                 C.CTDId = 0;
                                 C.BankNo = "";
                                 C.CardholderName = "";
@@ -181,16 +181,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 C.Remark = "";
                                 C.CreateUserId = dto.CreateUserId;
                                 C.MFOperator = "";
-                                C.MFOperatorDate = new DateTime();
+                                C.MFOperatorDate = "";
                                 C.IsAuditDM = 0;
                                 C.AuditDMOperate = 0;
-                                C.AuditDMDate = new DateTime();
+                                C.AuditDMDate = "";
                                 C.IsAuditMF = 0;
                                 C.AuditMFOperate = 0;
-                                C.AuditMFDate = new DateTime();
+                                C.AuditMFDate = "";
                                 C.IsAuditGM = 0;
                                 C.AuditGMOperate = 21;
-                                C.AuditGMDate = new DateTime();
+                                C.AuditGMDate = "";
                                 C.IsPay = 0;
                                 C.DIId = dto.DiId;
                                 C.CId = id;
@@ -199,7 +199,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 C.PayThenMoney = 0;
                                 C.PayPercentageOld = 0;
                                 C.PayThenMoneyOld = 0;
-                                C.UpdateDate = new DateTime();
+                                C.UpdateDate = "";
                                 C.Payee = dto.Payee;
                                 C.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
                                 C.ExceedBudget = 0;