From 425675051e544cf29b2132615cfbf7a93dc5e51f Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 六月 2022 15:50:59 +0800
Subject: [PATCH] fix(dm): MySQL=》DMSQL
---
src/cn/ksource/web/facade/health/HealthFacadeImpl.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/cn/ksource/web/facade/health/HealthFacadeImpl.java b/src/cn/ksource/web/facade/health/HealthFacadeImpl.java
index f8fa312..17f0054 100644
--- a/src/cn/ksource/web/facade/health/HealthFacadeImpl.java
+++ b/src/cn/ksource/web/facade/health/HealthFacadeImpl.java
@@ -1,27 +1,12 @@
package cn.ksource.web.facade.health;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Service;
-
import cn.ksource.beans.SC_PARTNER_CUSTOMER_INFO;
import cn.ksource.beans.SC_WORKFLOW_CI_HEALTH;
import cn.ksource.beans.WORKFLOW_NODE;
import cn.ksource.core.dao.BaseDao;
import cn.ksource.core.dao.SqlParameter;
import cn.ksource.core.page.PageInfo;
-import cn.ksource.core.util.ConvertUtil;
-import cn.ksource.core.util.DateUtil;
-import cn.ksource.core.util.JsonUtil;
-import cn.ksource.core.util.StringUtil;
-import cn.ksource.core.util.TreeUtil;
+import cn.ksource.core.util.*;
import cn.ksource.core.web.ClientUtil;
import cn.ksource.core.web.SysInfoMsg;
import cn.ksource.core.web.WebUtil;
@@ -31,6 +16,11 @@
import cn.ksource.web.service.file.FileService;
import cn.ksource.web.service.workFlowSupport.WorkFlowSupportService;
import cn.ksource.web.util.DateParepareUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
@Service
@SuppressWarnings("unchecked")
@@ -771,7 +761,7 @@
builder.append("and FLOWSTATE =:nodeState ");
}
builder.append(" order by FLOWSTATE asc ");
- builder.append(" ) t group by FLOWID ");
+ builder.append(" ) t group by FLOWID,NODETIME,NODEID,NODESTATE ");
builder.append(" ) n ");
builder.append(" on b.ID = n.FLOWID ");
//宸ュ崟绫诲瀷
--
Gitblit v1.9.1