|
|
@@ -1217,7 +1217,22 @@ public class StatisticServiceImpl implements StatisticService {
|
|
|
"WHERE guan_lian_id_ IN (SELECT id_ FROM t_rypxcjb " +
|
|
|
"WHERE shi_fou_guo_shen_ = '已结束' %s) " +
|
|
|
"GROUP BY guan_lian_id_, ren_yuan_id_) AS re";
|
|
|
-
|
|
|
+ String ve = "";
|
|
|
+ try {
|
|
|
+ ve = settingUtil.getPx();
|
|
|
+ }catch (Exception e){
|
|
|
+ logger.warn("json转换异常");
|
|
|
+ }
|
|
|
+ if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
|
|
|
+ countSqlTemplate = countSqlTemplate.replace("t_rypxcjb","t_lhrypxjlb").
|
|
|
+ replace("shi_fou_guo_shen_","pei_xun_zhuang_ta");
|
|
|
+ signSqlTemplate = signSqlTemplate.replace("t_rypxcjb","t_lhrypxjlb").
|
|
|
+ replace("shi_fou_guo_shen_","pei_xun_zhuang_ta");
|
|
|
+ sumRealSqlTemplate = sumRealSqlTemplate.replace("t_rypxcjb","t_lhrypxjlb").
|
|
|
+ replace("shi_fou_guo_shen_","pei_xun_zhuang_ta");
|
|
|
+ }else{
|
|
|
+ logger.warn("StatisticServiceImpl.getYmdData 旧版本");
|
|
|
+ }
|
|
|
for (String date : dateStr) {
|
|
|
TraineeStatisticsDto traineeDto = new TraineeStatisticsDto();
|
|
|
|