sql过滤条件更新

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -325,7 +325,7 @@ public class TimerServiceImpl implements TimerService {
     @SneakyThrows
     @Override
     public  Map<String, Object> projectAnalysisGroup(Map<String, Object> data){
-        final String[] sql = {"","",""};
+        final String[] sql = {"","","","","",""};
         /*分页*/
         int pageStart = (Integer.parseInt(data.get("page").toString()) - 1) * (Integer.parseInt(data.get("num").toString())-1);
         int pageSize = Integer.parseInt(data.get("num").toString()) - 1;
@@ -477,8 +477,11 @@ public class TimerServiceImpl implements TimerService {
             sql[0] = sql[0] +  "  order by `month` DESC LIMIT " + pageStart + "," + pageSize;
             sql[2] = sql[2] +  " GROUP BY `month` ";
             log.info("sql[0]:{}",sql[0]);
-
         }
+        sql[3]="SELECT DISTINCT project_name FROM lanyun_project_analysis;";
+        sql[4]="SELECT DISTINCT format FROM lanyun_project_analysis;";
+        sql[5]="SELECT DISTINCT customer_system FROM lanyun_project_analysis;";
+
 //        Class.forName(driver);
 //        Connection connection = DriverManager.getConnection(url, username, password);
 //        Statement statement = connection.createStatement();
@@ -489,9 +492,12 @@ public class TimerServiceImpl implements TimerService {
         if (result.size() >0) {
             totalCount = Integer.parseInt(result.get(0).get("total_count").toString());
         }
+        List<Map<String, Object>> projects = jdbcTemplate.queryForList(sql[3]);
+        List<Map<String, Object>> formats = jdbcTemplate.queryForList(sql[4]);
+        List<Map<String, Object>> customers = jdbcTemplate.queryForList(sql[5]);
         analysisList.add(analysisSum.get(0));
         log.info("results:{}",analysisList);
-        Map<String, Object> map = UtilMap.map("totalCount, data", totalCount, analysisList);
+        Map<String, Object> map = UtilMap.map("totalCount, data, projects, formats, customers", totalCount, analysisList,projects,formats,customers);
         if (ObjectUtil.isNotNull(analysisList)&&analysisList.size()>0){
             return map;
         }