feat 手动上传,手动设置时间范围

2024-12-19 15:21:45 +08:00
parent e8632b0d49
commit 0f69c56a93
39 changed files with 458 additions and 304 deletions
--- a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
@@ -15,16 +15,15 @@ public class BusinessPlaceManagerRelationshipEntity : SugarBaseEntity , ITenantI
    /// 管理人员
    /// </summary>
    [AdaptIgnore(MemberSide.Destination)]
-    [SugarColumn(ColumnDescription = "管理人员", IsNullable = false)]
+    [SugarColumn(IsNullable = false, ColumnDescription = "管理人员")]
    public int ManagerUserId { get; set; }

    /// <summary>
    /// 营业点
    /// </summary>
-    [SugarColumn(ColumnDescription = "营业点", IsNullable = false)]
+    [SugarColumn(IsNullable = false, ColumnDescription = "营业点")]
    public Guid BusinessPlaceCode { get; set; }

-    
    /// <inheritdoc />
    public string TenantId { get; set; }
-}
+}
--- a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
@@ -12,19 +12,19 @@ namespace Dlhis.Entity.Basic.Entity
        /// <summary>
        ///     部门号
        /// </summary>
-        [SugarColumn(ColumnDescription = "部门号", IsNullable = false, UniqueGroupNameList = new[] { "idx_Department_No" })]
+        [SugarColumn(IsNullable = false, ColumnDescription = "部门号", UniqueGroupNameList = new[] { "idx_Department_No" })]
        public string No { get; set; }

        /// <summary>
        ///     上级部门号
        /// </summary>
-        [SugarColumn(ColumnDescription = "上级部门号")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "上级部门号")]
        public string PNo { get; set; }

        /// <summary>
        ///     部门名称
        /// </summary>
-        [SugarColumn(ColumnDescription = "部门名称", IsNullable = false)]
+        [SugarColumn(IsNullable = false, ColumnDescription = "部门名称")]
        public string Name { get; set; }
    }
 }
--- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
@@ -6,102 +6,101 @@ using Mapster;
 using SqlSugar;
 using SqlSugar.DbConvert;

-namespace Dlhis.Entity.Basic.Entity
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+///     设备
+/// </summary>
+[SugarTable(TableName = "Device", TableDescription = "设备表")]
+public class DeviceEntity : SugarBaseEntity, ITenantId
 {
    /// <summary>
-    ///     设备
+    ///     设备code
    /// </summary>
-    [SugarTable(TableName = "Device", TableDescription = "设备表")]
-    public class DeviceEntity : SugarBaseEntity, ITenantId
-    {
-        /// <summary>
-        ///     设备code
-        /// </summary>
-        [DeviceCode]
-        [SugarColumn(ColumnDescription = "设备code")]
-        public Guid Code { get; set; }
+    [DeviceCode]
+    [SugarColumn(IsNullable = false, ColumnDescription = "设备code")]
+    public Guid Code { get; set; }

-        /// <summary>
-        ///     设备唯一码,IP/MAC/SNO
-        /// </summary>
-        [AdaptIgnore(MemberSide.Destination)]
-        [SugarColumn(ColumnDescription = "设备唯一码", IsNullable = false, UniqueGroupNameList = new[] { "Idx_Device_UniqueNo" })]
-        public string UniqueNo { get; set; }
+    /// <summary>
+    ///     设备唯一码,IP/MAC/SNO
+    /// </summary>
+    [AdaptIgnore(MemberSide.Destination)]
+    [SugarColumn(IsNullable = false, ColumnDescription = "设备唯一码", UniqueGroupNameList = new[] { "Idx_Device_UniqueNo" })]
+    public string UniqueNo { get; set; }

-        /// <summary>
-        ///     心跳间隔
-        /// </summary>
-        [SugarColumn(ColumnDescription = "心跳检查间隔")]
-        public int HeartbeatInterval { get; set; }
+    /// <summary>
+    ///     心跳间隔
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "心跳检查间隔")]
+    public int HeartbeatInterval { get; set; } = 30;

-        /// <summary>
-        ///     供应商
-        /// </summary>
-        [SugarColumn(ColumnDescription = "供应商")]
-        public string Supplier { get; set; }
+    /// <summary>
+    ///     供应商
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnDescription = "供应商")]
+    public string Supplier { get; set; }

-        /// <summary>
-        ///     设备功能
-        /// </summary>
-        [SugarColumn(ColumnDataType = "varchar(150)", IsJson = true, ColumnDescription = "设备功能", DefaultValue = "[]")]
-        public List<DeviceFuncEnumType> Funcs { get; set; }
+    /// <summary>
+    ///     设备功能
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDataType = "varchar(150)", IsJson = true, ColumnDescription = "设备功能", DefaultValue = "[]")]
+    public List<DeviceFuncEnumType> Funcs { get; set; }

-        /// <summary>
-        ///     设备类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "设备类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
-        public DeviceTypeEnumType Type { get; set; }
+    /// <summary>
+    ///     设备类型
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "设备类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public DeviceTypeEnumType Type { get; set; }

-        /// <summary>
-        ///     部署点
-        /// </summary>
-        [SugarColumn(ColumnDescription = "部署点")]
-        public string DeployPlace { get; set; }
+    /// <summary>
+    ///     部署点
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnDescription = "部署点")]
+    public string DeployPlace { get; set; }

-        /// <summary>
-        ///     部署坐标
-        /// </summary>
-        [SugarColumn(ColumnDescription = "部署坐标")]
-        public string DeployPosition { get; set; }
+    /// <summary>
+    ///     部署坐标
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnDescription = "部署坐标")]
+    public string DeployPosition { get; set; }

-        /// <summary>
-        ///     部署方向
-        /// </summary>
-        [SugarColumn(ColumnDescription = "部署方向", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
-        public DeviceDeployDirectionEnumType? DeployDirection { get; set; }
+    /// <summary>
+    ///     部署方向
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnDescription = "部署方向", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public DeviceDeployDirectionEnumType? DeployDirection { get; set; }

-        /// <summary>
-        ///     模板code
-        /// </summary>
-        [SugarColumn(ColumnDescription = "模板code")]
-        public Guid? TemplateCode { get; set; }
+    /// <summary>
+    ///     模板code
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "模板code")]
+    public Guid TemplateCode { get; set; }

-        /// <summary>
-        ///     连接信息
-        /// </summary>
-        [SugarColumn(ColumnDescription = "连接信息")]
-        public string ConnectionInfo { get; set; }
+    /// <summary>
+    ///     连接信息
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "连接信息")]
+    public string ConnectionInfo { get; set; }

-        /// <summary>
-        ///     是否启用
-        /// </summary>
-        [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")]
-        public bool Enable { get; set; }
+    /// <summary>
+    ///     是否启用
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDataType = "bit", ColumnDescription = "是否启用")]
+    public bool Enable { get; set; }


-        /// <summary>
-        ///     是否作为考勤设备
-        /// </summary>
-        [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否作为考勤设备")]
-        public bool AsAttendance { get; set; }
+    /// <summary>
+    ///     是否作为考勤设备
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDataType = "bit", ColumnDescription = "是否作为考勤设备")]
+    public bool AsAttendance { get; set; }


-        /// <summary>
-        /// 是否启用时段码
-        /// </summary>
-        [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用时段码", DefaultValue = "0")]
-        public bool EnableTimePeriod { get; set; } = false;
+    /// <summary>
+    /// 是否启用时段码
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDataType = "bit", ColumnDescription = "是否启用时段码", DefaultValue = "0")]
+    public bool EnableTimePeriod { get; set; } = false;

-        public string TenantId { get; set; }
-    }
+    public string TenantId { get; set; }
 }
--- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
@@ -29,146 +29,146 @@ public class GainfoEntity : SugarBaseEntity
    /// 人员类型
    /// </summary>
    [AdaptIgnore(MemberSide.Destination)]
-    [SugarColumn(ColumnDescription = "人员类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    [SugarColumn(IsNullable = false, ColumnDescription = "人员类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
    public GainfoUserTypeEnumType Type { get; set; }

    /// <summary>
    /// 人员来源
    /// </summary>
-    [SugarColumn(ColumnDescription = "人员来源", IsNullable = true)]
+    [SugarColumn(IsNullable = true, ColumnDescription = "人员来源")]
    public string Source { get; set; }

    /// <summary>
    /// 姓名
    /// </summary>
-    [SugarColumn(ColumnDescription = "姓名")]
+    [SugarColumn(IsNullable = false, ColumnDescription = "姓名")]
    public string Name { get; set; }

    /// <summary>
    /// 学工号
    /// </summary>
-    [SugarColumn(ColumnDescription = "学工号", UniqueGroupNameList = new[] { "idx_Gainfo_Code" })]
+    [SugarColumn(IsNullable = false, ColumnDescription = "学工号", UniqueGroupNameList = new[] { "idx_Gainfo_Code" })]
    public string Code { get; set; }

    /// <summary>
    /// 国家代码
    /// </summary>
-    [SugarColumn(ColumnDescription = "国家代码")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "国家代码")]
    public string CountryNo { get; set; }

    /// <summary>
    /// 证件类型代码
    /// </summary>
-    [SugarColumn(ColumnDescription = "证件类型代码")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "证件类型代码")]
    public string IdClass { get; set; }

    /// <summary>
    /// 身份证号
    /// </summary>
-    [SugarColumn(ColumnDescription = "身份证号", UniqueGroupNameList = new[] { "idx_Gainfo_IdNo" })]
+    [SugarColumn(IsNullable = true, ColumnDescription = "身份证号", UniqueGroupNameList = new[] { "idx_Gainfo_IdNo" })]
    public string IdNo { get; set; }

    /// <summary>
    /// 身份证籍贯区域代码
    /// </summary>
-    [SugarColumn(ColumnDescription = "身份证籍贯区域代码")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "身份证籍贯区域代码")]
    public string Native { get; set; }

    /// <summary>
    /// 性别
    /// </summary>
-    [SugarColumn(ColumnDescription = "性别", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    [SugarColumn(IsNullable = false, ColumnDescription = "性别", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
    public GenderEnumType Gender { get; set; }

    /// <summary>
    /// 生日
    /// </summary>
-    [SugarColumn(ColumnDescription = "生日")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "生日")]
    public DateTime Birthday { get; set; }

    /// <summary>
    /// 身份证地址
    /// </summary>
-    [SugarColumn(ColumnDescription = "身份证地址")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "身份证地址")]
    public string Address { get; set; }

    /// <summary>
    /// 部门编码
    /// </summary>
-    [SugarColumn(ColumnDescription = "部门编码")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "部门编码")]
    public string DepartmentNo { get; set; }

    /// <summary>
    ///     民族代码
    /// </summary>
-    [SugarColumn(ColumnDescription = "民族代码")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "民族代码")]
    public string Nation { get; set; }

    /// <summary>
    ///     手机号码
    /// </summary>
-    [SugarColumn(ColumnDescription = "手机号码")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "手机号码")]
    public string Phone { get; set; }

    /// <summary>
    ///     学历
    /// </summary>
-    [SugarColumn(ColumnDescription = "学历")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "学历")]
    public string Degree { get; set; }

    /// <summary>
    ///     岗位
    /// </summary>
-    [SugarColumn(ColumnDescription = "岗位")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "岗位")]
    public string PositionNo { get; set; }

    /// <summary>
    ///     职等
    /// </summary>
-    [SugarColumn(ColumnDescription = "职等")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "职等")]
    public string Grade { get; set; }

    /// <summary>
    ///     职级
    /// </summary>
-    [SugarColumn(ColumnDescription = "职级")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "职级")]
    public string Title { get; set; }

    /// <summary>
    ///     卡号
    /// </summary>
-    [SugarColumn(ColumnDescription = "卡号", IndexGroupNameList = new[] { "idx_Gainfo_CardNo" })]
+    [SugarColumn(IsNullable = true, ColumnDescription = "卡号", IndexGroupNameList = new[] { "idx_Gainfo_CardNo" })]
    public string CardNo { get; set; }

    /// <summary>
    ///     备注
    /// </summary>
-    [SugarColumn(ColumnDescription = "备注")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
    public string Remark { get; set; }

    /// <summary>
    ///     人事范围
    /// </summary>
-    [SugarColumn(ColumnDescription = "人事范围")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "人事范围")]
    public string Werks { get; set; }

    /// <summary>
    ///     工作地
    /// </summary>
-    [SugarColumn(ColumnDescription = "工作地")]
+    [SugarColumn(IsNullable = false, ColumnDescription = "工作地")]
    public string Workplace { get; set; }

    /// <summary>
    ///     厂区
    /// </summary>
    [TenantId]
-    [SugarColumn(ColumnDescription = "厂区")]
+    [SugarColumn(IsNullable = false, ColumnDescription = "厂区")]
    public string Factory { get; set; }

    /// <summary>
    ///     成本中心
    /// </summary>
-    [SugarColumn(ColumnDescription = "成本中心")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "成本中心")]
    public string CostId { get; set; }

    /// <summary>
@@ -186,13 +186,13 @@ public class GainfoEntity : SugarBaseEntity
    /// <summary>
    ///     身份认证用户Id(如果为空匹配code)
    /// </summary>
-    [SugarColumn(ColumnDescription = "身份认证用户Id", IsNullable = true)]
+    [SugarColumn(IsNullable = true, ColumnDescription = "身份认证用户Id")]
    public int IdentityUserId { get; set; }

    /// <summary>
    /// 卡类型
    /// </summary>
-    [SugarColumn(ColumnDescription = "卡类型", IsNullable = true)]
+    [SugarColumn(IsNullable = true, ColumnDescription = "卡类型")]
    public int? CardType { get; set; }
 }

--- a/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
@@ -2,50 +2,50 @@
 using Kurisu.AspNetCore.DataAccess.SqlSugar;
 using SqlSugar;

-namespace Dlhis.Entity.Basic.Entity
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+///     档案组
+/// </summary>
+[SugarTable(TableName = "GainfoGroup", TableDescription = "档案组")]
+public class GainfoGroupEntity : SugarBaseEntity, ITenantId
 {
    /// <summary>
-    ///     档案组
+    ///     父级Code
    /// </summary>
-    [SugarTable(TableName = "GainfoGroup", TableDescription = "档案组")]
-    public class GainfoGroupEntity : SugarBaseEntity, ITenantId
-    {
-        /// <summary>
-        ///     父级Code
-        /// </summary>
-        public Guid? PCode { get; set; }
+    [SugarColumn(IsNullable = true)]
+    public Guid? PCode { get; set; }

-        /// <summary>
-        ///     分组code
-        /// </summary>
-        [SugarColumn(ColumnDescription = "分组code")]
-        public Guid Code { get; set; }
+    /// <summary>
+    ///     分组code
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "分组code")]
+    public Guid Code { get; set; }

-        /// <summary>
-        ///     名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称")]
-        public string Name { get; set; }
+    /// <summary>
+    /// 名称
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "名称")]
+    public string Name { get; set; }

-        /// <summary>
-        ///     备注
-        /// </summary>
-        [SugarColumn(ColumnDescription = "备注")]
-        public string Remark { get; set; }
+    /// <summary>
+    ///     备注
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
+    public string Remark { get; set; }

-        /// <summary>
-        ///     是否默认分组
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否默认分组", ColumnDataType = "bit", DefaultValue = "1")]
-        public bool IsDefault { get; set; } = true;
+    /// <summary>
+    ///     是否默认分组
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "是否默认分组", ColumnDataType = "bit", DefaultValue = "1")]
+    public bool IsDefault { get; set; } = true;

-        /// <summary>
-        ///     是否可编辑
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否可编辑", ColumnDataType = "bit", DefaultValue = "1")]
-        public bool Editable { get; set; } = true;
+    /// <summary>
+    ///     是否可编辑
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "是否可编辑", ColumnDataType = "bit", DefaultValue = "1")]
+    public bool Editable { get; set; } = true;

-
-        public string TenantId { get; set; }
-    }
+    [SugarColumn(IsNullable = true)]
+    public string TenantId { get; set; }
 }
--- a/Src/Dlhis.Entity/Basic/Entity/GainfoSapEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoSapEntity.cs
@@ -1,7 +1,9 @@
-using SqlSugar;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;

 namespace Dlhis.Entity.Basic.Entity
 {
+    [SkipScan]
    [SugarTable(TableName = "GainfoSap")]
    public class GainfoSapEntity
    {
@@ -11,6 +13,7 @@ namespace Dlhis.Entity.Basic.Entity
        public string @class { get; set; }

        public string passwd { get; set; }
+        
        public string question { get; set; }

        public string answer { get; set; }
@@ -25,6 +28,7 @@ namespace Dlhis.Entity.Basic.Entity
        public string sex { get; set; }
        public DateTime birthday { get; set; }
        public string address { get; set; }
+        
        public string postcode { get; set; }
        public string occupation { get; set; }
        public string appellation { get; set; }
@@ -33,16 +37,24 @@ namespace Dlhis.Entity.Basic.Entity
        public string fax { get; set; }
        public string mobile { get; set; }
        public string email { get; set; }
+        
        public string web { get; set; }
+        
        public string vip { get; set; }
+        
        public string sec { get; set; }
+        
        public string cropsno { get; set; }
+        
        public string cropname { get; set; }
+        
        public string fancy { get; set; }
        public string remark { get; set; }

        public int amount { get; set; }
+        
        public int days { get; set; }
+        
        public decimal consume01 { get; set; }

        public decimal consume02 { get; set; }
@@ -90,12 +102,17 @@ namespace Dlhis.Entity.Basic.Entity
        public string MASSN { get; set; }

        public string MNTXT { get; set; }
+        
        public string MASSG { get; set; }
+        
        public string MGTXT { get; set; }
        public DateTime? logdate { get; set; }
+        
        public DateTime? updatelogdate { get; set; }
+        
        public string guestno { get; set; }
        public string ZZ_KLX { get; set; }
+        
        public DateTime? DAT01 { get; set; }

        public string ZZ_COUNNM { get; set; }
--- a/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs
@@ -17,7 +17,7 @@ public class WerkEntity : SugarBaseEntity
    /// <summary>
    /// 名称
    /// </summary>
-    [SugarColumn(IsNullable = false, ColumnDescription = "名称")]
+    [SugarColumn(ColumnDescription = "名称")]
    public string Name { get; set; }

    /// <summary>
@@ -53,12 +53,12 @@ public class WerkEntity : SugarBaseEntity
    /// <summary>
    /// 结果
    /// </summary>
-    [SugarColumn(IsNullable = false, ColumnDescription = "结果")]
+    [SugarColumn(IsNullable = true, ColumnDescription = "结果")]
    public string HandleMessage { get; set; }

    /// <summary>
    /// 是否启用
    /// </summary>
-    [SugarColumn(ColumnDataType = "bit", DefaultValue = "1")]
+    [SugarColumn(IsNullable = false, ColumnDataType = "bit", DefaultValue = "1")]
    public bool Enable { get; set; }
-}
+}