查询条件补充

yun-zuoyi
汪云昊 5 years ago
parent 929c0ad79e
commit 9b949f7719

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
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;
@ -74,9 +75,9 @@ public class SysConfigService implements ISysConfigService {
pager = PagerHelper.getPager(pager, SysConfigRDao.listCount());
return new ListPager(SysConfigRDao.listPager(pager),pager);
}else {
String hqlPack = CoreHqlPack.packHqlSysConfig(sysConfig);
DdlPackBean hqlPack = CoreHqlPack.packHqlSysConfig(sysConfig);
pager = PagerHelper.getPager(pager, SysConfigRDao.findByHqlWhereCount(hqlPack));
return new ListPager(SysConfigRDao.findByHqlWherePage(hqlPack + sysConfig.orderBy(),pager),pager);
return new ListPager(SysConfigRDao.findByHqlWherePage(hqlPack, pager), pager);
}
}

@ -6,6 +6,7 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.BeanCopyTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
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;
@ -121,9 +122,9 @@ public class SysFileServiceImpl implements ISysFileService {
pager = PagerHelper.getPager(pager, sysFileRDao.listCount());
return new ListPager(sysFileRDao.listPager(pager), pager);
} else {
String hqlPack = CoreHqlPack.packHqlSysFile(sysFile);
DdlPackBean hqlPack = CoreHqlPack.packHqlSysFile(sysFile);
pager = PagerHelper.getPager(pager, sysFileRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack + sysFile.orderBy(), pager), pager);
return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack, pager), pager);
}
}

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
import cn.estsh.i3plus.core.apiservice.util.OrderNoMakeUtil;
import cn.estsh.i3plus.platform.common.tool.StringTool;
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;
@ -81,9 +82,9 @@ public class SysOrderNoRuleService implements ISysOrderNoRuleService {
pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.listCount());
return new ListPager(sysOrderNoRuleRDao.listPager(pager), pager);
} else {
String hqlPack = CoreHqlPack.packHqlSysOrderNoRule(sysOrderNoRule);
DdlPackBean hqlPack = CoreHqlPack.packHqlSysOrderNoRule(sysOrderNoRule);
pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysOrderNoRuleRDao.findByHqlWherePage(hqlPack + sysOrderNoRule.orderBy(), pager), pager);
return new ListPager(sysOrderNoRuleRDao.findByHqlWherePage(hqlPack, pager), pager);
}
}

@ -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);
}
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
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;
@ -126,13 +127,13 @@ public class SysTaskService implements ISysTaskService {
@Override
@ApiOperation(value = "任务管理复杂查询,分页,排序",notes = "任务管理复杂查询,分页,排序")
public ListPager<SysTask> querySysTaskByPager(SysTask sysTask, Pager pager) {
if(sysTask == null) {
if (sysTask == null) {
pager = PagerHelper.getPager(pager, sysTaskRDao.listCount());
return new ListPager(sysTaskRDao.listPager(pager),pager);
}else {
String hqlPack = CoreHqlPack.packHqlSysTask(sysTask);
return new ListPager(sysTaskRDao.listPager(pager), pager);
} else {
DdlPackBean hqlPack = CoreHqlPack.packHqlSysTask(sysTask);
pager = PagerHelper.getPager(pager, sysTaskRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack + sysTask.orderBy(),pager),pager);
return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack, pager), pager);
}
}

Loading…
Cancel
Save