报表0729

src/main/java/com/palmnest/dao/repair/impl/RepairBillDaoImpl.java

@@ -897,8 +897,8 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
         if(conditions.get("dateString") != null && StringUtils.isNotEmpty(conditions.get("dateString").toString())){
             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(" 	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,       ");
@@ -920,7 +920,7 @@ public class RepairBillDaoImpl extends GenericDaoHibernate<RepairBill, Long> imp
             sql.append(" and com.id = "+conditions.get("centerId"));
         }
         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())) {

src/main/java/com/palmnest/service/repair/RepairBillStatisticsManager.java

@@ -33,23 +33,13 @@ public interface RepairBillStatisticsManager  {
 	
 	/**
 	 * 获取微信端创建的所有工单数、收费数、费用
-	 * @param orgId
-	 * @param virtId
-	 * @param type
-	 * @param date
-	 * @param endDate
 	 * @return
 	 */
 	Page getAllWxOrder(Map<String, Object> conditions,int type,int pageNo,int pageSize);
 	
 	/**
 	 * 获取订单明细
-	 * @param orgId
-	 * @param virtId
 	 * @param isFree  ==1获取所有工单数的明细 ==0获取收费工单数的明细
-	 * @param type
-	 * @param date
-	 * @param endDate
 	 * @return
 	 */
 	Page getWxAmountOrder(Map<String, Object> conditions,int isFree,int type,int pageNo,int pageSize);

src/main/java/com/palmnest/service/repair/impl/RepairBillStatisticsManagerImpl.java

@@ -509,6 +509,11 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
         }
     }
 
+    @Override
+    public Page getBillCommentList(Map<String, Object> conditions, int type, int pageNo, int pageSize) {
+        return repairBillManager.getBillCommentList(conditions, type, pageNo, pageSize);
+    }
+
     public String exportPeoplecOrderListExcel(List<Map<String, Object>> list, String sheetName, String[] titles, String[] fieldNames) throws IOException {
 
 	    HSSFWorkbook wb = new HSSFWorkbook();