From 161509b9f823511cf33041caaf25ce726999e39b Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期一, 27 六月 2022 14:45:30 +0800
Subject: [PATCH] fix : MySQL=》DMSQL

---
 src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java |    2 
 src/cn/ksource/web/facade/desktop/DesktopFacadeImpl.java                        |  111 +++++++++++++++++++++++++++----------------------------
 2 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java b/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
index de3f806..159411c 100644
--- a/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
+++ b/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
@@ -87,7 +87,7 @@
 	 */
 	@Override
 	public List<Map> getCiCategoryTree(String pid) {
-		String sql = " SELECT ID as id,PID as pid,NAME as name,LV as jb FROM CMDB_CI_CATEGORY WHERE STATE=1 AND CATE_TYPE=1 ";
+		String sql = " SELECT ID as \"id\",PID as \"pid\",NAME as \"name\",LV as \"jb\" FROM CMDB_CI_CATEGORY WHERE STATE=1 AND CATE_TYPE=1 ";
 		SqlParameter param = new SqlParameter();
 		if(StringUtil.isNotBlank(pid)){
 			sql += " AND PID=:pid ";
diff --git a/src/cn/ksource/web/facade/desktop/DesktopFacadeImpl.java b/src/cn/ksource/web/facade/desktop/DesktopFacadeImpl.java
index 5f93f0c..81ca72a 100644
--- a/src/cn/ksource/web/facade/desktop/DesktopFacadeImpl.java
+++ b/src/cn/ksource/web/facade/desktop/DesktopFacadeImpl.java
@@ -1,33 +1,30 @@
 package cn.ksource.web.facade.desktop;
 
+import cn.ksource.core.dao.BaseDao;
+import cn.ksource.core.dao.SqlParameter;
+import cn.ksource.core.util.ConvertUtil;
+import cn.ksource.core.util.DateUtil;
+import cn.ksource.core.util.NumberUtil;
+import cn.ksource.core.util.StringUtil;
+import cn.ksource.web.Constants;
+import cn.ksource.web.facade.customermanage.CustomerManageFacade;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 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.core.dao.BaseDao;
-import cn.ksource.core.dao.SqlParameter;
-import cn.ksource.core.util.ConvertUtil;
-import cn.ksource.core.util.DateUtil;
-import cn.ksource.core.util.JsonUtil;
-import cn.ksource.core.util.NumberUtil;
-import cn.ksource.core.util.StringUtil;
-import cn.ksource.web.Constants;
-import cn.ksource.web.facade.customermanage.CustomerManageFacade;
-
 @Service("desktopFacade")
 public class DesktopFacadeImpl implements DesktopFacade {
-	
+
 	@Resource
 	private BaseDao baseDao;
 	@Resource
 	private CustomerManageFacade customerFacade;
-	
+
 	@Override
 	public Map getOperationDeskDetail(String cusId) {
 		String incidentAddNum = getIncidentAddNum(cusId);
@@ -79,7 +76,7 @@
 		info.put("fileDealNum", fileDealNum);
 		return info;
 	}
-	
+
 	/**
 	 * 浜嬩欢鏂板鏁伴噺
 	 * @param cusId
@@ -96,7 +93,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 浜嬩欢澶勭悊鏁伴噺
 	 * @param cusId
@@ -126,8 +123,8 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
-	
+
+
 	/**
 	 * 闂鏂板鏁伴噺
 	 * @param cusId
@@ -144,7 +141,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 闂澶勭悊鏁伴噺
 	 * @param cusId
@@ -178,8 +175,8 @@
 			.addValue("nodeTemplateId",Constants.WTHG);
 		return baseDao.queryForString(builder.toString(),param);
 	}
-	
-	
+
+
 	/**
 	 * 椹诲満杩愮淮鏂板鏁伴噺
 	 * @param cusId
@@ -196,8 +193,8 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
-	
+
+
 	/**
 	 * 椹诲満杩愮淮鏂板鐞嗘暟閲�
 	 * @param cusId
@@ -227,8 +224,8 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
-	
+
+
 	/**
 	 * 鏃ュ父宸℃鏂板鏁伴噺
 	 * @param cusId
@@ -245,7 +242,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 鏃ュ父宸℃澶勭悊鏁伴噺
 	 * @param cusId
@@ -265,8 +262,8 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
-	
+
+
 	/**
 	 * 渚嬭宸℃鏂板鏁伴噺
 	 * @param cusId
@@ -283,7 +280,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 渚嬭宸℃澶勭悊鏁伴噺
 	 * @param cusId
@@ -314,7 +311,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 鍋ュ悍妫�鏌ユ柊澧炴暟閲�
 	 * @param cusId
@@ -329,10 +326,10 @@
 		builder.append(" 	union all ");
 		builder.append(" 	select count(id) num from SC_WORKFLOW_CI_HEALTH where DATE_FORMAT(CREATE_TIME,'%Y%m')= DATE_FORMAT(NOW(),'%Y%m') and CUSTOMER_ID=:cusId ");
 		builder.append(" ) t ");
-		
+
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 鍋ュ悍妫�鏌ュ鐞嗘暟閲�
 	 * @param cusId
@@ -361,7 +358,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 鐭ヨ瘑搴撴柊澧炴暟閲�
 	 * @param cusId
@@ -378,7 +375,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 鐭ヨ瘑搴撳鐞嗘暟閲�
 	 * @param cusId
@@ -401,12 +398,12 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
 	/**
 	 * 閰嶇疆搴撴柊澧炴暟閲�
 	 * @param cusId
@@ -423,7 +420,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 閰嶇疆搴撳鐞嗘暟閲�
 	 * @param cusId
@@ -448,8 +445,8 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
-	
+
+
 	/**
 	 * 婊℃剰搴﹁皟鏌ユ柊澧炴暟閲�
 	 * @param cusId
@@ -466,7 +463,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("cusId",cusId));
 	}
-	
+
 	/**
 	 * 婊℃剰搴﹁皟鏌ュ緱鍒�
 	 * @param cusId
@@ -486,8 +483,8 @@
 		builder.append(" select i.customer_id id,i.all_score score  ");
 		builder.append(" from totle_satis_info i ");
 		builder.append(" where  i.month = date_format(now(),'%Y%m')  ");
-		builder.append(" group by customer_id ");
-		
+		builder.append(" group by customer_id,i.all_score ");
+
 		List<Map> dataList = baseDao.queryForList(builder.toString());
 		Map dataListSet = new HashMap();
 		if(dataList!=null&&dataList.size()>0){
@@ -495,13 +492,13 @@
 				dataListSet.put(map.get("id").toString(), map.get("score"));
 			}
 		}
-		
+
 		List<String> categories = new ArrayList<String>();
 		for(Map map:cusList){
 			String cusName = ConvertUtil.obj2StrBlank(map.get("name"));
 			categories.add(cusName);
 		}
-		
+
 	    List series = new ArrayList<Integer>();
 		for(Map cus:cusList){
 			String key =  ConvertUtil.obj2StrBlank(cus.get("id"));
@@ -522,14 +519,14 @@
 		StringBuilder builder = new StringBuilder();
 		customerFacade.getCusById(cusId);
 		Map cusInfo = customerFacade.getCusById(cusId);
-		
+
 		builder.setLength(0);
 		builder.append(" select CONCAT(d.SATIS_TYPE,'_',i.MONTH) ID,d.SATIS_SCORE SCORE   ");
 		builder.append(" from TOTLE_SATIS_INFO i,TOTLE_SATIS_DETAIL d  ");
 		builder.append(" where i.ID = d.BUS_ID  ");
 		builder.append(" and left(i.MONTH,4) = DATE_FORMAT(now(),'%Y')  ");
 		builder.append(" and i.CUSTOMER_ID = :cusId   ");
-		builder.append(" group by i.MONTH,d.SATIS_TYPE  ");
+		builder.append(" group by i.MONTH,d.SATIS_TYPE,d.SATIS_SCORE  ");
 		List<Map> dataList = baseDao.queryForList(builder.toString(),new SqlParameter("cusId",cusId));
 		Map dataListMap = new HashMap();
 		if(dataList!=null&&dataList.size()>0){
@@ -555,7 +552,7 @@
 		labelList.add("1");
 		labelList.add("3");
 		labelList.add("6");
-		
+
 		List<Map> series = new ArrayList<Map>();
 		for(String label:labelList){
 			Map tempMap = new HashMap();
@@ -584,7 +581,7 @@
 		surveyMap.put("cusInfo",cusInfo);
 		return surveyMap;
 	}
-	
+
 	/**
 	 * 鏂囨。鏂板鏁伴噺
 	 * @param cusId
@@ -601,7 +598,7 @@
 		builder.append(" ) t ");
 		return baseDao.queryForString(builder.toString(),new SqlParameter("shtg",Constants.FILE_STATE_SHTG));
 	}
-	
+
 	/**
 	 * 鏂囨。澶勭悊鏁伴噺
 	 * @param cusId
@@ -627,5 +624,5 @@
 		param.put("shbtg", Constants.FILE_STATE_SHBTG);
 		return baseDao.queryForString(builder.toString(),param);
 	}
-	
+
 }

--
Gitblit v1.9.1