|
@ -1901,7 +1901,7 @@ public class SynergyManageService extends BaseJpaService {
|
|
|
String endTime = today+" 23:59:59";
|
|
|
/*startTime="2017-11-15 00:00:00";
|
|
|
endTime="2017-11-22 23:59:59";*/
|
|
|
String sql="SELECT" +
|
|
|
/*String sql="SELECT" +
|
|
|
" u.`code`,"+
|
|
|
" u.`name`," +
|
|
|
" u.`online` as onlineType," +
|
|
@ -1917,6 +1917,31 @@ public class SynergyManageService extends BaseJpaService {
|
|
|
" AND r.answer_status=1"+
|
|
|
" GROUP BY" +
|
|
|
" u.`code`," +
|
|
|
" r.type";*/
|
|
|
String sql="SELECT" +
|
|
|
" u.`code`," +
|
|
|
" u.`name`," +
|
|
|
" u.`online` AS onlineType," +
|
|
|
" r.type," +
|
|
|
" IF (r.type IS NOT NULL, COUNT(*), 0) AS num" +
|
|
|
" FROM" +
|
|
|
" wlyy_user u" +
|
|
|
" LEFT JOIN (" +
|
|
|
" SELECT" +
|
|
|
" type," +
|
|
|
" user_code," +
|
|
|
" user_name" +
|
|
|
" FROM" +
|
|
|
" manage_call_record" +
|
|
|
" WHERE" +
|
|
|
" create_time >= '"+startTime+"'" +
|
|
|
" AND create_time <= '"+endTime+"'" +
|
|
|
" AND answer_status = 1" +
|
|
|
" ) r ON u.`code` = r.user_code" +
|
|
|
" WHERE" +
|
|
|
" u.type = 4" +
|
|
|
" GROUP BY" +
|
|
|
" u.`code`," +
|
|
|
" r.type";
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
|
List<Map<String,Object>> toList = new ArrayList<>();
|
|
@ -1938,6 +1963,10 @@ public class SynergyManageService extends BaseJpaService {
|
|
|
resultMap.put("jieruCount",0);
|
|
|
resultMap.put("waihuCount",map.get("num"));
|
|
|
}
|
|
|
if ("null".equals(type) || StringUtils.isEmpty(type)){
|
|
|
resultMap.put("jieruCount",0);
|
|
|
resultMap.put("waihuCount",0);
|
|
|
}
|
|
|
toList.add(resultMap);
|
|
|
}else {
|
|
|
int count =0;
|
|
@ -1964,6 +1993,10 @@ public class SynergyManageService extends BaseJpaService {
|
|
|
resultMap.put("jieruCount",0);
|
|
|
resultMap.put("waihuCount",map.get("num"));
|
|
|
}
|
|
|
if ("null".equals(type) || StringUtils.isEmpty(type)){
|
|
|
resultMap.put("jieruCount",0);
|
|
|
resultMap.put("waihuCount",0);
|
|
|
}
|
|
|
toList.add(resultMap);
|
|
|
}
|
|
|
}
|