|
@@ -209,11 +209,11 @@ public class StaffTrainServiceImpl implements StaffTrainService {
|
|
|
public List<TrainRankDto> getUserTrainRank(String dept, String dateCondition,String version){
|
|
public List<TrainRankDto> getUserTrainRank(String dept, String dateCondition,String version){
|
|
|
String sql = "";
|
|
String sql = "";
|
|
|
if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
|
|
if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
|
|
|
- sql = "SELECT a.ren_yuan_id_ userId,e.NAME_ userName,a.rank as count from (select ren_yuan_id_,COUNT(ren_yuan_id_)as rank from t_qdxxb " +
|
|
|
|
|
|
|
+ sql = "SELECT a.ren_yuan_id_ userId,e.NAME_ userName,a.`rank` as count from (select ren_yuan_id_,COUNT(ren_yuan_id_)as `rank` from t_qdxxb " +
|
|
|
"where guan_lian_id_ in(select id_ from t_lhrypxjlb where pei_xun_zhuang_ta='已结束' %s) " +
|
|
"where guan_lian_id_ in(select id_ from t_lhrypxjlb where pei_xun_zhuang_ta='已结束' %s) " +
|
|
|
"GROUP BY ren_yuan_id_) a ,ibps_party_employee e WHERE e.id_=a.ren_yuan_id_ ";
|
|
"GROUP BY ren_yuan_id_) a ,ibps_party_employee e WHERE e.id_=a.ren_yuan_id_ ";
|
|
|
}else{
|
|
}else{
|
|
|
- sql = "SELECT a.ren_yuan_id_ userId,e.NAME_ userName,a.rank as count from (select ren_yuan_id_,COUNT(ren_yuan_id_)as rank from t_qdxxb " +
|
|
|
|
|
|
|
+ sql = "SELECT a.ren_yuan_id_ userId,e.NAME_ userName,a.`rank` as count from (select ren_yuan_id_,COUNT(ren_yuan_id_)as `rank` from t_qdxxb " +
|
|
|
"where guan_lian_id_ in(select id_ from t_rypxcjb where shi_fou_guo_shen_='已结束' %s) " +
|
|
"where guan_lian_id_ in(select id_ from t_rypxcjb where shi_fou_guo_shen_='已结束' %s) " +
|
|
|
"GROUP BY ren_yuan_id_) a ,ibps_party_employee e WHERE e.id_=a.ren_yuan_id_ ";
|
|
"GROUP BY ren_yuan_id_) a ,ibps_party_employee e WHERE e.id_=a.ren_yuan_id_ ";
|
|
|
}
|
|
}
|
|
@@ -221,7 +221,7 @@ public class StaffTrainServiceImpl implements StaffTrainService {
|
|
|
if (BeanUtils.isNotEmpty(dept)){
|
|
if (BeanUtils.isNotEmpty(dept)){
|
|
|
dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s'", dept);
|
|
dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s'", dept);
|
|
|
}
|
|
}
|
|
|
- sql = sql + " ORDER BY a.rank desc ";
|
|
|
|
|
|
|
+ sql = sql + " ORDER BY a.`rank` desc ";
|
|
|
sql = String.format(sql,dateCondition);
|
|
sql = String.format(sql,dateCondition);
|
|
|
List<Map<String,Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
|
|
List<Map<String,Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
|
|
|
List<TrainRankDto> rankedResults = new ArrayList<>();
|
|
List<TrainRankDto> rankedResults = new ArrayList<>();
|