冲突

ningshuxia

2022-08-12 ed3f2dd1fa33920e4813437d1af0b45c571bf193

冲突

 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 
    }
}