1

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs

@@ -3,76 +3,73 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
-namespace Tnb.EquipMgr.Entities
-{
-    using global::Tnb.Common.Contracts;
 using JNPF.Common.Contracts;
 using JNPF.Common.Security;
 using SqlSugar;
 
-namespace Tnb.EquipMgr.Entities;
+namespace Tnb.EquipMgr.Entities
-
-/// <summary>
-/// 
-/// </summary>
-[SugarTable("tool_mold_maintain_plan")]
-public partial class ToolMoldMaintainPlan : BaseEntity<string>
 {
-    public ToolMoldMaintainPlan()
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarTable("tool_mold_maintain_plan")]
+    public partial class ToolMoldMaintainPlan : BaseEntity<string>
     {
-        id = SnowflakeIdHelper.NextId();
+        public ToolMoldMaintainPlan()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 计划单号
+        /// </summary>
+        public string? plan_code { get; set; }
+
+        /// <summary>
+        /// 保养方式
+        /// </summary>
+        public string? mode { get; set; }
+
+        /// <summary>
+        /// 计划状态
+        /// </summary>
+        public string? status { get; set; }
+
+        /// <summary>
+        /// 计划开始时间
+        /// </summary>
+        public DateTime? plan_start_date { get; set; }
+
+        /// <summary>
+        /// 计划完成时间
+        /// </summary>
+        public DateTime? plan_end_date { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? remark { get; set; }
+
+        /// <summary>
+        /// 制定人
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 制定时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
     }
-    /// <summary>
-    /// 计划单号
-    /// </summary>
-    public string? plan_code { get; set; }
-
-    /// <summary>
-    /// 保养方式
-    /// </summary>
-    public string? mode { get; set; }
-
-    /// <summary>
-    /// 计划状态
-    /// </summary>
-    public string? status { get; set; }
-
-    /// <summary>
-    /// 计划开始时间
-    /// </summary>
-    public DateTime? plan_start_date { get; set; }
-
-    /// <summary>
-    /// 计划完成时间
-    /// </summary>
-    public DateTime? plan_end_date { get; set; }
-
-    /// <summary>
-    /// 备注
-    /// </summary>
-    public string? remark { get; set; }
-
-    /// <summary>
-    /// 制定人
-    /// </summary>
-    public string? create_id { get; set; }
-
-    /// <summary>
-    /// 制定时间
-    /// </summary>
-    public DateTime? create_time { get; set; }
-
-    /// <summary>
-    /// 修改人
-    /// </summary>
-    public string? modify_id { get; set; }
-
-    /// <summary>
-    /// 修改时间
-    /// </summary>
-    public DateTime? modify_time { get; set; }
-
-}
 
 }

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlanRelation.cs

@@ -1,7 +1,7 @@
 using JNPF.Common.Contracts;
 using JNPF.Common.Security;
 using SqlSugar;
-using Tnb.Common.Contracts;
+
 
 namespace Tnb.EquipMgr.Entities;
 

EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs

@@ -10,9 +10,9 @@ using JNPF.FriendlyException;
 using SqlSugar;
 using Tnb.EquipMgr.Entities.Dto;
 using Tnb.EquipMgr.Entities;
-using Tnb.EquipMgr.Utils;
 using Mapster;
 using JNPF.Common.Contracts;
+using JNPF.Common.Extension;
 
 namespace Tnb.EquipMgr
 {

EquipMgr/Tnb.EquipMgr/Utils/PropertySet.cs

@@ -1,23 +0,0 @@
-using System.Linq.Expressions;
-
-namespace Tnb.EquipMgr.Utils
-{
-    //public class PropertySet<T>
-    //{
-    //    public static Dictionary<string, Action<object, object>> ValueFactories = new Dictionary<string, Action<object, object>>(StringComparer.OrdinalIgnoreCase);
-
-    //    public static Action<object, object> CreateSetPropertyValueAction(string propertyName)
-    //    {
-    //        var property = typeof(T).GetProperty(propertyName);
-    //        var target = Expression.Parameter(typeof(object));
-    //        var propertyValue = Expression.Parameter(typeof(object));
-    //        var castTarget = Expression.Convert(target, typeof(T));
-    //        var castPropertyValue = Expression.Convert(propertyValue, property!.PropertyType);
-    //        var setPropertyValue = Expression.Call(castTarget, property.GetSetMethod()!, castPropertyValue);
-    //        return Expression.Lambda<Action<object, object>>(setPropertyValue, target, propertyValue).Compile();
-    //    }
-
-    //}
-
-
-}

common/Tnb.Common/Extension/LambdaExpressionExtensions.cs

@@ -5,7 +5,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tnb.Common.Extension
+namespace JNPF.Common.Extension
 {
     public static class LambdaExpressionExtensions
     {