|
|
|
@ -2,7 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
|
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
|
|
|
|
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
|
|
|
@ -11,11 +11,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
|
|
|
|
|
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
|
|
|
|
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
|
|
|
|
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
|
|
|
|
|
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
|
|
|
@ -160,9 +158,9 @@ public class SysTaskPlanService implements ISysTaskPlanService {
|
|
|
|
|
pager = PagerHelper.getPager(pager, sysTaskPlanRDao.listCount());
|
|
|
|
|
return new ListPager(sysTaskPlanRDao.listPager(pager), pager);
|
|
|
|
|
} else {
|
|
|
|
|
String hqlPack = CoreHqlPack.packHqlSysTaskPlan(sysTaskPlan);
|
|
|
|
|
DdlPackBean hqlPack = CoreHqlPack.packHqlSysTaskPlan(sysTaskPlan);
|
|
|
|
|
pager = PagerHelper.getPager(pager, sysTaskPlanRDao.findByHqlWhereCount(hqlPack));
|
|
|
|
|
return new ListPager(sysTaskPlanRDao.findByHqlWherePage(hqlPack + sysTaskPlan.orderBy(), pager), pager);
|
|
|
|
|
return new ListPager(sysTaskPlanRDao.findByHqlWherePage(hqlPack, pager), pager);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|