系统数据分析老师端家长端学生端问题修改、sql优化

src/main/java/com/ssj/dao/sys/analysis/dao/impl/AnalysisQueryDaoImpl.java

@@ -204,7 +204,7 @@ public class AnalysisQueryDaoImpl  implements AnalysisQueryDao {
         sb.append(" from tb_analysis t  ");
         sb.append(" LEFT JOIN tb_lib_vip v ON t.vip_id=v.id ");
         sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
-        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND TO_DAYS(t.create_time)>=TO_DAYS(?) AND TO_DAYS(t.create_time)<=TO_DAYS(?)  ");
+        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND  day_time between ? and ? ");
         param.add(params.get("libId"));
         param.add(params.get("type"));
         param.add(params.get("source"));
@@ -214,7 +214,7 @@ public class AnalysisQueryDaoImpl  implements AnalysisQueryDao {
         	 sb.append(" and v.child_name like concat('%',?,'%')  ");
         	 param.add(params.get("name"));
         }
-        sb.append(" GROUP BY TO_DAYS(t.create_time),t.vip_id ORDER BY t.create_time asc ");
+        sb.append(" GROUP BY day_time,t.vip_id ORDER BY t.create_time asc ");
         return dao.findPage(sb.toString(),param.toArray(),pageable);
 	}
 	
@@ -227,7 +227,7 @@ public class AnalysisQueryDaoImpl  implements AnalysisQueryDao {
         sb.append(" SELECT t.user_id,u.wx_name,u.photo,u.user_name,t.create_time ");
         sb.append(" from tb_analysis t  ");
         sb.append(" LEFT JOIN tb_user u ON t.user_id=u.id ");
-        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND TO_DAYS(t.create_time)>=TO_DAYS(?) AND TO_DAYS(t.create_time)<=TO_DAYS(?)  ");
+        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND day_time between ? and ?  ");
         param.add(params.get("libId"));
         param.add(params.get("type"));
         param.add(params.get("source"));
@@ -237,7 +237,7 @@ public class AnalysisQueryDaoImpl  implements AnalysisQueryDao {
         	 sb.append(" and u.user_name like concat('%',?,'%')  ");
         	 param.add(params.get("name"));
         }
-        sb.append(" GROUP BY TO_DAYS(t.create_time),t.user_id ORDER BY t.create_time asc ");
+        sb.append(" GROUP BY day_time,t.user_id ORDER BY t.create_time asc ");
         return dao.findPage(sb.toString(),param.toArray(),pageable);
 	}
 

src/main/java/com/ssj/sys/controller/AnalysisController.java

@@ -1000,7 +1000,7 @@ public class AnalysisController extends BaseController {
 		params.put("date", data);
 		params.put("date2", data2);
 		params.put("libId", request.getParameter("libId"));
-		params.put("name", request.getParameter("name"));
+		params.put("name", request.getParameter("name")==null?"":request.getParameter("name"));
 		params.put("source", 2);
 		params.put("type", type);
 
@@ -1220,7 +1220,7 @@ public class AnalysisController extends BaseController {
 		params.put("date", data);
 		params.put("date2", data2);
 		params.put("libId", request.getParameter("libId"));
-		params.put("name", request.getParameter("name"));
+		params.put("name", request.getParameter("name")==null?"":request.getParameter("name"));
 		params.put("source", 3);
 		params.put("type", type);