|
|
@@ -77,6 +77,10 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
|
|
|
if (coreSafetyTask.getParams().get("beginTime") != null && coreSafetyTask.getParams().get("endTime") != null) {
|
|
|
query.between("create_time", coreSafetyTask.getParams().get("beginTime"), coreSafetyTask.getParams().get("endTime"));
|
|
|
}
|
|
|
+ if(CollectionUtil.isNotEmpty(coreSafetyTask.getRange()) && coreSafetyTask.getRange().size()==2 ){
|
|
|
+ coreSafetyTask.getRange().set(0,DateUtil.beginOfDay(coreSafetyTask.getRange().get(0)));
|
|
|
+ coreSafetyTask.getRange().set(1,DateUtil.endOfDay(coreSafetyTask.getRange().get(1)));
|
|
|
+ }
|
|
|
coreSafetyTask.setGrantUserId(SecurityUtils.getUserId());
|
|
|
//获取数据
|
|
|
page = coreSafetyTaskMapper.selectCoreSafetyTaskPage(page, coreSafetyTask);
|