Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/controller/StatisticController.java

@@ -74,7 +74,8 @@ public class StatisticController extends GenericProvider {
                                                                @RequestParam(name = "version", required = false) String version) {
         APIResult<List<TrainingDashBoardDTO>> result = new APIResult<>();
         try {
-            List<TrainingDashBoardDTO> labsDashBoard = statisticService.getTrainingDashBoard(dept,type,date,typeProportion,version);
+            //List<TrainingDashBoardDTO> labsDashBoard = statisticService.getTrainingDashBoard(dept,type,date,typeProportion,version);
+            List<TrainingDashBoardDTO> labsDashBoard = statisticService.getTrainingDashBoard(dept,type,date,typeProportion);
             result.setData(labsDashBoard);
         } catch (Exception e) {
             setExceptionResult(result, StateEnum.ILLEGAL_REQUEST.getCode(), I18nUtil.getMessage(StateEnum.ILLEGAL_REQUEST.getCode() + ""), e);
@@ -106,7 +107,8 @@ public class StatisticController extends GenericProvider {
                                                                @RequestParam(name = "version", required = false) String version) {
         APIResult<List<TrainingDashBoardBlkDTO>> result = new APIResult<>();
         try {
-            List<TrainingDashBoardBlkDTO> labsDashBoard = staffTrainService.getTrainingDashBoardByBlk(dept,type,date,version);
+            //List<TrainingDashBoardBlkDTO> labsDashBoard = staffTrainService.getTrainingDashBoardByBlk(dept,type,date,version);
+            List<TrainingDashBoardBlkDTO> labsDashBoard = staffTrainService.getTrainingDashBoardByBlk(dept,type,date);
             result.setData(labsDashBoard);
         } catch (Exception e) {
             setExceptionResult(result, StateEnum.ILLEGAL_REQUEST.getCode(), I18nUtil.getMessage(StateEnum.ILLEGAL_REQUEST.getCode() + ""), e);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/StaffTrainService.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 public interface StaffTrainService {
 
-    List<TrainingDashBoardBlkDTO> getTrainingDashBoardByBlk(String dept, String type, String date,String version);
+   // List<TrainingDashBoardBlkDTO> getTrainingDashBoardByBlk(String dept, String type, String date,String version);
+    List<TrainingDashBoardBlkDTO> getTrainingDashBoardByBlk(String dept, String type, String date);
 
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/StatisticService.java

@@ -12,8 +12,8 @@ public interface StatisticService {
     List<Map<String, Object>> getRiskReport(String riskId, String type);
     List<LabsDashBoardDTO> getLabsDashBoard(String year, String filter);
 
-    List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String type, String date,String typeProportion,String version);
-
+    //List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String type, String date,String typeProportion,String version);
+    List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String type, String date,String typeProportion);
     List<EquipmentDashBoardDTO> getEquipmentDashBoard();
 
     Map<String,Object> getTrainingDashBoardByDfx(String dept, String type, String date);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/StaffTrainServiceImpl.java

@@ -32,14 +32,14 @@ public class StaffTrainServiceImpl implements StaffTrainService {
     private ICommonDao<?> commonDao;
 
     @Override
-    public List<TrainingDashBoardBlkDTO> getTrainingDashBoardByBlk(String dept, String types, String dates,String version) {
-
+    public List<TrainingDashBoardBlkDTO> getTrainingDashBoardByBlk(String dept, String types, String dates) {
+       // public List<TrainingDashBoardBlkDTO> getTrainingDashBoardByBlk(String dept, String types, String dates,String version) {
         List<TrainingDashBoardBlkDTO> list = new ArrayList<>();
         TrainingDashBoardBlkDTO dashBoardDTO = new TrainingDashBoardBlkDTO();
 
         // 近一周发布计划
-        dashBoardDTO.setWeekDtoList(getLastSeven(dept,version));
-
+        dashBoardDTO.setWeekDtoList(getLastSeven(dept));
+        //dashBoardDTO.setWeekDtoList(getLastSeven(dept,version));
         String dateCondition = "";String year = "";
 
         // 在岗人员培训统计情况
@@ -56,17 +56,17 @@ public class StaffTrainServiceImpl implements StaffTrainService {
         }
 
         // 在岗培训计划  自动创建  or 手动创建
-        dashBoardDTO.setPlanDto(getPlanRate(dept,dateCondition,version));
-
+        dashBoardDTO.setPlanDto(getPlanRate(dept,dateCondition));
+        //dashBoardDTO.setPlanDto(getPlanRate(dept,dateCondition,version));
         // 在岗个人培训次数排名
-        dashBoardDTO.setUserRankList(getUserTrainRank(dept,dateCondition,version));
-
+        dashBoardDTO.setUserRankList(getUserTrainRank(dept,dateCondition));
+        //dashBoardDTO.setUserRankList(getUserTrainRank(dept,dateCondition,version));
         // 在岗培训类别占比
-        dashBoardDTO.setTypeDto(getTypeRate(dept,dateCondition,version));
-
+        dashBoardDTO.setTypeDto(getTypeRate(dept,dateCondition));
+        //dashBoardDTO.setTypeDto(getTypeRate(dept,dateCondition,version));
         // 在岗培训对象占比
-        dashBoardDTO.setObjectDto(getObjectRate(dept,dateCondition,version));
-
+        dashBoardDTO.setObjectDto(getObjectRate(dept,dateCondition));
+        //dashBoardDTO.setObjectDto(getObjectRate(dept,dateCondition,version));
         //  本年度岗前培训计划
         //dashBoardDTO.setNdgqpxList(getCurrentYearData(getYearMonth(),dept,year));
 
@@ -130,21 +130,22 @@ public class StaffTrainServiceImpl implements StaffTrainService {
         return list;
     }
 
-    public TrainObjectBlkDTO getObjectRate(String dept,String dateCondition,String version){
+    public TrainObjectBlkDTO getObjectRate(String dept,String dateCondition){
+       // public TrainObjectBlkDTO getObjectRate(String dept,String dateCondition,String version){
         TrainObjectBlkDTO objectDto = new TrainObjectBlkDTO();
         objectDto.setRemark("在岗培训对象占比");
         List<TrainRateBlkDTO> rateDtoList = new ArrayList<>();
         String sql ="";
         String talSql ="";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-            sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_lhrypxjlb where " +
-                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_xing_";
-            talSql = "SELECT COUNT(*) as total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//            sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_lhrypxjlb where " +
+//                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_xing_";
+//            talSql = "SELECT COUNT(*) as total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
+//        }else{
             sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_rypxcjb where " +
                     " shi_fou_guo_shen_='已结束' %s group by pei_xun_lei_xing_";
             talSql  = "SELECT COUNT(*) as total_num from t_rypxcjb where  shi_fou_guo_shen_='已结束' %s ";
-        }
+//        }
 
         dateCondition += String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
@@ -167,21 +168,22 @@ public class StaffTrainServiceImpl implements StaffTrainService {
         return objectDto;
     }
 
-    public TrainTypeBlkDTO getTypeRate(String dept,String dateCondition,String version){
+    public TrainTypeBlkDTO getTypeRate(String dept,String dateCondition){
+      //  public TrainTypeBlkDTO getTypeRate(String dept,String dateCondition,String version){
         TrainTypeBlkDTO typeDto = new TrainTypeBlkDTO();
         typeDto.setRemark("在岗培训类别占比");
         List<TrainRateBlkDTO> rateDtoList = new ArrayList<>();
         String sql = "";
         String talSql = "";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
-                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_bie_";
-            talSql = "select COUNT(*) AS total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
+//                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_bie_";
+//            talSql = "select COUNT(*) AS total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
+//        }else{
            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_rypxcjb where " +
                     " shi_fou_guo_shen_='已结束' %s group by pei_xun_lei_bie_";
             talSql = "select COUNT(*) AS total_num from t_rypxcjb where  shi_fou_guo_shen_='已结束' %s ";
-        }
+//        }
         dateCondition += String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
             dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s' ", dept);
@@ -203,17 +205,18 @@ public class StaffTrainServiceImpl implements StaffTrainService {
         return typeDto;
     }
 
-    public List<TrainRankDto> getUserTrainRank(String dept, String dateCondition,String version){
+    public List<TrainRankDto> getUserTrainRank(String dept, String dateCondition){
+       // public List<TrainRankDto> getUserTrainRank(String dept, String dateCondition,String version){
         String sql = "";
-        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 " +
-                    "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_ ";
-        }else{
+//        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 " +
+//                    "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_ ";
+//        }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 " +
                     "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_ ";
-        }
+//        }
         dateCondition += String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
             dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s'", dept);
@@ -234,22 +237,23 @@ public class StaffTrainServiceImpl implements StaffTrainService {
         return rankedResults;
     }
 
-    public TrainGuardAutoPlanDto getPlanRate(String dept, String dateCondition,String version){
+    public TrainGuardAutoPlanDto getPlanRate(String dept, String dateCondition){
+       // public TrainGuardAutoPlanDto getPlanRate(String dept, String dateCondition,String version){
         TrainGuardAutoPlanDto planDto = new TrainGuardAutoPlanDto();
         String planSql = "";
         String sumSql = "";
         String condition = "";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-            planSql = "select count(*) as auto from t_lhrypxjlb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
-                    "where di_dian_='" + getDiDian() + "') %s";
-            sumSql = "select count(*) as total from t_lhrypxjlb where 1=1 %s ";
-            condition = String.format(" AND di_dian_ = '%s' and pei_xun_zhuang_ta='已结束' ", getDiDian());
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//            planSql = "select count(*) as auto from t_lhrypxjlb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
+//                    "where di_dian_='" + getDiDian() + "') %s";
+//            sumSql = "select count(*) as total from t_lhrypxjlb where 1=1 %s ";
+//            condition = String.format(" AND di_dian_ = '%s' and pei_xun_zhuang_ta='已结束' ", getDiDian());
+//        }else{
             planSql = "select count(*) as auto from t_rypxcjb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
                     "where di_dian_='" + getDiDian() + "') %s";
             sumSql = "select count(*) as total from t_rypxcjb where 1=1 %s ";
             condition = String.format(" AND di_dian_ = '%s' and shi_fou_guo_shen_='已结束' ", getDiDian());
-        }
+//        }
         if (BeanUtils.isNotEmpty(dept)){
             condition += String.format(" AND bian_zhi_bu_men_ = '%s' ", dept);
         }
@@ -341,7 +345,8 @@ public class StaffTrainServiceImpl implements StaffTrainService {
         return statisticsDtoList;
     }
 
-    public List<TrainWeekDto> getLastSeven(String dept,String version){
+    public List<TrainWeekDto> getLastSeven(String dept){
+       // public List<TrainWeekDto> getLastSeven(String dept,String version){
         List<TrainWeekDto> weekDtoList = new ArrayList<>();
         List<String> lastWeek = getLastSevenDaysDates();
         for (String dateStr : lastWeek) {
@@ -349,13 +354,13 @@ public class StaffTrainServiceImpl implements StaffTrainService {
             weekDto.setDate(dateStr);
             weekDto.setDayName(getDayName(dateStr));
             String sql = "";
-            if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-                sql = "select count(*) value from t_lhrypxjlb where  pei_xun_zhuang_ta='未发布' " +
-                        " and di_dian_='%s' and date_format(pei_xun_shi_jian_,'%%Y-%%m-%%d')='%s' ";
-            }else{
+//            if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//                sql = "select count(*) value from t_lhrypxjlb where  pei_xun_zhuang_ta='未发布' " +
+//                        " and di_dian_='%s' and date_format(pei_xun_shi_jian_,'%%Y-%%m-%%d')='%s' ";
+//            }else{
                 sql = "select count(*) value from t_rypxcjb where  shi_fou_guo_shen_='未发布' " +
                         " and di_dian_='%s' and date_format(pei_xun_shi_jian_,'%%Y-%%m-%%d')='%s' ";
-            }
+//            }
             if (BeanUtils.isNotEmpty(dept)){
                 sql = sql+" and bian_zhi_bu_men_ = '%s'";
                 sql = String.format(sql,getDiDian(),dateStr,dept);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/StatisticServiceImpl.java

@@ -68,14 +68,14 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     @Override
-    public List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String types11, String dates,String typeProportion,String version) {
-
+    //public List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String types11, String dates,String typeProportion,String version) {
+      public List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String types11, String dates,String typeProportion) {
         List<TrainingDashBoardDTO> list = new ArrayList<>();
         TrainingDashBoardDTO dashBoardDTO = new TrainingDashBoardDTO();
 
         // 近一周发布计划
-        dashBoardDTO.setWeekDtoList(getLastSeven(dept,version));
-
+        //dashBoardDTO.setWeekDtoList(getLastSeven(dept,version));
+        dashBoardDTO.setWeekDtoList(getLastSeven(dept));
         //    type       value
         // 周 week  本周 nowWeek  上周 lastWeek  下周 nextWeek
 //        if ("week".equals(type)){
@@ -134,23 +134,24 @@ public class StatisticServiceImpl implements StatisticService {
         }
 
         // 在岗培训计划  自动创建  or 手动创建
-        dashBoardDTO.setPlanDto(getPlanRate(dept,dateCondition,version));
-
+        //dashBoardDTO.setPlanDto(getPlanRate(dept,dateCondition,version));
+        dashBoardDTO.setPlanDto(getPlanRate(dept,dateCondition));
         // 在岗个人培训次数排名
-        dashBoardDTO.setUserRankList(getUserTrainRank(dept,dateCondition,version));
+        dashBoardDTO.setUserRankList(getUserTrainRank(dept,dateCondition));
+        //dashBoardDTO.setUserRankList(getUserTrainRank(dept,dateCondition,version));
 
         // 在岗培训类别占比
-        dashBoardDTO.setTypeDto(getTypeRate(dept,dateCondition,typeProportion,version));
-
+        //dashBoardDTO.setTypeDto(getTypeRate(dept,dateCondition,typeProportion,version));
+        dashBoardDTO.setTypeDto(getTypeRate(dept,dateCondition,typeProportion));
         // 在岗培训对象占比
-        dashBoardDTO.setObjectDto(getObjectRate(dept,dateCondition,version));
-
+        //dashBoardDTO.setObjectDto(getObjectRate(dept,dateCondition,version));
+        dashBoardDTO.setObjectDto(getObjectRate(dept,dateCondition));
         //  本年度岗前培训计划
-        dashBoardDTO.setNdgqpxList(getCurrentYearData(getYearMonth(),dept,year,version));
-
+        //dashBoardDTO.setNdgqpxList(getCurrentYearData(getYearMonth(),dept,year,version));
+        dashBoardDTO.setNdgqpxList(getCurrentYearData(getYearMonth(),dept,year));
         //  本年度岗前培训类别占比
-        dashBoardDTO.setYearPreWorkDto(getYearPre(dept,year,version));
-
+        //dashBoardDTO.setYearPreWorkDto(getYearPre(dept,year,version));
+        dashBoardDTO.setYearPreWorkDto(getYearPre(dept,year));
         list.add(dashBoardDTO);
         return list;
     }
@@ -896,22 +897,23 @@ public class StatisticServiceImpl implements StatisticService {
         }
     }
 
-    public TrainGuardAutoPlanDto getPlanRate(String dept,String dateCondition,String version){
+    //public TrainGuardAutoPlanDto getPlanRate(String dept,String dateCondition,String version){
+    public TrainGuardAutoPlanDto getPlanRate(String dept,String dateCondition){
         TrainGuardAutoPlanDto planDto = new TrainGuardAutoPlanDto();
         String planSql = "";
         String sumSql = "";
         String condition ="";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-            planSql = "select count(*) as auto from t_lhrypxjlb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
-                    "where di_dian_='"+getDiDian()+"') %s";
-            sumSql = "select count(*) as total from t_lhrypxjlb where 1=1 %s ";
-            condition = String.format(" AND di_dian_ = '%s' and pei_xun_zhuang_ta='已结束' ", getDiDian());
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//            planSql = "select count(*) as auto from t_lhrypxjlb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
+//                    "where di_dian_='"+getDiDian()+"') %s";
+//            sumSql = "select count(*) as total from t_lhrypxjlb where 1=1 %s ";
+//            condition = String.format(" AND di_dian_ = '%s' and pei_xun_zhuang_ta='已结束' ", getDiDian());
+//        }else{
           planSql = "select count(*) as auto from t_rypxcjb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
                     "where di_dian_='"+getDiDian()+"') %s";
           sumSql = "select count(*) as total from t_rypxcjb where 1=1 %s ";
           condition = String.format(" AND di_dian_ = '%s' and shi_fou_guo_shen_='已结束' ", getDiDian());
-        }
+//        }
         if (BeanUtils.isNotEmpty(dept)){
             condition += String.format(" AND bian_zhi_bu_men_ = '%s' ", dept);
         }
@@ -929,7 +931,8 @@ public class StatisticServiceImpl implements StatisticService {
         return planDto;
     }
 
-    public List<TrainWeekDto> getLastSeven(String dept,String version){
+    //public List<TrainWeekDto> getLastSeven(String dept,String version){
+        public List<TrainWeekDto> getLastSeven(String dept){
         List<TrainWeekDto> weekDtoList = new ArrayList<>();
         List<String> lastWeek = getLastSevenDaysDates();
         for (String dateStr : lastWeek) {
@@ -937,13 +940,13 @@ public class StatisticServiceImpl implements StatisticService {
             weekDto.setDate(dateStr);
             weekDto.setDayName(getDayName(dateStr));
             String sql = "";
-            if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-              sql = "select count(*) value from t_lhrypxjlb where  pei_xun_zhuang_ta='未发布' " +
-                        " and di_dian_='%s' and date_format(pei_xun_shi_jian_,'%%Y-%%m-%%d')='%s' ";
-            }else{
+//            if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//              sql = "select count(*) value from t_lhrypxjlb where  pei_xun_zhuang_ta='未发布' " +
+//                        " and di_dian_='%s' and date_format(pei_xun_shi_jian_,'%%Y-%%m-%%d')='%s' ";
+//            }else{
               sql = "select count(*) value from t_rypxcjb where  shi_fou_guo_shen_='未发布' " +
                         " and di_dian_='%s' and date_format(pei_xun_shi_jian_,'%%Y-%%m-%%d')='%s' ";
-            }
+//            }
 
             if (BeanUtils.isNotEmpty(dept)){
                 sql = sql+" and bian_zhi_bu_men_ = '%s'";
@@ -970,22 +973,22 @@ public class StatisticServiceImpl implements StatisticService {
         return datesStrings;
     }
 
-
-    public TrainObjectDto getObjectRate(String dept,String dateCondition,String version){
+    public TrainObjectDto getObjectRate(String dept,String dateCondition){
+    //public TrainObjectDto getObjectRate(String dept,String dateCondition,String version){
         TrainObjectDto objectDto = new TrainObjectDto();
         objectDto.setRemark("在岗培训对象占比");
         List<TrainRateDto> rateDtoList = new ArrayList<>();
         String sql ="";
         String talSql ="";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-           sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_lhrypxjlb where " +
-                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_xing_";
-           talSql = "SELECT COUNT(*) as total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//           sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_lhrypxjlb where " +
+//                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_xing_";
+//           talSql = "SELECT COUNT(*) as total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
+//        }else{
            sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_rypxcjb where " +
                     " shi_fou_guo_shen_='已结束' %s group by pei_xun_lei_xing_";
            talSql = "SELECT COUNT(*) as total_num from t_rypxcjb where  shi_fou_guo_shen_='已结束' %s ";
-        }
+//        }
         dateCondition += String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
             dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s' ", dept);
@@ -1007,7 +1010,8 @@ public class StatisticServiceImpl implements StatisticService {
         return objectDto;
     }
 
-    public TrainTypeDto getTypeRate(String dept,String dateCondition,String typeProportion,String version){
+    public TrainTypeDto getTypeRate(String dept,String dateCondition,String typeProportion){
+    //public TrainTypeDto getTypeRate(String dept,String dateCondition,String typeProportion,String version){
         TrainTypeDto typeDto = new TrainTypeDto();
         typeDto.setRemark("在岗培训类别占比");
         List<TrainRateDto> rateDtoList = new ArrayList<>();
@@ -1024,15 +1028,15 @@ public class StatisticServiceImpl implements StatisticService {
         }
         String sql = "";
         String talSql = "";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-           sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
-                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_bie_";
-            talSql = "select COUNT(*) AS total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//           sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
+//                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_bie_";
+//            talSql = "select COUNT(*) AS total_num from t_lhrypxjlb where  pei_xun_zhuang_ta='已结束' %s ";
+//        }else{
            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_rypxcjb where " +
                     " shi_fou_guo_shen_='已结束' %s group by pei_xun_lei_bie_";
             talSql = "select COUNT(*) AS total_num from t_rypxcjb where  shi_fou_guo_shen_='已结束' %s ";
-        }
+//        }
         dateCondition += String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
             dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s' ", dept);
@@ -1054,21 +1058,22 @@ public class StatisticServiceImpl implements StatisticService {
         return typeDto;
     }
 
-    public TrainYearPreWorkDto getYearPre(String dept,String year,String version){
+    public TrainYearPreWorkDto getYearPre(String dept,String year){
+       // public TrainYearPreWorkDto getYearPre(String dept,String year,String version){
         TrainYearPreWorkDto preWorkDto = new TrainYearPreWorkDto();
         preWorkDto.setRemark("本年度岗前培训类别占比");
         List<TrainRateDto> rateDtoList = new ArrayList<>();
         String sql = "";
         String talSql ="";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-           sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
-                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_bie_";
-           talSql = "SELECT count(*) AS total FROM t_lhrypxjlb WHERE pei_xun_zhuang_ta = '已结束' %s ";
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//           sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
+//                    " pei_xun_zhuang_ta='已结束' %s group by pei_xun_lei_bie_";
+//           talSql = "SELECT count(*) AS total FROM t_lhrypxjlb WHERE pei_xun_zhuang_ta = '已结束' %s ";
+//        }else{
            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_rypxcjb where " +
                     " shi_fou_guo_shen_='已结束' %s group by pei_xun_lei_bie_";
            talSql = "SELECT count(*) AS total FROM t_rypxcjb WHERE shi_fou_guo_shen_ = '已结束' %s ";
-        }
+//        }
         String dateCondition = String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
             dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s' ", dept);
@@ -1092,13 +1097,14 @@ public class StatisticServiceImpl implements StatisticService {
         return preWorkDto;
     }
 
-    public List<Map<String, Object>> getCurrentYearData(List<String> dateStr, String dept,String year,String version) {
+    public List<Map<String, Object>> getCurrentYearData(List<String> dateStr, String dept,String year) {
+       // public List<Map<String, Object>> getCurrentYearData(List<String> dateStr, String dept,String year,String version) {
         String baseSql ="";
-        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
-            baseSql = "SELECT count(*) AS total FROM t_lhrypxjlb WHERE pei_xun_zhuang_ta = '已结束' and di_dian_='%s'";
-        }else{
+//        if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+//            baseSql = "SELECT count(*) AS total FROM t_lhrypxjlb WHERE pei_xun_zhuang_ta = '已结束' and di_dian_='%s'";
+//        }else{
             baseSql = "SELECT count(*) AS total FROM t_rypxcjb WHERE shi_fou_guo_shen_ = '已结束' and di_dian_='%s'";
-        }
+//        }
         baseSql = String.format(baseSql,getDiDian());
         List<Map<String, Object>> list = new ArrayList<>();
         for (String date : dateStr) {
@@ -1118,17 +1124,18 @@ public class StatisticServiceImpl implements StatisticService {
         return list;
     }
 
-    public List<TrainRankDto> getUserTrainRank(String dept,String dateCondition,String version){
+    public List<TrainRankDto> getUserTrainRank(String dept,String dateCondition){
+       // public List<TrainRankDto> getUserTrainRank(String dept,String dateCondition,String version){
         String sql = "";
-        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 " +
-                    "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_ ";
-        }else{
+//        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 " +
+//                    "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_ ";
+//        }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 " +
                     "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_ ";
-        }
+//        }
         dateCondition += String.format(" AND di_dian_ = '%s' ", getDiDian());
         if (BeanUtils.isNotEmpty(dept)){
             dateCondition += String.format(" AND bian_zhi_bu_men_ = '%s'", dept);