From ed3f2dd1fa33920e4813437d1af0b45c571bf193 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 12 八月 2022 14:40:29 +0800
Subject: [PATCH] 冲突
---
Application/IStation.Application4Product/pump_curve/mapping/PumpCurveMapping_Controller.cs | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/Application/IStation.Application4Product/pump_curve/mapping/PumpCurveMapping_Controller.cs b/Application/IStation.Application4Product/pump_curve/mapping/PumpCurveMapping_Controller.cs
index 6522c4b..9d865f7 100644
--- a/Application/IStation.Application4Product/pump_curve/mapping/PumpCurveMapping_Controller.cs
+++ b/Application/IStation.Application4Product/pump_curve/mapping/PumpCurveMapping_Controller.cs
@@ -258,6 +258,26 @@
return bol;
}
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
+ [Route("SetOfObject@V1.0")]
+ [HttpPost]
+ public bool SetOfObject([Required] SetObjectPumpCurveMappingInput input)
+ {
+ var list = input.Items?.Select(x => new Model.PumpCurveMapping()
+ {
+ CorpID = input.CorpID,
+ CurveID = input.CorpID,
+ ID = x.ID,
+ PumpID = x.PumpID,
+ OtherName = x.OtherName,
+ IsWorking = x.IsWorking,
+ SortCode = x.SortCode,
+ }).ToList();
+ var bol = _service.SetOfObject(input.CorpID, input.CurveID, list);
+ return bol;
+ }
#endregion
@@ -287,30 +307,5 @@
#endregion
-
- #region Set
-
- /// <summary>
- /// 璁剧疆
- /// </summary>
- [Route("SetOfObject@V1.0")]
- [HttpPost]
- public bool SetOfObject([Required] SetObjectPumpCurveMappingInput input)
- {
- var list = input.Items?.Select(x => new Model.PumpCurveMapping()
- {
- CorpID = input.CorpID,
- CurveID = input.CorpID,
- ID = x.ID,
- PumpID = x.PumpID,
- OtherName = x.OtherName,
- IsWorking = x.IsWorking,
- SortCode = x.SortCode,
- }).ToList();
- var bol = _service.SetOfObject(input.CorpID, input.CurveID, list);
- return bol;
- }
-
- #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3