1

zrg

10 天以前 2f6a8c72ab934ae59b3b695be3ec0a97ebedc924

 WebAPI/Controllers/Éú²ú¹ÜÀí/É豸״̬·Ö²½/Sc_HEquipStateDistributionController.cs

@@ -270,7 +270,7 @@
                {
                    sql += $"and (所属日期 between CONVERT(DATETIME, '{HBeginDate} 00:00:00', 120) AND CONVERT(DATETIME, '{HEndDate} 23:59:59', 120))";
                }

                sql += " order by æ‰€å±žæ—¥æœŸ desc";
                ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");

                //添加列名
@@ -320,18 +320,18 @@
                {
                    // å–出时间字段并转为日期（自动忽略时分秒）
                    DateTime time = Convert.ToDateTime(row["时间"]);
                    string deptId = row["HDeptID"].ToString();
                    string _HEquipID = row["HEquipID"].ToString();

                    return new
                    {
                        HDate = time.ToString("yyyy-MM-dd"),
                        HDeptID = deptId
                    };// åˆ†ç»„ Key
                        HEquipID = _HEquipID
                    };// åˆ†ç»„ Key HDate_HEquipID
                });

                foreach (var group in groupedData)
                {
                    string dateKey = group.Key.HDate + "_" + HDeptID;
                    string dateKey = group.Key.HDate + "_" + group.Key.HEquipID;
                    JArray dataArray = new JArray();

                    foreach (DataRow row in group)