|
|
@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack;
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.*;
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.*;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
@ -859,6 +861,22 @@ public class CoreHqlPack {
|
|
|
|
return result.toString();
|
|
|
|
return result.toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
|
|
|
|
|
|
|
|
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// hql拼接
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean);
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean);
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加默认排序
|
|
|
|
|
|
|
|
HqlPack.getOrderDefault(sysLabelTemplate);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ddlPackBean;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 打印模板参数复杂查询
|
|
|
|
* 打印模板参数复杂查询
|
|
|
|
* @param sysLabelTemplateParam
|
|
|
|
* @param sysLabelTemplateParam
|
|
|
|