|
@@ -897,8 +897,8 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
|
|
if(conditions.get("dateString") != null && StringUtils.isNotEmpty(conditions.get("dateString").toString())){
|
|
if(conditions.get("dateString") != null && StringUtils.isNotEmpty(conditions.get("dateString").toString())){
|
|
sql.append(" '"+conditions.get("dateString")+"' dateInfo, ");
|
|
sql.append(" '"+conditions.get("dateString")+"' dateInfo, ");
|
|
}
|
|
}
|
|
- sql.append(" com.`name`, ");
|
|
|
|
- sql.append(" orgId,org.`name`, ");
|
|
|
|
|
|
+ sql.append(" com.`name` centerName, ");
|
|
|
|
+ sql.append(" orgId,org.`name` orgName, ");
|
|
sql.append(" AVG(c.star) avgStar, ");
|
|
sql.append(" AVG(c.star) avgStar, ");
|
|
sql.append(" sum(CASE WHEN c.star = 1 THEN 1 ELSE 0 END ) oneStar, ");
|
|
sql.append(" sum(CASE WHEN c.star = 1 THEN 1 ELSE 0 END ) oneStar, ");
|
|
sql.append(" sum(CASE WHEN c.star = 2 THEN 1 ELSE 0 END ) twoStar, ");
|
|
sql.append(" sum(CASE WHEN c.star = 2 THEN 1 ELSE 0 END ) twoStar, ");
|
|
@@ -920,7 +920,7 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
|
|
sql.append(" and com.id = "+conditions.get("centerId"));
|
|
sql.append(" and com.id = "+conditions.get("centerId"));
|
|
}
|
|
}
|
|
if (conditions.get("orgId") != null && StringUtils.isNotEmpty(conditions.get("orgId").toString())) {
|
|
if (conditions.get("orgId") != null && StringUtils.isNotEmpty(conditions.get("orgId").toString())) {
|
|
- sql.append(" and r.orgId = "+conditions.get("orgId"));
|
|
|
|
|
|
+ sql.append(" and t.orgId = "+conditions.get("orgId"));
|
|
}
|
|
}
|
|
|
|
|
|
if (1 == type && conditions.get("date") != null && StringUtils.isNotEmpty(conditions.get("date").toString())) {
|
|
if (1 == type && conditions.get("date") != null && StringUtils.isNotEmpty(conditions.get("date").toString())) {
|