From b98c378ed550a9601f5be79d51f44f0fd7baaa85 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 12 Jan 2024 16:02:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs | 6 ------ Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs | 5 +++++ Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs | 8 +++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs index 0b518021..f5ccb93b 100644 --- a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs @@ -60,12 +60,6 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId [SugarColumn(ColumnDescription = "余额(餐补)")] public decimal BalanceOfSubsidies { get; set; } - - /// - /// 成本中心 - /// - public string CostId { get; set; } - /// /// 版本号 /// diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs index 1768d42e..961b187e 100644 --- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs @@ -143,6 +143,11 @@ public class GainfoEntity : SugarBaseEntity [SugarColumn(ColumnDescription = "人事范围")] public string Werks { get; set; } + /// + /// 成本中心 + /// + public string CostId { get; set; } + /// /// 在职状态 /// diff --git a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs index 32077607..a34328e8 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs @@ -76,7 +76,7 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId /// /// 所属成本日期 /// - [SugarColumn(ColumnDescription = "所属成本日期")] + [SugarColumn(ColumnDataType = "date", ColumnDescription = "所属成本日期")] public DateTime CostDate { get; set; } /// @@ -121,5 +121,11 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "数据状态")] public BalanceRecordStatusEnumType Status { get; set; } + /// + /// 消费时间 + /// + [SugarColumn(ColumnDescription = "消费时间")] + public DateTime CostDateTime { get; set; } + public string TenantId { get; set; } } \ No newline at end of file From 7e08811190fd06617d4717bfda101e37ca972e7a Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 12 Jan 2024 16:03:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/SqlSugarPack.cs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Src/Dlhis.Basic/SqlSugarPack.cs b/Src/Dlhis.Basic/SqlSugarPack.cs index 7d2d592e..19fdbfbe 100644 --- a/Src/Dlhis.Basic/SqlSugarPack.cs +++ b/Src/Dlhis.Basic/SqlSugarPack.cs @@ -18,21 +18,21 @@ public class SqlSugarPack : BaseAppPack public override void Configure(IApplicationBuilder app, IWebHostEnvironment env) { #if DEBUG - using var scope = app.ApplicationServices.CreateScope(); - var db = scope.ServiceProvider.GetService(); - var tables = App.ActiveTyps.Where(x => x.IsDefined(typeof(SugarTable), false)) - .Where(x => !x.IsDefined(typeof(SkipScanAttribute), false)) - .ToArray(); + //using var scope = app.ApplicationServices.CreateScope(); + //var db = scope.ServiceProvider.GetService(); + //var tables = App.ActiveTyps.Where(x => x.IsDefined(typeof(SugarTable), false)) + // .Where(x => !x.IsDefined(typeof(SkipScanAttribute), false)) + // .ToArray(); - db.DbMaintenance.CreateDatabase(); - db.CodeFirst.InitTables(tables); + //db.DbMaintenance.CreateDatabase(); + //db.CodeFirst.InitTables(tables); - using var scopeFace = app.ApplicationServices.CreateScope(); - var dbFace = scopeFace.ServiceProvider.GetService(); - var faceConnectionString = Configuration.GetSection("SqlSugarOptions:FaceConnectionString").Value; - dbFace.CurrentConnectionConfig.ConnectionString = faceConnectionString; - dbFace.DbMaintenance.CreateDatabase(); - dbFace.CodeFirst.InitTables(); + //using var scopeFace = app.ApplicationServices.CreateScope(); + //var dbFace = scopeFace.ServiceProvider.GetService(); + //var faceConnectionString = Configuration.GetSection("SqlSugarOptions:FaceConnectionString").Value; + //dbFace.CurrentConnectionConfig.ConnectionString = faceConnectionString; + //dbFace.DbMaintenance.CreateDatabase(); + //dbFace.CodeFirst.InitTables(); #endif }