|
|
|
@ -306,18 +306,19 @@ public class CoreHqlPack {
|
|
|
|
|
* @param config
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlSysConfig(SysConfig config) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlSysConfig(SysConfig config) {
|
|
|
|
|
DdlPackBean result = DdlPackBean.getDdlPackBean();
|
|
|
|
|
|
|
|
|
|
// hql拼接
|
|
|
|
|
HqlPack.getStringLikerPack(config.getName(),"name",result);
|
|
|
|
|
HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
|
|
|
|
|
HqlPack.getNumEqualPack(config.getConfigType(),"configType",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(config.getName(),"name",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result);
|
|
|
|
|
|
|
|
|
|
// 添加默认排序
|
|
|
|
|
HqlPack.getOrderDefault(config);
|
|
|
|
|
DdlPreparedPack.getOrderDefault(config);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -337,7 +338,8 @@ public class CoreHqlPack {
|
|
|
|
|
DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
|
|
|
|
|
|
|
|
|
|
// 添加默认排序
|
|
|
|
|
DdlPreparedPack.getOrderDefault(dictionary);
|
|
|
|
@ -407,7 +409,7 @@ public class CoreHqlPack {
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
|
|
|
|
|
|
|
|
|
|
ddlPackBean.setOrderByStr(message.orderBy());
|
|
|
|
|
DdlPreparedPack.getOrderDefault(message);
|
|
|
|
|
|
|
|
|
|
return ddlPackBean;
|
|
|
|
|
}
|
|
|
|
@ -417,19 +419,21 @@ public class CoreHqlPack {
|
|
|
|
|
* @param file
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlSysFile(SysFile file) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlSysFile(SysFile file) {
|
|
|
|
|
DdlPackBean result = DdlPackBean.getDdlPackBean();
|
|
|
|
|
|
|
|
|
|
// hql拼接
|
|
|
|
|
HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result);
|
|
|
|
|
HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
|
|
|
|
|
HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
|
|
|
|
|
HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result);
|
|
|
|
|
DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false);
|
|
|
|
|
|
|
|
|
|
// 添加默认排序
|
|
|
|
|
HqlPack.getOrderDefault(file);
|
|
|
|
|
DdlPreparedPack.getOrderDefault(file);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -455,20 +459,22 @@ public class CoreHqlPack {
|
|
|
|
|
* @param sysTaskPlan
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
|
|
|
|
|
DdlPackBean result = DdlPackBean.getDdlPackBean();
|
|
|
|
|
|
|
|
|
|
// hql拼接
|
|
|
|
|
HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
|
|
|
|
|
HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
|
|
|
|
|
HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
|
|
|
|
|
HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
|
|
|
|
|
HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result);
|
|
|
|
|
DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true);
|
|
|
|
|
|
|
|
|
|
// 添加默认排序
|
|
|
|
|
HqlPack.getOrderDefault(sysTaskPlan);
|
|
|
|
|
DdlPreparedPack.getOrderDefault(sysTaskPlan);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -738,18 +744,23 @@ public class CoreHqlPack {
|
|
|
|
|
* @param orderNoRule
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
|
|
|
|
|
DdlPackBean result = DdlPackBean.getDdlPackBean();
|
|
|
|
|
|
|
|
|
|
HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
|
|
|
|
|
HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
|
|
|
|
|
HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
|
|
|
|
|
HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
|
|
|
|
|
if (orderNoRule.getSerialNo() != null) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 添加默认排序
|
|
|
|
|
HqlPack.getOrderDefault(orderNoRule);
|
|
|
|
|
DdlPreparedPack.getOrderDefault(orderNoRule);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -779,13 +790,18 @@ public class CoreHqlPack {
|
|
|
|
|
* @param sysTask
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlSysTask(SysTask sysTask){
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlSysTask(SysTask sysTask){
|
|
|
|
|
DdlPackBean result = DdlPackBean.getDdlPackBean();
|
|
|
|
|
|
|
|
|
|
HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
|
|
|
|
|
HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
DdlPreparedPack.getOrderDefault(sysTask);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){
|
|
|
|
|