From 6fe443c4d26f0ec5cbcc2864a0dd9ab781c59761 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 14:30:39 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Code/Templete/Application/MapperProfiles/AutoMapperProfile模板.txt                       |    5 
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs            |  260 ++++++++++++++++++++++---------------------
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs |   38 +++--
 Weben_CMS专用代码生成器/Code/Templete/AppService/AppService模板.txt                                              |    3 
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs |    7 +
 Weben_CMS专用代码生成器/Code/Generate/AppService/AppService_Generate.cs                                        |   12 +
 6 files changed, 176 insertions(+), 149 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
index 934ce7c..00a7296 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
@@ -145,44 +145,48 @@
         updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
         input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
 
-        updateObj.Son_TaskCode = input.Son_TaskCode;
-        updateObj.TaskCode = input.TaskCode;
-        updateObj.WorkPlanStatus = input.WorkPlanStatus;
-        updateObj.CallMaterialStatus = input.CallMaterialStatus;
-        updateObj.DataIdentifier = input.DataIdentifier;
-        updateObj.MaterialMode = input.MaterialMode;
-        updateObj.Length = input.Length;
-        updateObj.MarkingContent = input.MarkingContent;
-        updateObj.MarkingPosition = input.MarkingPosition;
-        updateObj.CuttingPosition = input.CuttingPosition;
-        updateObj.Quantity = input.Quantity;
-        updateObj.FlangeThickness = input.FlangeThickness;
-        updateObj.FlangeInnerDiameter = input.FlangeInnerDiameter;
-        updateObj.WeldingHeatInput = input.WeldingHeatInput;
-        updateObj.PipeAllowableStress = input.PipeAllowableStress;
-        updateObj.PipeDiameter = input.PipeDiameter;
-        updateObj.PipeWallThickness = input.PipeWallThickness;
-        updateObj.FactoryCode = input.FactoryCode;
-        updateObj.ProductCode = input.ProductCode;
-        updateObj.WorkstationCode = input.WorkstationCode;
-        updateObj.EquipmentCode = input.EquipmentCode;
-        updateObj.ProdLineCode = input.ProdLineCode;
-        updateObj.ShipNumber = input.ShipNumber;
-        updateObj.ProjectNumber = input.ProjectNumber;
-        updateObj.ProcessName = input.ProcessName;
-        updateObj.PipeFittingCode = input.PipeFittingCode;
-        updateObj.PreSerialNumber = input.PreSerialNumber;
-        updateObj.PipeSpecCode = input.PipeSpecCode;
-        updateObj.PipeSectionName = input.PipeSectionName;
-        updateObj.OuterDiameter = input.OuterDiameter;
-        updateObj.Thickness = input.Thickness;
-        updateObj.Material = input.Material;
-        updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
-        updateObj.PlannedStartTime = input.PlannedStartTime;
-        updateObj.PlannedEndTime = input.PlannedEndTime;
-        updateObj.TeamInfo = input.TeamInfo;
-        updateObj.Timestamp = input.Timestamp;
-        updateObj.Remark = input.Remark;
+
+        // 鎵归噺璧嬪�兼墍鏈夊彲鏄犲皠瀛楁锛堥�氳繃鍖垮悕瀵硅薄锛�
+        updateObj = ObjectMapper.Map(input, updateObj); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+        //updateObj.Id = id;
+        //updateObj.Son_TaskCode = input.Son_TaskCode;
+        //updateObj.TaskCode = input.TaskCode;
+        //updateObj.WorkPlanStatus = input.WorkPlanStatus;
+        //updateObj.CallMaterialStatus = input.CallMaterialStatus;
+        //updateObj.DataIdentifier = input.DataIdentifier;
+        //updateObj.MaterialMode = input.MaterialMode;
+        //updateObj.Length = input.Length;
+        //updateObj.MarkingContent = input.MarkingContent;
+        //updateObj.MarkingPosition = input.MarkingPosition;
+        //updateObj.CuttingPosition = input.CuttingPosition;
+        //updateObj.Quantity = input.Quantity;
+        //updateObj.FlangeThickness = input.FlangeThickness;
+        //updateObj.FlangeInnerDiameter = input.FlangeInnerDiameter;
+        //updateObj.WeldingHeatInput = input.WeldingHeatInput;
+        //updateObj.PipeAllowableStress = input.PipeAllowableStress;
+        //updateObj.PipeDiameter = input.PipeDiameter;
+        //updateObj.PipeWallThickness = input.PipeWallThickness;
+        //updateObj.FactoryCode = input.FactoryCode;
+        //updateObj.ProductCode = input.ProductCode;
+        //updateObj.WorkstationCode = input.WorkstationCode;
+        //updateObj.EquipmentCode = input.EquipmentCode;
+        //updateObj.ProdLineCode = input.ProdLineCode;
+        //updateObj.ShipNumber = input.ShipNumber;
+        //updateObj.ProjectNumber = input.ProjectNumber;
+        //updateObj.ProcessName = input.ProcessName;
+        //updateObj.PipeFittingCode = input.PipeFittingCode;
+        //updateObj.PreSerialNumber = input.PreSerialNumber;
+        //updateObj.PipeSpecCode = input.PipeSpecCode;
+        //updateObj.PipeSectionName = input.PipeSectionName;
+        //updateObj.OuterDiameter = input.OuterDiameter;
+        //updateObj.Thickness = input.Thickness;
+        //updateObj.Material = input.Material;
+        //updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
+        //updateObj.PlannedStartTime = input.PlannedStartTime;
+        //updateObj.PlannedEndTime = input.PlannedEndTime;
+        //updateObj.TeamInfo = input.TeamInfo;
+        //updateObj.Timestamp = input.Timestamp;
+        //updateObj.Remark = input.Remark;
 
 
         updateObj.LastModifierName = input.LastModifierName;//淇敼浜� 
@@ -326,7 +330,7 @@
         Check.NotNull(input, nameof(input));
 
         var workTaskCreateDtos = new List<(int RowIndex, WorkTaskCreateDto Item)>();
-        var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTaskUpdateDto Item)>();
+        var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTask Item)>();
         var importItems = input.WorkTasks;
 
         if (importItems != null && importItems.Any())
@@ -360,95 +364,99 @@
                 var oldWorkTask = await _workTaskRepository.FindByNameAsync(impItem.Son_TaskCode);
                 if (oldWorkTask != null)
                 {
-                    var workTaskUpdateDto = new WorkTaskUpdateDto
-                    {
-                        Son_TaskCode = impItem.Son_TaskCode,
-                        TaskCode = impItem.TaskCode,
-                        WorkPlanStatus = impItem.WorkPlanStatus,
-                        CallMaterialStatus = impItem.CallMaterialStatus,
-                        DataIdentifier = impItem.DataIdentifier,
-                        MaterialMode = impItem.MaterialMode,
-                        Length = impItem.Length,
-                        MarkingContent = impItem.MarkingContent,
-                        MarkingPosition = impItem.MarkingPosition,
-                        CuttingPosition = impItem.CuttingPosition,
-                        Quantity = impItem.Quantity,
-                        FlangeThickness = impItem.FlangeThickness,
-                        FlangeInnerDiameter = impItem.FlangeInnerDiameter,
-                        WeldingHeatInput = impItem.WeldingHeatInput,
-                        PipeAllowableStress = impItem.PipeAllowableStress,
-                        PipeDiameter = impItem.PipeDiameter,
-                        PipeWallThickness = impItem.PipeWallThickness,
-                        FactoryCode = impItem.FactoryCode,
-                        ProductCode = impItem.ProductCode,
-                        WorkstationCode = impItem.WorkstationCode,
-                        EquipmentCode = impItem.EquipmentCode,
-                        ProdLineCode = impItem.ProdLineCode,
-                        ShipNumber = impItem.ShipNumber,
-                        ProjectNumber = impItem.ProjectNumber,
-                        ProcessName = impItem.ProcessName,
-                        PipeFittingCode = impItem.PipeFittingCode,
-                        PreSerialNumber = impItem.PreSerialNumber,
-                        PipeSpecCode = impItem.PipeSpecCode,
-                        PipeSectionName = impItem.PipeSectionName,
-                        OuterDiameter = impItem.OuterDiameter,
-                        Thickness = impItem.Thickness,
-                        Material = impItem.Material,
-                        ProcessRouteNumber = impItem.ProcessRouteNumber,
-                        PlannedStartTime = impItem.PlannedStartTime,
-                        PlannedEndTime = impItem.PlannedEndTime,
-                        TeamInfo = impItem.TeamInfo,
-                        Timestamp = impItem.Timestamp,
-                        Remark = impItem.Remark,
+                    //var workTaskUpdateDto = new WorkTaskUpdateDto { };
+                    oldWorkTask = ObjectMapper.Map(impItem, oldWorkTask); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+                    //var workTaskUpdateDto = new WorkTaskUpdateDto
+                    //{
+                    //    Son_TaskCode = impItem.Son_TaskCode,
+                    //    TaskCode = impItem.TaskCode,
+                    //    WorkPlanStatus = impItem.WorkPlanStatus,
+                    //    CallMaterialStatus = impItem.CallMaterialStatus,
+                    //    DataIdentifier = impItem.DataIdentifier,
+                    //    MaterialMode = impItem.MaterialMode,
+                    //    Length = impItem.Length,
+                    //    MarkingContent = impItem.MarkingContent,
+                    //    MarkingPosition = impItem.MarkingPosition,
+                    //    CuttingPosition = impItem.CuttingPosition,
+                    //    Quantity = impItem.Quantity,
+                    //    FlangeThickness = impItem.FlangeThickness,
+                    //    FlangeInnerDiameter = impItem.FlangeInnerDiameter,
+                    //    WeldingHeatInput = impItem.WeldingHeatInput,
+                    //    PipeAllowableStress = impItem.PipeAllowableStress,
+                    //    PipeDiameter = impItem.PipeDiameter,
+                    //    PipeWallThickness = impItem.PipeWallThickness,
+                    //    FactoryCode = impItem.FactoryCode,
+                    //    ProductCode = impItem.ProductCode,
+                    //    WorkstationCode = impItem.WorkstationCode,
+                    //    EquipmentCode = impItem.EquipmentCode,
+                    //    ProdLineCode = impItem.ProdLineCode,
+                    //    ShipNumber = impItem.ShipNumber,
+                    //    ProjectNumber = impItem.ProjectNumber,
+                    //    ProcessName = impItem.ProcessName,
+                    //    PipeFittingCode = impItem.PipeFittingCode,
+                    //    PreSerialNumber = impItem.PreSerialNumber,
+                    //    PipeSpecCode = impItem.PipeSpecCode,
+                    //    PipeSectionName = impItem.PipeSectionName,
+                    //    OuterDiameter = impItem.OuterDiameter,
+                    //    Thickness = impItem.Thickness,
+                    //    Material = impItem.Material,
+                    //    ProcessRouteNumber = impItem.ProcessRouteNumber,
+                    //    PlannedStartTime = impItem.PlannedStartTime,
+                    //    PlannedEndTime = impItem.PlannedEndTime,
+                    //    TeamInfo = impItem.TeamInfo,
+                    //    Timestamp = impItem.Timestamp,
+                    //    Remark = impItem.Remark,
 
-                    };
+                    //};
 
-                    workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, workTaskUpdateDto));
+                    workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, oldWorkTask));
                 }
                 else
                 {
-                    var workTaskCreateDto = new WorkTaskCreateDto
-                    {
-                        Son_TaskCode = impItem.Son_TaskCode,
-                        TaskCode = impItem.TaskCode,
-                        WorkPlanStatus = impItem.WorkPlanStatus,
-                        CallMaterialStatus = impItem.CallMaterialStatus,
-                        DataIdentifier = impItem.DataIdentifier,
-                        MaterialMode = impItem.MaterialMode,
-                        Length = impItem.Length,
-                        MarkingContent = impItem.MarkingContent,
-                        MarkingPosition = impItem.MarkingPosition,
-                        CuttingPosition = impItem.CuttingPosition,
-                        Quantity = impItem.Quantity,
-                        FlangeThickness = impItem.FlangeThickness,
-                        FlangeInnerDiameter = impItem.FlangeInnerDiameter,
-                        WeldingHeatInput = impItem.WeldingHeatInput,
-                        PipeAllowableStress = impItem.PipeAllowableStress,
-                        PipeDiameter = impItem.PipeDiameter,
-                        PipeWallThickness = impItem.PipeWallThickness,
-                        FactoryCode = impItem.FactoryCode,
-                        ProductCode = impItem.ProductCode,
-                        WorkstationCode = impItem.WorkstationCode,
-                        EquipmentCode = impItem.EquipmentCode,
-                        ProdLineCode = impItem.ProdLineCode,
-                        ShipNumber = impItem.ShipNumber,
-                        ProjectNumber = impItem.ProjectNumber,
-                        ProcessName = impItem.ProcessName,
-                        PipeFittingCode = impItem.PipeFittingCode,
-                        PreSerialNumber = impItem.PreSerialNumber,
-                        PipeSpecCode = impItem.PipeSpecCode,
-                        PipeSectionName = impItem.PipeSectionName,
-                        OuterDiameter = impItem.OuterDiameter,
-                        Thickness = impItem.Thickness,
-                        Material = impItem.Material,
-                        ProcessRouteNumber = impItem.ProcessRouteNumber,
-                        PlannedStartTime = impItem.PlannedStartTime,
-                        PlannedEndTime = impItem.PlannedEndTime,
-                        TeamInfo = impItem.TeamInfo,
-                        Timestamp = impItem.Timestamp,
-                        Remark = impItem.Remark,
+                    var workTaskCreateDto = new WorkTaskCreateDto { };
+                    workTaskCreateDto = ObjectMapper.Map(impItem, workTaskCreateDto); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+                    //var workTaskCreateDto = new WorkTaskCreateDto
+                    //{
+                    //    Son_TaskCode = impItem.Son_TaskCode,
+                    //    TaskCode = impItem.TaskCode,
+                    //    WorkPlanStatus = impItem.WorkPlanStatus,
+                    //    CallMaterialStatus = impItem.CallMaterialStatus,
+                    //    DataIdentifier = impItem.DataIdentifier,
+                    //    MaterialMode = impItem.MaterialMode,
+                    //    Length = impItem.Length,
+                    //    MarkingContent = impItem.MarkingContent,
+                    //    MarkingPosition = impItem.MarkingPosition,
+                    //    CuttingPosition = impItem.CuttingPosition,
+                    //    Quantity = impItem.Quantity,
+                    //    FlangeThickness = impItem.FlangeThickness,
+                    //    FlangeInnerDiameter = impItem.FlangeInnerDiameter,
+                    //    WeldingHeatInput = impItem.WeldingHeatInput,
+                    //    PipeAllowableStress = impItem.PipeAllowableStress,
+                    //    PipeDiameter = impItem.PipeDiameter,
+                    //    PipeWallThickness = impItem.PipeWallThickness,
+                    //    FactoryCode = impItem.FactoryCode,
+                    //    ProductCode = impItem.ProductCode,
+                    //    WorkstationCode = impItem.WorkstationCode,
+                    //    EquipmentCode = impItem.EquipmentCode,
+                    //    ProdLineCode = impItem.ProdLineCode,
+                    //    ShipNumber = impItem.ShipNumber,
+                    //    ProjectNumber = impItem.ProjectNumber,
+                    //    ProcessName = impItem.ProcessName,
+                    //    PipeFittingCode = impItem.PipeFittingCode,
+                    //    PreSerialNumber = impItem.PreSerialNumber,
+                    //    PipeSpecCode = impItem.PipeSpecCode,
+                    //    PipeSectionName = impItem.PipeSectionName,
+                    //    OuterDiameter = impItem.OuterDiameter,
+                    //    Thickness = impItem.Thickness,
+                    //    Material = impItem.Material,
+                    //    ProcessRouteNumber = impItem.ProcessRouteNumber,
+                    //    PlannedStartTime = impItem.PlannedStartTime,
+                    //    PlannedEndTime = impItem.PlannedEndTime,
+                    //    TeamInfo = impItem.TeamInfo,
+                    //    Timestamp = impItem.Timestamp,
+                    //    Remark = impItem.Remark,
 
-                    };
+                    //};
 
                     workTaskCreateDtos.Add((impItem.RowIndex, workTaskCreateDto));
                 }
@@ -471,16 +479,16 @@
         }
 
         // 鏇存柊 
-        foreach (var workTaskDto in workTaskUpdateDtos)
+        foreach (var oldWorkObj in workTaskUpdateDtos)
         {
             try
             {
-                workTaskDto.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜� 
-                await UpdateAsync(workTaskDto.Id, workTaskDto.Item);
+                oldWorkObj.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜� 
+                await _workTaskRepository.UpdateAsync(oldWorkObj.Item);
             }
             catch (Exception e)
             {
-                var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workTaskDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+                var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊oldWorkObj.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
                 throw new UserFriendlyException(errorMsg);
             }
         }
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
index 1d1cea0..e097131 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs
@@ -1,26 +1,30 @@
-using AutoMapper; 
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan; 
-using CMS.Plugin.PipeLineLems.Domain.WorkPlan; 
-using Volo.Abp.ObjectExtending; 
- 
-namespace CMS.Plugin.PipeLineLems.Application.MapperProfiles; 
- 
+using AutoMapper;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using Volo.Abp.ObjectExtending;
+using static CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan.WorkPlansImportModel;
+
+namespace CMS.Plugin.PipeLineLems.Application.MapperProfiles;
+
 /// <summary> 
 /// 浣滀笟璁″垝琛ˋutoMapper閰嶇疆 
 /// </summary> 
 /// <seealso cref="AutoMapper.Profile" /> 
-public class WorkPlanAutoMapperProfile : Profile 
-{ 
+public class WorkPlanAutoMapperProfile : Profile
+{
     /// <summary> 
     /// Initializes a new instance of the <see cref="WorkPlanAutoMapperProfile"/> class. 
     /// </summary> 
-    public WorkPlanAutoMapperProfile() 
-    { 
+    public WorkPlanAutoMapperProfile()
+    {
         /* You can configure your AutoMapper mapping configuration here. 
          * Alternatively, you can split your mapping configurations 
-         * into multiple profile classes for a better organization. */ 
-        CreateMap<WorkPlan, WorkPlanDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
-        CreateMap<WorkPlanCreateDto, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
-        CreateMap<GetWorkPlanInput, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
-    } 
-} 
+         * into multiple profile classes for a better organization. */
+        CreateMap<WorkPlan, WorkPlanDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+        CreateMap<WorkPlanCreateDto, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+        CreateMap<GetWorkPlanInput, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+
+        CreateMap<WorkPlanImportModel, WorkPlanCreateDto>(MemberList.None);
+        CreateMap<WorkPlanImportModel, WorkPlanUpdateDto>(MemberList.None);
+    }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
index 5fd3bb2..b288f19 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs
@@ -3,6 +3,7 @@
 using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
 using CMS.Plugin.PipeLineLems.Domain.WorkTask;
 using Volo.Abp.ObjectExtending;
+using static CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask.WorkTasksImportModel;
 
 namespace CMS.Plugin.PipeLineLems.Application.MapperProfiles;
 
@@ -25,5 +26,11 @@
         CreateMap<GetWorkTaskInput, WorkTask>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
 
         CreateMap<WorkPlanCreateDto, WorkTaskCreateDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+
+        CreateMap<WorkTaskUpdateDto, WorkTask>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+
+        CreateMap<WorkTaskImportModel, WorkTaskCreateDto>(MemberList.None);
+        CreateMap<WorkTaskImportModel, WorkTaskUpdateDto>(MemberList.None);
+        CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None);
     }
 }
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/AppService/AppService_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/AppService/AppService_Generate.cs"
index aed1c6d..1c18adf 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/AppService/AppService_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/AppService/AppService_Generate.cs"
@@ -22,11 +22,13 @@
 
             string attrString = "";
             List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForUpdateMode(param.ColumnNameList);
-            for (int i = 0; i < newColumnNameList.Count; ++i)
-            {
-                attrString += StructStrHelper.GenerateAttributeForUpdateModel(newColumnNameList[i], param);
-            }
-            str = str.Replace("$UpdateAttributes$", attrString);
+
+            //浼樺寲锛岃繖涓湴鏂逛笉鐢ㄤ簡
+            //for (int i = 0; i < newColumnNameList.Count; ++i)
+            //{
+            //    attrString += StructStrHelper.GenerateAttributeForUpdateModel(newColumnNameList[i], param);
+            //}
+            //str = str.Replace("$UpdateAttributes$", attrString);
 
             attrString = "";
             for (int i = 0; i < newColumnNameList.Count; ++i)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
index 03b02e3..0685ed0 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
@@ -145,7 +145,8 @@
         updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
         input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
 
-        $UpdateAttributes$
+        // 鎵归噺璧嬪�兼墍鏈夊彲鏄犲皠瀛楁锛堥�氳繃鍖垮悕瀵硅薄锛�
+        updateObj = ObjectMapper.Map(input, updateObj); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
 
         updateObj.LastModifierName = input.LastModifierName;//淇敼浜�
 
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Application/MapperProfiles/AutoMapperProfile\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Application/MapperProfiles/AutoMapperProfile\346\250\241\346\235\277.txt"
index 861bae2..2f55858 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Application/MapperProfiles/AutoMapperProfile\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Application/MapperProfiles/AutoMapperProfile\346\250\241\346\235\277.txt"
@@ -22,5 +22,10 @@
         CreateMap<$EntityName$, $EntityName$Dto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
         CreateMap<$EntityName$CreateDto, $EntityName$>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
         CreateMap<Get$EntityName$Input, $EntityName$>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+        CreateMap<$EntityName$UpdateDto, $EntityName$>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+
+        CreateMap<$EntityName$ImportModel, $EntityName$CreateDto>(MemberList.None);
+        CreateMap<$EntityName$ImportModel, $EntityName$UpdateDto>(MemberList.None);
+        CreateMap<$EntityName$ImportModel, $EntityName$>(MemberList.None);
     }
 }

--
Gitblit v1.9.3