Browse Source

Merge branch 'dev' into pre-production

master
汤建军 1 year ago
parent
commit
7374b6d1d9
  1. 13
      blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

13
blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@ -367,12 +367,17 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
beIndicatorsVO = indicatorsMapper.selectMyPoints(params);
}
}
if (Func.isNotBlank((String)params.get("startTime"))){
Date start = CommonUtil.getStartByDateStr((String)params.get("startTime"));
String startTime = (String) params.get("startTime");
if (Func.isNotBlank(startTime)){
log.info("startTime>>>>>>>>>>>>>>>",startTime);
Date start = CommonUtil.getStartByDateStr(startTime);
log.info("start>>>>>>>>>>>>>>>",start);
params.put("start",start);
}
if (Func.isNotBlank((String)params.get("endTime"))){
Date end = CommonUtil.getStartByDateStr((String)params.get("endTime"));
String endTime = (String) params.get("endTime");
if (Func.isNotBlank(endTime)){
Date end = CommonUtil.getStartByDateStr(endTime);
params.put("end",end);
}
//查询分数

Loading…
Cancel
Save