From a8331b706b8678af9b907bf68971ce10eeb41c36 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 21:56:25 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs | 597 ++++++++++++++++++++++++++--------------------------------
1 files changed, 269 insertions(+), 328 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
index 1209f34..a39d6de 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;
@@ -54,14 +55,154 @@
public SearchFilterModeEnum TaskCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 鍘熸枡缂栧彿
+ /// 璁″垝鐘舵��
/// </summary>
- public string OrgMaterialCode { get; set; }
+ public WorkPlanStatusEnum? WorkPlanStatus { get; set; }
/// <summary>
- /// 鍘熸枡缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 璁″垝鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum OrgMaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public SearchFilterModeEnum WorkPlanStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public CallMaterialStatusEnum? CallMaterialStatus { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CallMaterialStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鍘熸枡鏍囪瘑
+ /// </summary>
+ public string DataIdentifier { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鏍囪瘑-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum DataIdentifier_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ public string MaterialMode { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialMode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 闀垮害(mm)
+ /// </summary>
+ public decimal? Length { get; set; }
+
+ /// <summary>
+ /// 闀垮害(mm)-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Length_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鎵撶爜鍐呭
+ /// </summary>
+ public string MarkingContent { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜鍐呭-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MarkingContent_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鎵撶爜浣嶇疆
+ /// </summary>
+ public decimal? MarkingPosition { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜浣嶇疆-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MarkingPosition_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鍒囧壊浣嶇疆
+ /// </summary>
+ public decimal? CuttingPosition { get; set; }
+
+ /// <summary>
+ /// 鍒囧壊浣嶇疆-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CuttingPosition_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 绠℃鏁伴噺
+ /// </summary>
+ public int? Quantity { get; set; }
+
+ /// <summary>
+ /// 绠℃鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Quantity_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 娉曞叞鍘氬害(mm)
+ /// </summary>
+ public decimal? FlangeThickness { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍘氬害(mm)-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum FlangeThickness_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 娉曞叞鐩村緞(mm)
+ /// </summary>
+ public decimal? FlangeInnerDiameter { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鐩村緞(mm)-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum FlangeInnerDiameter_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 娉曞叞鍏О鍘嬪姏
+ /// </summary>
+ public string WeldingHeatInput { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍏О鍘嬪姏-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum WeldingHeatInput_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 娉曞叞鍐茬爜鍐呭
+ /// </summary>
+ public string PipeAllowableStress { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍐茬爜鍐呭-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PipeAllowableStress_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 濂楃闀垮害(mm)
+ /// </summary>
+ public decimal? PipeDiameter { get; set; }
+
+ /// <summary>
+ /// 濂楃闀垮害(mm)-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PipeDiameter_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 濂楃鐩村緞(mm)
+ /// </summary>
+ public decimal? PipeWallThickness { get; set; }
+
+ /// <summary>
+ /// 濂楃鐩村緞(mm)-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PipeWallThickness_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 宸ュ巶浠ｇ爜
@@ -144,22 +285,12 @@
public SearchFilterModeEnum PreSerialNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 鍘熸枡鏍囪瘑
- /// </summary>
- public string DataIdentifier { get; set; }
-
- /// <summary>
- /// 鍘熸枡鏍囪瘑-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DataIdentifier_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 绠¤鏍肩爜
+ /// 绠℃缂栫爜
/// </summary>
public string PipeSpecCode { get; set; }
/// <summary>
- /// 绠¤鏍肩爜-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 绠℃缂栫爜-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum PipeSpecCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
@@ -174,24 +305,24 @@
public SearchFilterModeEnum PipeSectionName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 澶栧緞
+ /// 澶栧緞(mm)
/// </summary>
- public string OuterDiameter { get; set; }
+ public decimal? OuterDiameter { get; set; }
/// <summary>
- /// 澶栧緞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 澶栧緞(mm)-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- /// 鍧″彛
+ /// 澹佸帤(mm)
/// </summary>
- public string Bevel { get; set; }
+ public decimal? Thickness { get; set; }
/// <summary>
- /// 鍧″彛-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 澹佸帤(mm)-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum Bevel_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public SearchFilterModeEnum Thickness_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
/// 鏉愯川
@@ -204,252 +335,12 @@
public SearchFilterModeEnum Material_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// 闀垮害
- /// </summary>
- public string Length { get; set; }
-
- /// <summary>
- /// 闀垮害-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Length_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎵撳瓟浣�
- /// </summary>
- public string DrillingPosition { get; set; }
-
- /// <summary>
- /// 鎵撳瓟浣�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DrillingPosition_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐩歌疮
- /// </summary>
- public string Intersecting { get; set; }
-
- /// <summary>
- /// 鐩歌疮-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Intersecting_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎺ュ彛瑕佹眰
- /// </summary>
- public string InterfaceRequirement { get; set; }
-
- /// <summary>
- /// 鎺ュ彛瑕佹眰-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum InterfaceRequirement_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏄惁鏈変富绛�
- /// </summary>
- public bool? HasMainSignature { get; set; }
-
- /// <summary>
- /// 鏄惁鏈変富绛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum HasMainSignature_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鍖呮嫭鏁伴噺
- /// </summary>
- public int? Quantity { get; set; }
-
- /// <summary>
- /// 鍖呮嫭鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Quantity_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鎵撶爜鍐呭
- /// </summary>
- public string MarkingContent { get; set; }
-
- /// <summary>
- /// 鎵撶爜鍐呭-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MarkingContent_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鍒囧壊鏂囦欢
- /// </summary>
- public string CuttingFile { get; set; }
-
- /// <summary>
- /// 鍒囧壊鏂囦欢-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum CuttingFile_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏀寰�
- /// </summary>
- public string BranchOuterDiameter { get; set; }
-
- /// <summary>
- /// 鏀寰�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum BranchOuterDiameter_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏀澹佸帤
- /// </summary>
- public string BranchWallThickness { get; set; }
-
- /// <summary>
- /// 鏀澹佸帤-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum BranchWallThickness_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏀鏉愯川
- /// </summary>
- public string BranchMaterial { get; set; }
-
- /// <summary>
- /// 鏀鏉愯川-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum BranchMaterial_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏀绔彛鏇茬巼鍗婂緞
- /// </summary>
- public string BranchPortRadius { get; set; }
-
- /// <summary>
- /// 鏀绔彛鏇茬巼鍗婂緞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum BranchPortRadius_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏀绔彛瑙掑害
- /// </summary>
- public string BranchPortAngle { get; set; }
-
- /// <summary>
- /// 鏀绔彛瑙掑害-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum BranchPortAngle_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏀绔彛瑕佹眰
- /// </summary>
- public string BranchPortRequirement { get; set; }
-
- /// <summary>
- /// 鏀绔彛瑕佹眰-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum BranchPortRequirement_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐩歌疮绾跨被鍨�
- /// </summary>
- public string IntersectingLineType { get; set; }
-
- /// <summary>
- /// 鐩歌疮绾跨被鍨�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IntersectingLineType_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐩歌疮绾跨被鍒�
- /// </summary>
- public string IntersectingLineCategory { get; set; }
-
- /// <summary>
- /// 鐩歌疮绾跨被鍒�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IntersectingLineCategory_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎴愬搧鍥惧箙
- /// </summary>
- public string FinishedProductScale { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍥惧箙-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum FinishedProductScale_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 娉曞叞鍘氬害
- /// </summary>
- public string FlangeThickness { get; set; }
-
- /// <summary>
- /// 娉曞叞鍘氬害-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum FlangeThickness_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 娉曞叞鍐呭緞
- /// </summary>
- public string FlangeInnerDiameter { get; set; }
-
- /// <summary>
- /// 娉曞叞鍐呭緞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum FlangeInnerDiameter_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐒婃帴鐑緭鍏�
- /// </summary>
- public string WeldingHeatInput { get; set; }
-
- /// <summary>
- /// 鐒婃帴鐑緭鍏�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum WeldingHeatInput_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 绠￠亾鍏佽搴斿姏
- /// </summary>
- public string PipeAllowableStress { get; set; }
-
- /// <summary>
- /// 绠￠亾鍏佽搴斿姏-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PipeAllowableStress_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 绠″緞
- /// </summary>
- public string PipeDiameter { get; set; }
-
- /// <summary>
- /// 绠″緞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PipeDiameter_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 绠￠亾澹佸帤
- /// </summary>
- public string PipeWallThickness { get; set; }
-
- /// <summary>
- /// 绠￠亾澹佸帤-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PipeWallThickness_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// VR鏁版嵁
- /// </summary>
- public string VRData { get; set; }
-
- /// <summary>
- /// VR鏁版嵁-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum VRData_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 宸ヨ壓璺嚎缂栧彿
+ /// 宸ヨ壓娴佸悜缂栧彿
/// </summary>
public string ProcessRouteNumber { get; set; }
/// <summary>
- /// 宸ヨ壓璺嚎缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 宸ヨ壓娴佸悜缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
public SearchFilterModeEnum ProcessRouteNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
@@ -470,44 +361,128 @@
/// <summary>
- /// 鏃堕棿淇℃伅
+ /// 鐝粍淇℃伅
/// </summary>
- public string TimeInfo { get; set; }
+ public string TeamInfo { get; set; }
/// <summary>
- /// 鏃堕棿淇℃伅-鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鐝粍淇℃伅-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum TimeInfo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public SearchFilterModeEnum TeamInfo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- ///
+ /// 鏃堕棿鎴�
/// </summary>
- public string RedundantField1 { get; set; }
+ public string Timestamp { get; set; }
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鏃堕棿鎴�-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum RedundantField1_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public SearchFilterModeEnum Timestamp_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- ///
+ /// 鍒涘缓鏃堕棿
/// </summary>
- public string RedundantField2 { get; set; }
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> CreationTime { get; set; }
+
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鍒涘缓浜篒D
/// </summary>
- public SearchFilterModeEnum RedundantField2_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public string CreatorId { get; set; }
/// <summary>
- ///
+ /// 鍒涘缓浜篒D-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public string RedundantField3 { get; set; }
+ public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 淇敼鏃堕棿
/// </summary>
- public SearchFilterModeEnum RedundantField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> LastModificationTime { get; set; }
+
+
+ /// <summary>
+ /// 淇敼浜篒D
+ /// </summary>
+ public string LastModifierId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒D-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鏄惁鍒犻櫎
+ /// </summary>
+ public bool? IsDeleted { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍒犻櫎-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ /// 鍒犻櫎浜篒D
+ /// </summary>
+ public string DeleterId { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎浜篒D-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鍒犻櫎鏃堕棿
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public List<string> DeletionTime { get; set; }
+
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string CreatorName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CreatorName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string LastModifierName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LastModifierName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鎿嶄綔澶囨敞
+ /// </summary>
+ public string OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public string DeleteRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 鎺掑簭
@@ -540,68 +515,34 @@
public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- ///
+ /// 鎵╁睍瀛楁1
/// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
-
+ public string ExtraField1 { get; set; }
/// <summary>
- ///
+ /// 鎵╁睍瀛楁1-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public string CreatorId { get; set; }
+ public SearchFilterModeEnum ExtraField1_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鎵╁睍瀛楁2
/// </summary>
- public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ public string ExtraField2 { get; set; }
/// <summary>
- ///
+ /// 鎵╁睍瀛楁2-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
-
+ public SearchFilterModeEnum ExtraField2_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
- ///
+ /// 鎵╁睍瀛楁3
/// </summary>
- public string LastModifierId { get; set; }
+ public string ExtraField3 { get; set; }
/// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// 鎵╁睍瀛楁3-鏌ヨ鍏崇郴杩愮畻绗�
/// </summary>
- public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public bool? IsDeleted { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public string DeleterId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
-
+ public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
}
--
Gitblit v1.9.3