|
|
@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
|
|
|
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
|
|
|
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
|
|
|
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
|
|
|
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
|
|
|
@ -69,6 +70,7 @@ public class SysPojoVersionService extends CrudService<SysPojoVersion> implement
|
|
|
|
String userName = model.getUserName();
|
|
|
|
String userName = model.getUserName();
|
|
|
|
Long roleId = model.getRoleId();
|
|
|
|
Long roleId = model.getRoleId();
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
|
|
|
|
|
|
|
|
DdlPackBean packBeanPlan = DdlPackBean.getDdlPackBean();
|
|
|
|
if (Strings.isNotBlank(userName)){
|
|
|
|
if (Strings.isNotBlank(userName)){
|
|
|
|
DdlPreparedPack.getStringEqualPack(userName, "modifyUser", packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(userName, "modifyUser", packBean);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -83,7 +85,10 @@ public class SysPojoVersionService extends CrudService<SysPojoVersion> implement
|
|
|
|
DdlPreparedPack.timeBuilder(startDate, endDate, "modifyDatetime", true, false, packBean);
|
|
|
|
DdlPreparedPack.timeBuilder(startDate, endDate, "modifyDatetime", true, false, packBean);
|
|
|
|
List<SysPojoVersion> pojoVersions = pojoVersionRDao.findByHqlWhere(packBean);
|
|
|
|
List<SysPojoVersion> pojoVersions = pojoVersionRDao.findByHqlWhere(packBean);
|
|
|
|
|
|
|
|
|
|
|
|
List<SysPojoVersionPlan> pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(packBean);
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",packBeanPlan);
|
|
|
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",packBeanPlan);
|
|
|
|
|
|
|
|
List<SysPojoVersionPlan> pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(packBeanPlan);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pojoVersions.stream().parallel().forEach(d -> {
|
|
|
|
pojoVersions.stream().parallel().forEach(d -> {
|
|
|
|
Optional<SysPojoVersionPlan> plan = pojoVersionPlans.stream().filter(p -> d.getPlanId().equals(p.getId())).findFirst();
|
|
|
|
Optional<SysPojoVersionPlan> plan = pojoVersionPlans.stream().filter(p -> d.getPlanId().equals(p.getId())).findFirst();
|
|
|
|