schangxiang@126.com
2025-09-18 0454641bf40fe81dad66592a3a03e8c3775d2377
siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
@@ -3306,16 +3306,16 @@
        /// <returns></returns>
        public string QueryPageDeviceGeneralInfo(string param)
        {
            msgss<deviceGeneralInfo> msg = new msgss<deviceGeneralInfo>();
            msgss<deviceGeneralInfoForDetail> msg = new msgss<deviceGeneralInfoForDetail>();
            DeviceGeneralInfoInput page = JsonConvert.DeserializeObject<DeviceGeneralInfoInput>(param);
            try
            {
                using (dbModel mod = new dbModel())
                {
                    List<deviceGeneralInfo> fiveDayDeviceInfo = null;
                    List<deviceGeneralInfoForDetail> fiveDayDeviceInfo = null;
                    if (page.datatime == null)
                    {
                        fiveDayDeviceInfo = mod.deviceGeneralInfo
                        fiveDayDeviceInfo = mod.deviceGeneralInfoForDetail
                           .OrderByDescending(x => x.createTime)
                           .ToList();
                    }
@@ -3323,7 +3323,7 @@
                    {
                        DateTime _startTime = Convert.ToDateTime(page.datatime[0]);
                        DateTime _endTime = Convert.ToDateTime(page.datatime[1]);
                        fiveDayDeviceInfo = mod.deviceGeneralInfo
                        fiveDayDeviceInfo = mod.deviceGeneralInfoForDetail
                           .Where(x => x.createTime >= _startTime && x.createTime <= _endTime)
                           .OrderByDescending(x => x.createTime)
                           .ToList();
@@ -3338,7 +3338,7 @@
                        }
                    }
                    List<deviceGeneralInfo> fenyeRerult = new List<deviceGeneralInfo>();
                    List<deviceGeneralInfoForDetail> fenyeRerult = new List<deviceGeneralInfoForDetail>();
                    if (fiveDayDeviceInfo.Count > 0)
                    {
                        msg.status = 200;