Skip to content

Commit 656ae2f

Browse files
d4ilysd4ilys
committed
Merge branch 'master' of https://github.com/d4ilys/FreeSql 
2 parents 6e8e2bd + 16e5f8b commit 656ae2f

File tree

95 files changed

+1047
-1877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1047
-1877
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<RepositoryUrl>https://github.com/dotnetcore/FreeSql</RepositoryUrl>
44
<IncludeSymbols>true</IncludeSymbols>
@@ -11,7 +11,7 @@
1111
<!--
1212
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
1313
<PropertyGroup>
14-
<Version>3.2.801-preview20230917</Version>
14+
<Version>3.2.802-preview20231024</Version>
1515
</PropertyGroup>
1616
-->
1717

‎Examples/base_entity/Program.cs‎

Lines changed: 277 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -600,15 +600,30 @@ static void Main(string[] args)
600600
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
601601
#endregion
602602

603-
var tqq01 = fsql.Select<User1>().Where(a => a.IsDeleted || a.IsDeleted || a.IsDeleted).ToSql();
604-
605-
fsql.GlobalFilter.Apply<User1>("test01", a => a.IsDeleted == false);
606-
607603
var updatejoin031sql = fsql.Update<User1>()
608-
.Join<UserGroup>((a, b) => a.GroupId == b.Id)
604+
.Join<UserGroup>(fsql.Select<UserGroup>().Where(a => a.GroupName == "xxx"), (a, b) => a.GroupId == b.Id)
605+
.AsTable("t1", null)
609606
.Set((a, b) => b.GroupName == a.Username + "b.groupname")
610607
.ToSql();
611608

609+
fsql.CodeFirst.Entity<B11>(e =>
610+
{
611+
e.Help().Navigate(b => b.a, nameof(B11.Id));
612+
});
613+
fsql.CodeFirst.Entity<A11>(e => { });
614+
615+
var a11sql01 = fsql.Select<B11>().Where(a => a.Id == 1).ToSql(a => new { a.Name, AName = a.a.Name });
616+
617+
var risWorkListRepo = fsql.GetRepository<EBH_RisWorkList>();
618+
risWorkListRepo.InsertOrUpdate(new EBH_RisWorkList
619+
{
620+
RequisitionID = "xxx"
621+
});
622+
623+
var tqq01 = fsql.Select<User1>().Where(a => a.IsDeleted || a.IsDeleted || a.IsDeleted).ToSql();
624+
625+
fsql.GlobalFilter.Apply<User1>("test01", a => a.IsDeleted == false);
626+
612627
fsql.UseJsonMap();
613628
fsql.Select<MiDevice>().Where(a => a.FormLocking == null).Count();
614629

@@ -2678,4 +2693,261 @@ class FormLocking
26782693
{
26792694
public string Value { get; set; }
26802695
public string Text { get; set; }
2696+
}
2697+
[JsonObject(MemberSerialization.OptIn), Table(Name = "RIS_WORKLIST")]
2698+
public class EBH_RisWorkList
2699+
{
2700+
[JsonProperty, Column(DbType = "varchar(64)", IsPrimary = true)]
2701+
public string RequisitionID { get; set; }
2702+
2703+
[JsonProperty, Column(Name = "accession_number", DbType = "varchar(32)")]
2704+
public string Accession_number { get; set; }
2705+
2706+
[JsonProperty, Column(DbType = "varchar(128)")]
2707+
public string Address { get; set; }
2708+
2709+
[JsonProperty]
2710+
public int? AFCID { get; set; }
2711+
2712+
[JsonProperty, Column(IsIdentity = true)]
2713+
public int AutoIndex { get; set; }
2714+
2715+
[JsonProperty, Column(DbType = "varchar(32)")]
2716+
public string Birthday { get; set; }
2717+
2718+
[JsonProperty, Column(DbType = "varchar(8)")]
2719+
public string BirthTime { get; set; }
2720+
2721+
[JsonProperty, Column(DbType = "varchar(32)")]
2722+
public string CertificateID { get; set; }
2723+
2724+
[JsonProperty, Column(DbType = "varchar(512)")]
2725+
public string CheckSTDescribed { get; set; }
2726+
2727+
[JsonProperty, Column(DbType = "varchar(2048)")]
2728+
public string ClinicDiagnose { get; set; }
2729+
2730+
[JsonProperty, Column(DbType = "varchar(32)")]
2731+
public string ClinicID { get; set; }
2732+
2733+
[JsonProperty]
2734+
public int? Confidentiality { get; set; }
2735+
2736+
[JsonProperty, Column(DbType = "varchar(32)")]
2737+
public string CustomCheckNumber { get; set; }
2738+
2739+
[JsonProperty]
2740+
public int DepartmentID { get; set; }
2741+
2742+
[JsonProperty]
2743+
public int EmergencyID { get; set; }
2744+
2745+
[JsonProperty, Column(DbType = "varchar(32)")]
2746+
public string EndoscopyType { get; set; }
2747+
2748+
[JsonProperty, Column(DbType = "varchar(128)")]
2749+
public string ExamBodyPart { get; set; }
2750+
2751+
[JsonProperty]
2752+
public int? ExamBodyPartNum { get; set; }
2753+
2754+
[JsonProperty, Column(DbType = "varchar(32)")]
2755+
public string ExamDate { get; set; }
2756+
2757+
[JsonProperty, Column(DbType = "varchar(128)")]
2758+
public string ExamMethod { get; set; }
2759+
2760+
[JsonProperty, Column(DbType = "varchar(32)")]
2761+
public string ExamParameter { get; set; }
2762+
2763+
[JsonProperty, Column(Name = "exampath", DbType = "varchar(50)")]
2764+
public string Exampath { get; set; }
2765+
2766+
[JsonProperty, Column(DbType = "varchar(32)")]
2767+
public string ExamTime { get; set; }
2768+
2769+
[JsonProperty, Column(DbType = "varchar(128)")]
2770+
public string FamilyTelephe { get; set; }
2771+
2772+
[JsonProperty, Column(DbType = "varchar(64)")]
2773+
public string FeeTypeName { get; set; }
2774+
2775+
[JsonProperty]
2776+
public int? FollowFlag { get; set; }
2777+
2778+
[JsonProperty]
2779+
public int? HaveImage { get; set; }
2780+
2781+
[JsonProperty]
2782+
public int? HaveRemark { get; set; }
2783+
2784+
[JsonProperty, Column(DbType = "varchar(50)")]
2785+
public string HospitalAreaName { get; set; }
2786+
2787+
[JsonProperty, Column(DbType = "varchar(32)")]
2788+
public string HospitalID { get; set; }
2789+
2790+
[JsonProperty, Column(DbType = "varchar(32)")]
2791+
public string ImageName { get; set; }
2792+
2793+
[JsonProperty, Column(DbType = "varchar(128)")]
2794+
public string ImagePath { get; set; }
2795+
2796+
[JsonProperty, Column(Name = "imagequality", DbType = "varchar(32)")]
2797+
public string Imagequality { get; set; }
2798+
2799+
[JsonProperty]
2800+
public int? InAdvanceQueue { get; set; }
2801+
2802+
[JsonProperty]
2803+
public int? InDeedQueue { get; set; }
2804+
2805+
[JsonProperty, Column(Name = "isAddPatient", DbType = "varchar(2)")]
2806+
public string IsAddPatient { get; set; }
2807+
2808+
[JsonProperty, Column(Name = "isChangeDate", DbType = "varchar(2)")]
2809+
public string IsChangeDate { get; set; }
2810+
2811+
[JsonProperty, Column(Name = "isIBD", DbType = "varchar(2)")]
2812+
public string IsIBD { get; set; }
2813+
2814+
[JsonProperty]
2815+
public int? IsNotCallNumber { get; set; }
2816+
2817+
[JsonProperty]
2818+
public int? IsNotNOScreen { get; set; }
2819+
2820+
[JsonProperty, Column(Name = "isOverTime", DbType = "varchar(2)")]
2821+
public string IsOverTime { get; set; }
2822+
2823+
[JsonProperty]
2824+
public int? IsPaSSNumber { get; set; }
2825+
2826+
[JsonProperty, Column(Name = "isSEZCJ", DbType = "varchar(2)")]
2827+
public string IsSEZCJ { get; set; }
2828+
2829+
[JsonProperty]
2830+
public int IsSpePatientSign { get; set; }
2831+
2832+
[JsonProperty]
2833+
public int? IsTexu { get; set; }
2834+
2835+
[JsonProperty, Column(Name = "isZhiLiao", DbType = "varchar(2)")]
2836+
public string IsZhiLiao { get; set; }
2837+
2838+
[JsonProperty]
2839+
public DateTime? LastTryForImage { get; set; }
2840+
2841+
[JsonProperty, Column(DbType = "varchar(32)")]
2842+
public string MedicalCardNumber { get; set; }
2843+
2844+
[JsonProperty, Column(DbType = "varchar(4096)")]
2845+
public string MedicalHistory { get; set; }
2846+
2847+
[JsonProperty, Column(DbType = "varchar(32)")]
2848+
public string MIcardNumber { get; set; }
2849+
2850+
[JsonProperty, Column(DbType = "varchar(32)")]
2851+
public string ModalityAE { get; set; }
2852+
2853+
[JsonProperty]
2854+
public int? ModalityID { get; set; }
2855+
2856+
[JsonProperty, Column(DbType = "varchar(32)")]
2857+
public string ModalityName { get; set; }
2858+
2859+
[JsonProperty, Column(DbType = "varchar(32)")]
2860+
public string ModalityRemark { get; set; }
2861+
2862+
[JsonProperty]
2863+
public int? ModalityRoomID { get; set; }
2864+
2865+
[JsonProperty, Column(DbType = "varchar(32)")]
2866+
public string ModalityType { get; set; }
2867+
2868+
[JsonProperty]
2869+
public int? NurseStationFlag { get; set; }
2870+
2871+
[JsonProperty, Column(DbType = "varchar(32)")]
2872+
public string PathologicID { get; set; }
2873+
2874+
[JsonProperty, Column(DbType = "varchar(32)")]
2875+
public string PatientID { get; set; }
2876+
2877+
[JsonProperty]
2878+
public int PatientTypeID { get; set; }
2879+
2880+
[JsonProperty, Column(DbType = "varchar(32)")]
2881+
public string PhysicalExamID { get; set; }
2882+
2883+
[JsonProperty, Column(DbType = "varchar(128)")]
2884+
public string PhysicianRequirements { get; set; }
2885+
2886+
[JsonProperty]
2887+
public int PrintFlag { get; set; }
2888+
2889+
[JsonProperty]
2890+
public int? PrintNoticeFlag { get; set; }
2891+
2892+
[JsonProperty, Column(DbType = "varchar(128)")]
2893+
public string PTN_NAME { get; set; }
2894+
2895+
[JsonProperty, Column(DbType = "varchar(128)")]
2896+
public string PY { get; set; }
2897+
2898+
[JsonProperty]
2899+
public int QueueStateID { get; set; }
2900+
2901+
[JsonProperty, Column(DbType = "varchar(2048)")]
2902+
public string Remarks { get; set; }
2903+
2904+
[JsonProperty, Column(DbType = "varchar(32)")]
2905+
public string ReqDepartment { get; set; }
2906+
2907+
[JsonProperty, Column(DbType = "varchar(32)")]
2908+
public string ReqHospital { get; set; }
2909+
2910+
[JsonProperty, Column(DbType = "varchar(32)")]
2911+
public string ReqPhysician { get; set; }
2912+
2913+
[JsonProperty]
2914+
public int? ResourceID { get; set; }
2915+
2916+
[JsonProperty]
2917+
public int? SendRepFlag { get; set; }
2918+
2919+
[JsonProperty, Column(Name = "SEX", DbType = "varchar(32)")]
2920+
public string Sex { get; set; }
2921+
2922+
[JsonProperty, Column(DbType = "varchar(50)")]
2923+
public string SickbedID { get; set; }
2924+
2925+
[JsonProperty]
2926+
public int? StateID { get; set; }
2927+
2928+
[JsonProperty]
2929+
public int? StationID { get; set; }
2930+
2931+
[JsonProperty, Column(DbType = "varchar(32)")]
2932+
public string Telephone { get; set; }
2933+
2934+
[JsonProperty]
2935+
public double? Weight { get; set; }
2936+
2937+
[JsonProperty, Column(DbType = "varchar(128)")]
2938+
public string WorkStationAddress { get; set; }
2939+
2940+
2941+
}
2942+
public class A11
2943+
{
2944+
public int Id { get; set; }
2945+
public string Name { get; set; }
2946+
}
2947+
2948+
public class B11
2949+
{
2950+
public int Id { get; set; }
2951+
public string Name { get; set; }
2952+
public A11 a { get; set; }
26812953
}

‎Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.801-preview20230917</Version>
21+
<Version>3.2.802-preview20231024</Version>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
@@ -19,7 +19,7 @@
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
2121
<LangVersion>latest</LangVersion>
22-
<Version>3.2.801-preview20230917</Version>
22+
<Version>3.2.802-preview20231024</Version>
2323
</PropertyGroup>
2424

2525
<ItemGroup>

‎Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.801-preview20230917</Version>
21+
<Version>3.2.802-preview20231024</Version>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks>
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.801-preview20230917</Version>
18+
<Version>3.2.802-preview20231024</Version>
1919
</PropertyGroup>
2020

2121
<ItemGroup>

‎Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.801-preview20230917</Version>
21+
<Version>3.2.802-preview20231024</Version>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)