整理

src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs

@@ -6,7 +6,9 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Threading.Tasks;
+using TencentCloud.Ame.V20190916.Models;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
@@ -36,6 +38,7 @@ namespace Shentun.Peis.DataMigrations
         private readonly IRepository<MedicalType, Guid> _medicalTypeRepository;
         private readonly IRepository<PersonnelType, Guid> _personnelTypeRepository;
         private readonly IRepository<InvoiceItemType, Guid> _invoiceItemTypeRepository;
+        private readonly IRepository<FieldComparison, Guid> _fieldComparisonRepository;
 
         public BaseDataHandleAppService(
             IRepository<DeviceType, Guid> deviceTypeRepository,
@@ -44,7 +47,8 @@ namespace Shentun.Peis.DataMigrations
             IRepository<Unit, Guid> unitRepository,
             IRepository<MedicalType, Guid> medicalTypeRepository,
             IRepository<PersonnelType, Guid> personnelTypeRepository,
-            IRepository<InvoiceItemType, Guid> invoiceItemTypeRepository)
+            IRepository<InvoiceItemType, Guid> invoiceItemTypeRepository,
+            IRepository<FieldComparison, Guid> fieldComparisonRepository)
         {
             _deviceTypeRepository = deviceTypeRepository;
             _itemTypeRepository = itemTypeRepository;
@@ -53,6 +57,7 @@ namespace Shentun.Peis.DataMigrations
             _medicalTypeRepository = medicalTypeRepository;
             _personnelTypeRepository = personnelTypeRepository;
             _invoiceItemTypeRepository = invoiceItemTypeRepository;
+            _fieldComparisonRepository = fieldComparisonRepository;
         }
 
         /// <summary>
@@ -64,21 +69,34 @@ namespace Shentun.Peis.DataMigrations
             var count = await _deviceTypeRepository.GetCountAsync();
             if (count == 0)
             {
-                List<DeviceType> dataList = new List<DeviceType>();
-                var oldDeviceTypeList = await Db.Ado.GetDataTableAsync("select device_type_name from device_type order by display_order asc");
+                var oldDeviceTypeList = await Db.Ado.GetDataTableAsync("select device_type_id,device_type_name from device_type order by display_order asc");
                 if (oldDeviceTypeList.Rows.Count > 0)
                 {
+                    List<FieldComparison> fieldComparisons = new List<FieldComparison>();
+
                     foreach (DataRow row in oldDeviceTypeList.Rows)
                     {
-                        dataList.Add(new DeviceType
+                        var data = new DeviceType
                         {
                             CheckTypeFlag = '0',
                             DisplayName = row["device_type_name"].ToString(),
                             DisplayOrder = oldDeviceTypeList.Rows.IndexOf(row) + 1,
                             SimpleCode = LanguageConverter.GetPYSimpleCode(row["device_type_name"].ToString())
+                        };
+
+                        var ent = await _deviceTypeRepository.InsertAsync(data, true);
+
+                        fieldComparisons.Add(new FieldComparison
+                        {
+                            TableName = "device_type",
+                            FieldName = "id",
+                            NewKeyValue = ent.Id.ToString(),
+                            OldKeyValue = row["device_type_id"].ToString()
                         });
                     }
-                    await _deviceTypeRepository.InsertManyAsync(dataList);
+
+                    await _fieldComparisonRepository.InsertManyAsync(fieldComparisons);
+
                 }
             }
         }
@@ -93,20 +111,34 @@ namespace Shentun.Peis.DataMigrations
             var count = await _unitRepository.GetCountAsync();
             if (count == 0)
             {
-                List<Unit> dataList = new List<Unit>();
-                var oldUnitList = await Db.Ado.GetDataTableAsync("select unit_name from unit order by display_order asc");
+
+                var oldUnitList = await Db.Ado.GetDataTableAsync("select unit_id,unit_name from unit order by display_order asc");
                 if (oldUnitList.Rows.Count > 0)
                 {
+                    List<FieldComparison> fieldComparisons = new List<FieldComparison>();
+
                     foreach (DataRow row in oldUnitList.Rows)
                     {
-                        dataList.Add(new Unit
+                        var data = new Unit
                         {
                             DisplayName = row["unit_name"].ToString(),
                             DisplayOrder = oldUnitList.Rows.IndexOf(row) + 1,
                             SimpleCode = LanguageConverter.GetPYSimpleCode(row["unit_name"].ToString())
+                        };
+
+                        var ent = await _unitRepository.InsertAsync(data, true);
+
+                        fieldComparisons.Add(new FieldComparison
+                        {
+                            TableName = "unit",
+                            FieldName = "id",
+                            NewKeyValue = ent.Id.ToString(),
+                            OldKeyValue = row["unit_id"].ToString()
                         });
                     }
-                    await _unitRepository.InsertManyAsync(dataList);
+
+                    await _fieldComparisonRepository.InsertManyAsync(fieldComparisons);
+
                 }
             }
         }
@@ -120,20 +152,33 @@ namespace Shentun.Peis.DataMigrations
             var count = await _medicalTypeRepository.GetCountAsync();
             if (count == 0)
             {
-                List<MedicalType> dataList = new List<MedicalType>();
-                var oldMedicalTypeList = await Db.Ado.GetDataTableAsync("select medical_type_name from medical_type order by display_order asc");
+
+                var oldMedicalTypeList = await Db.Ado.GetDataTableAsync("select medical_type_id,medical_type_name from medical_type order by display_order asc");
                 if (oldMedicalTypeList.Rows.Count > 0)
                 {
+                    List<FieldComparison> fieldComparisons = new List<FieldComparison>();
+
                     foreach (DataRow row in oldMedicalTypeList.Rows)
                     {
-                        dataList.Add(new MedicalType
+                        var data = new MedicalType
                         {
                             DisplayName = row["medical_type_name"].ToString(),
                             DisplayOrder = oldMedicalTypeList.Rows.IndexOf(row) + 1,
                             SimpleCode = LanguageConverter.GetPYSimpleCode(row["medical_type_name"].ToString())
+                        };
+
+                        var ent = await _medicalTypeRepository.InsertAsync(data, true);
+
+                        fieldComparisons.Add(new FieldComparison
+                        {
+                            TableName = "medical_type",
+                            FieldName = "id",
+                            NewKeyValue = ent.Id.ToString(),
+                            OldKeyValue = row["medical_type_id"].ToString()
                         });
                     }
-                    await _medicalTypeRepository.InsertManyAsync(dataList);
+
+                    await _fieldComparisonRepository.InsertManyAsync(fieldComparisons);
                 }
             }
         }
@@ -148,20 +193,33 @@ namespace Shentun.Peis.DataMigrations
             var count = await _personnelTypeRepository.GetCountAsync();
             if (count == 0)
             {
-                List<PersonnelType> dataList = new List<PersonnelType>();
-                var oldPersonnelTypeList = await Db.Ado.GetDataTableAsync("select personnel_type_name from personnel_type order by display_order asc");
+
+                var oldPersonnelTypeList = await Db.Ado.GetDataTableAsync("select personnel_type_id,personnel_type_name from personnel_type order by display_order asc");
                 if (oldPersonnelTypeList.Rows.Count > 0)
                 {
+                    List<FieldComparison> fieldComparisons = new List<FieldComparison>();
+
                     foreach (DataRow row in oldPersonnelTypeList.Rows)
                     {
-                        dataList.Add(new PersonnelType
+                        var data = new PersonnelType
                         {
                             DisplayName = row["personnel_type_name"].ToString(),
                             DisplayOrder = oldPersonnelTypeList.Rows.IndexOf(row) + 1,
                             SimpleCode = LanguageConverter.GetPYSimpleCode(row["personnel_type_name"].ToString())
+                        };
+
+                        var ent = await _personnelTypeRepository.InsertAsync(data, true);
+
+                        fieldComparisons.Add(new FieldComparison
+                        {
+                            TableName = "personnel_type",
+                            FieldName = "id",
+                            NewKeyValue = ent.Id.ToString(),
+                            OldKeyValue = row["personnel_type_id"].ToString()
                         });
                     }
-                    await _personnelTypeRepository.InsertManyAsync(dataList);
+
+                    await _fieldComparisonRepository.InsertManyAsync(fieldComparisons);
                 }
             }
         }
@@ -177,20 +235,32 @@ namespace Shentun.Peis.DataMigrations
             var count = await _invoiceItemTypeRepository.GetCountAsync();
             if (count == 0)
             {
-                List<InvoiceItemType> dataList = new List<InvoiceItemType>();
-                var oldInvoiceItemTypeList = await Db.Ado.GetDataTableAsync("select invoice_item_type_name from invoice_item_type order by display_order asc");
+                
+                var oldInvoiceItemTypeList = await Db.Ado.GetDataTableAsync("select invoice_item_type_id,invoice_item_type_name from invoice_item_type order by display_order asc");
                 if (oldInvoiceItemTypeList.Rows.Count > 0)
                 {
+                    List<FieldComparison> fieldComparisons = new List<FieldComparison>();
+
                     foreach (DataRow row in oldInvoiceItemTypeList.Rows)
                     {
-                        dataList.Add(new InvoiceItemType
+                        var data= new InvoiceItemType
                         {
                             DisplayName = row["invoice_item_type_name"].ToString(),
                             DisplayOrder = oldInvoiceItemTypeList.Rows.IndexOf(row) + 1,
                             SimpleCode = LanguageConverter.GetPYSimpleCode(row["invoice_item_type_name"].ToString())
+                        };
+                        var ent = await _invoiceItemTypeRepository.InsertAsync(data, true);
+
+                        fieldComparisons.Add(new FieldComparison
+                        {
+                            TableName = "invoice_item_type",
+                            FieldName = "id",
+                            NewKeyValue = ent.Id.ToString(),
+                            OldKeyValue = row["invoice_item_type_id"].ToString()
                         });
                     }
-                    await _invoiceItemTypeRepository.InsertManyAsync(dataList);
+
+                    await _fieldComparisonRepository.InsertManyAsync(fieldComparisons);
                 }
             }
         }

src/Shentun.Peis.Domain/FieldComparisons/FieldComparison.cs

@@ -9,11 +9,12 @@ using System.Threading.Tasks;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities.Auditing;
 
-namespace Shentun.Peis.FieldComparisons
+namespace Shentun.Peis.Models
 {
     /// <summary>
     /// 字段对照
     /// </summary>
+    [Table("field_comparison")]
     public class FieldComparison : Entity<Guid>, IHasConcurrencyStamp
     {
         public FieldComparison()

src/Shentun.Peis.EntityFrameworkCore/DbMapping/FieldComparisons/FieldComparisonDbMapping.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Shentun.Peis.EntityFrameworkCore;
-using Shentun.Peis.FieldComparisons;
+
 
 namespace Shentun.Peis.DbMapping
 {

src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs

@@ -7,7 +7,6 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.Extensions.Logging;
 using Shentun.Peis.Books;
 using Shentun.Peis.DbMapping;
-using Shentun.Peis.FieldComparisons;
 using Shentun.Peis.Models;
 using Shentun.Peis.RoleMenuInfos;
 using System;

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240418082314_init20240418002.cs

@@ -0,0 +1,56 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240418002 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "FieldComparisons");
+
+            migrationBuilder.CreateTable(
+                name: "field_comparison",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", nullable: false),
+                    table_name = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, comment: "表名"),
+                    field_name = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, comment: "字段名"),
+                    old_key_value = table.Column<string>(type: "text", nullable: false, comment: "老系统主键值"),
+                    new_key_value = table.Column<string>(type: "text", nullable: false, comment: "新系统主键值"),
+                    concurrency_stamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_field_comparison", x => x.id);
+                },
+                comment: "字段对照");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "field_comparison");
+
+            migrationBuilder.CreateTable(
+                name: "FieldComparisons",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", nullable: false),
+                    concurrency_stamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
+                    field_name = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, comment: "字段名"),
+                    new_key_value = table.Column<string>(type: "text", nullable: false, comment: "新系统主键值"),
+                    old_key_value = table.Column<string>(type: "text", nullable: false, comment: "老系统主键值"),
+                    table_name = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, comment: "表名")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_FieldComparisons", x => x.id);
+                },
+                comment: "字段对照");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -414,51 +414,6 @@ namespace Shentun.Peis.Migrations
                     b.ToTable("test_ct");
                 });
 
-            modelBuilder.Entity("Shentun.Peis.FieldComparisons.FieldComparison", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasMaxLength(40)
-                        .HasColumnType("character varying(40)")
-                        .HasColumnName("concurrency_stamp");
-
-                    b.Property<string>("FieldName")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("field_name")
-                        .HasComment("字段名");
-
-                    b.Property<string>("NewKeyValue")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("new_key_value")
-                        .HasComment("新系统主键值");
-
-                    b.Property<string>("OldKeyValue")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("old_key_value")
-                        .HasComment("老系统主键值");
-
-                    b.Property<string>("TableName")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("table_name")
-                        .HasComment("表名");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("FieldComparisons");
-
-                    b.HasComment("字段对照");
-                });
-
             modelBuilder.Entity("Shentun.Peis.Models.AbpUserDepartment", b =>
                 {
                     b.Property<Guid>("UserId")
@@ -3323,6 +3278,51 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("诊断类别");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.FieldComparison", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<string>("FieldName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("field_name")
+                        .HasComment("字段名");
+
+                    b.Property<string>("NewKeyValue")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("new_key_value")
+                        .HasComment("新系统主键值");
+
+                    b.Property<string>("OldKeyValue")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("old_key_value")
+                        .HasComment("老系统主键值");
+
+                    b.Property<string>("TableName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("table_name")
+                        .HasComment("表名");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("field_comparison");
+
+                    b.HasComment("字段对照");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.FollowUpMode", b =>
                 {
                     b.Property<Guid>("Id")