From fdf4cdbf9723d9d05938fe56d2014769dd7ece4c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 10 5月 2025 12:17:19 +0800
Subject: [PATCH] 修复 模糊查询bug
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs | 288 +++++++++++++++++++++------------------------------------
1 files changed, 108 insertions(+), 180 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
index 8232fa8..56e8498 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
@@ -17,10 +17,82 @@
public string TaskCode { get; set; }
/// <summary>
- /// 鍘熸枡缂栧彿
+ /// 鍘熸枡鏍囪瘑
/// </summary>
- [ExcelColumn(Name = "鍘熸枡缂栧彿", Width = 25)]
- public string OrgMaterialCode { get; set; }
+ [ExcelColumn(Name = "鍘熸枡鏍囪瘑", Width = 25)]
+ public string DataIdentifier { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ [ExcelColumn(Name = "鍘熸枡鍨嬪彿", Width = 25)]
+ public string MaterialMode { get; set; }
+
+ /// <summary>
+ /// 闀垮害(mm)
+ /// </summary>
+ [ExcelColumn(Name = "闀垮害(mm)", Width = 25)]
+ public decimal Length { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜鍐呭
+ /// </summary>
+ [ExcelColumn(Name = "鎵撶爜鍐呭", Width = 25)]
+ public string MarkingContent { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜浣嶇疆
+ /// </summary>
+ [ExcelColumn(Name = "鎵撶爜浣嶇疆", Width = 25)]
+ public decimal MarkingPosition { get; set; }
+
+ /// <summary>
+ /// 鍒囧壊浣嶇疆
+ /// </summary>
+ [ExcelColumn(Name = "鍒囧壊浣嶇疆", Width = 25)]
+ public decimal CuttingPosition { get; set; }
+
+ /// <summary>
+ /// 绠℃鏁伴噺
+ /// </summary>
+ [ExcelColumn(Name = "绠℃鏁伴噺", Width = 25)]
+ public int Quantity { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍘氬害(mm)
+ /// </summary>
+ [ExcelColumn(Name = "娉曞叞鍘氬害(mm)", Width = 25)]
+ public decimal FlangeThickness { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鐩村緞(mm)
+ /// </summary>
+ [ExcelColumn(Name = "娉曞叞鐩村緞(mm)", Width = 25)]
+ public decimal FlangeInnerDiameter { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍏О鍘嬪姏
+ /// </summary>
+ [ExcelColumn(Name = "娉曞叞鍏О鍘嬪姏", Width = 25)]
+ public string WeldingHeatInput { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍐茬爜鍐呭
+ /// </summary>
+ [ExcelColumn(Name = "娉曞叞鍐茬爜鍐呭", Width = 25)]
+ public string PipeAllowableStress { get; set; }
+
+ /// <summary>
+ /// 濂楃闀垮害(mm)
+ /// </summary>
+ [ExcelColumn(Name = "濂楃闀垮害(mm)", Width = 25)]
+ public decimal PipeDiameter { get; set; }
+
+ /// <summary>
+ /// 濂楃鐩村緞(mm)
+ /// </summary>
+ [ExcelColumn(Name = "濂楃鐩村緞(mm)", Width = 25)]
+ public decimal PipeWallThickness { get; set; }
/// <summary>
/// 宸ュ巶浠ｇ爜
@@ -71,15 +143,9 @@
public string PreSerialNumber { get; set; }
/// <summary>
- /// 鍘熸枡鏍囪瘑
+ /// 绠℃缂栫爜
/// </summary>
- [ExcelColumn(Name = "鍘熸枡鏍囪瘑", Width = 25)]
- public string DataIdentifier { get; set; }
-
- /// <summary>
- /// 绠¤鏍肩爜
- /// </summary>
- [ExcelColumn(Name = "绠¤鏍肩爜", Width = 25)]
+ [ExcelColumn(Name = "绠℃缂栫爜", Width = 25)]
public string PipeSpecCode { get; set; }
/// <summary>
@@ -89,16 +155,16 @@
public string PipeSectionName { get; set; }
/// <summary>
- /// 澶栧緞
+ /// 澶栧緞(mm)
/// </summary>
- [ExcelColumn(Name = "澶栧緞", Width = 25)]
- public string OuterDiameter { get; set; }
+ [ExcelColumn(Name = "澶栧緞(mm)", Width = 25)]
+ public decimal OuterDiameter { get; set; }
/// <summary>
- /// 鍧″彛
+ /// 澹佸帤(mm)
/// </summary>
- [ExcelColumn(Name = "鍧″彛", Width = 25)]
- public string Bevel { get; set; }
+ [ExcelColumn(Name = "澹佸帤(mm)", Width = 25)]
+ public decimal Thickness { get; set; }
/// <summary>
/// 鏉愯川
@@ -107,153 +173,15 @@
public string Material { get; set; }
/// <summary>
- /// 闀垮害
+ /// 鏄惁涓绘敮绠�
/// </summary>
- [ExcelColumn(Name = "闀垮害", Width = 25)]
- public string Length { get; set; }
-
- /// <summary>
- /// 鎵撳瓟浣�
- /// </summary>
- [ExcelColumn(Name = "鎵撳瓟浣�", Width = 25)]
- public string DrillingPosition { get; set; }
-
- /// <summary>
- /// 鐩歌疮
- /// </summary>
- [ExcelColumn(Name = "鐩歌疮", Width = 25)]
- public string Intersecting { get; set; }
-
- /// <summary>
- /// 鎺ュ彛瑕佹眰
- /// </summary>
- [ExcelColumn(Name = "鎺ュ彛瑕佹眰", Width = 25)]
- public string InterfaceRequirement { get; set; }
-
- /// <summary>
- /// 鏄惁鏈変富绛�
- /// </summary>
- [ExcelColumn(Name = "鏄惁鏈変富绛�", Width = 25)]
+ [ExcelColumn(Name = "鏄惁涓绘敮绠�", Width = 25)]
public bool HasMainSignature { get; set; }
/// <summary>
- /// 鍖呮嫭鏁伴噺
+ /// 宸ヨ壓娴佸悜缂栧彿
/// </summary>
- [ExcelColumn(Name = "鍖呮嫭鏁伴噺", Width = 25)]
- public int Quantity { get; set; }
-
- /// <summary>
- /// 鎵撶爜鍐呭
- /// </summary>
- [ExcelColumn(Name = "鎵撶爜鍐呭", Width = 25)]
- public string MarkingContent { get; set; }
-
- /// <summary>
- /// 鍒囧壊鏂囦欢
- /// </summary>
- [ExcelColumn(Name = "鍒囧壊鏂囦欢", Width = 25)]
- public string CuttingFile { get; set; }
-
- /// <summary>
- /// 鏀寰�
- /// </summary>
- [ExcelColumn(Name = "鏀寰�", Width = 25)]
- public string BranchOuterDiameter { get; set; }
-
- /// <summary>
- /// 鏀澹佸帤
- /// </summary>
- [ExcelColumn(Name = "鏀澹佸帤", Width = 25)]
- public string BranchWallThickness { get; set; }
-
- /// <summary>
- /// 鏀鏉愯川
- /// </summary>
- [ExcelColumn(Name = "鏀鏉愯川", Width = 25)]
- public string BranchMaterial { get; set; }
-
- /// <summary>
- /// 鏀绔彛鏇茬巼鍗婂緞
- /// </summary>
- [ExcelColumn(Name = "鏀绔彛鏇茬巼鍗婂緞", Width = 25)]
- public string BranchPortRadius { get; set; }
-
- /// <summary>
- /// 鏀绔彛瑙掑害
- /// </summary>
- [ExcelColumn(Name = "鏀绔彛瑙掑害", Width = 25)]
- public string BranchPortAngle { get; set; }
-
- /// <summary>
- /// 鏀绔彛瑕佹眰
- /// </summary>
- [ExcelColumn(Name = "鏀绔彛瑕佹眰", Width = 25)]
- public string BranchPortRequirement { get; set; }
-
- /// <summary>
- /// 鐩歌疮绾跨被鍨�
- /// </summary>
- [ExcelColumn(Name = "鐩歌疮绾跨被鍨�", Width = 25)]
- public string IntersectingLineType { get; set; }
-
- /// <summary>
- /// 鐩歌疮绾跨被鍒�
- /// </summary>
- [ExcelColumn(Name = "鐩歌疮绾跨被鍒�", Width = 25)]
- public string IntersectingLineCategory { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍥惧箙
- /// </summary>
- [ExcelColumn(Name = "鎴愬搧鍥惧箙", Width = 25)]
- public string FinishedProductScale { get; set; }
-
- /// <summary>
- /// 娉曞叞鍘氬害
- /// </summary>
- [ExcelColumn(Name = "娉曞叞鍘氬害", Width = 25)]
- public string FlangeThickness { get; set; }
-
- /// <summary>
- /// 娉曞叞鍐呭緞
- /// </summary>
- [ExcelColumn(Name = "娉曞叞鍐呭緞", Width = 25)]
- public string FlangeInnerDiameter { get; set; }
-
- /// <summary>
- /// 鐒婃帴鐑緭鍏�
- /// </summary>
- [ExcelColumn(Name = "鐒婃帴鐑緭鍏�", Width = 25)]
- public string WeldingHeatInput { get; set; }
-
- /// <summary>
- /// 绠￠亾鍏佽搴斿姏
- /// </summary>
- [ExcelColumn(Name = "绠￠亾鍏佽搴斿姏", Width = 25)]
- public string PipeAllowableStress { get; set; }
-
- /// <summary>
- /// 绠″緞
- /// </summary>
- [ExcelColumn(Name = "绠″緞", Width = 25)]
- public string PipeDiameter { get; set; }
-
- /// <summary>
- /// 绠￠亾澹佸帤
- /// </summary>
- [ExcelColumn(Name = "绠￠亾澹佸帤", Width = 25)]
- public string PipeWallThickness { get; set; }
-
- /// <summary>
- /// VR鏁版嵁
- /// </summary>
- [ExcelColumn(Name = "VR鏁版嵁", Width = 25)]
- public string VRData { get; set; }
-
- /// <summary>
- /// 宸ヨ壓璺嚎缂栧彿
- /// </summary>
- [ExcelColumn(Name = "宸ヨ壓璺嚎缂栧彿", Width = 25)]
+ [ExcelColumn(Name = "宸ヨ壓娴佸悜缂栧彿", Width = 25)]
public string ProcessRouteNumber { get; set; }
/// <summary>
@@ -269,46 +197,46 @@
public DateTime PlannedEndTime { get; set; }
/// <summary>
- /// 鏃堕棿淇℃伅
+ /// 鐝粍淇℃伅
/// </summary>
- [ExcelColumn(Name = "鏃堕棿淇℃伅", Width = 25)]
- public string TimeInfo { get; set; }
+ [ExcelColumn(Name = "鐝粍淇℃伅", Width = 25)]
+ public string TeamInfo { get; set; }
/// <summary>
- ///
+ /// 鏃堕棿鎴�
/// </summary>
- [ExcelColumn(Name = "", Width = 25)]
- public string RedundantField1 { get; set; }
+ [ExcelColumn(Name = "鏃堕棿鎴�", Width = 25)]
+ public string Timestamp { get; set; }
/// <summary>
- ///
+ /// 鍒涘缓鏃堕棿
/// </summary>
- [ExcelColumn(Name = "", Width = 25)]
- public string RedundantField2 { get; set; }
+ [ExcelColumn(Name = "鍒涘缓鏃堕棿", Width = 25)]
+ public DateTime CreationTime { get; set; }
/// <summary>
- ///
+ /// 淇敼鏃堕棿
/// </summary>
- [ExcelColumn(Name = "", Width = 25)]
- public string RedundantField3 { get; set; }
+ [ExcelColumn(Name = "淇敼鏃堕棿", Width = 25)]
+ public DateTime LastModificationTime { get; set; }
/// <summary>
- /// 鎺掑簭
+ /// 鍒涘缓浜�
/// </summary>
- [ExcelColumn(Name = "鎺掑簭", Width = 25)]
- public int Sort { get; set; }
+ [ExcelColumn(Name = "鍒涘缓浜�", Width = 25)]
+ public string CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ [ExcelColumn(Name = "淇敼浜�", Width = 25)]
+ public string LastModifierName { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
[ExcelColumn(Name = "澶囨敞", Width = 25)]
public string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)]
- public bool? IsDisabled { get; set; }
--
Gitblit v1.9.3