diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 6d4f83e..c01e38b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.base.tool; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; import java.util.Date; @@ -160,6 +162,18 @@ public class HqlPack { } /** + * 对象默认排序 + */ + public static void getOrderDefault(BaseBean bean) { + if(bean != null){ + if(StringUtils.isBlank(bean.getOrderByParam())){ + bean.setOrderByParam("modifyDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + } + } + + /** * 封装String对象成like语句 * @param str 对象值 * @param columnName 列名 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 843a40d..dffa4bb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -61,6 +61,9 @@ public class CoreHqlPack { //字符串类型封装 HqlPack.getStringLikerPack(localeResource.getResourceKey(),"resourceKey",result); + // 添加默认排序 + HqlPack.getOrderDefault(localeResource); + return result.toString(); } @@ -80,6 +83,9 @@ public class CoreHqlPack { //字符串类型封装 HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result); + // 添加默认排序 + HqlPack.getOrderDefault(localeLanguage); + return result.toString(); } @@ -96,6 +102,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(position.getName(),"name",result); HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + // 添加默认排序 + HqlPack.getOrderDefault(position); + return result.toString(); } @@ -112,6 +121,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(organize.getName(),"name",result); HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + // 添加默认排序 + HqlPack.getOrderDefault(organize); + return result.toString(); } @@ -142,6 +154,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + // 添加默认排序 + HqlPack.getOrderDefault(department); + return result.toString(); } @@ -160,6 +175,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(menu.getName(),"name",result); HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + // 添加默认排序 + HqlPack.getOrderDefault(menu); + return result.toString(); } @@ -175,6 +193,9 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); HqlPack.getStringLikerPack(role.getName(),"name",result); + // 添加默认排序 + HqlPack.getOrderDefault(role); + return result.toString(); } @@ -191,6 +212,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result); HqlPack.getNumEqualPack(config.getConfigType(),"configType",result); + // 添加默认排序 + HqlPack.getOrderDefault(config); + return result.toString(); } @@ -211,6 +235,9 @@ public class CoreHqlPack { } HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + // 添加默认排序 + HqlPack.getOrderDefault(dictionary); + return result.toString(); } @@ -225,6 +252,9 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(toolType.getName(),"name",result); + // 添加默认排序 + HqlPack.getOrderDefault(toolType); + return result.toString(); } @@ -245,6 +275,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result); HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result); + // 添加默认排序 + HqlPack.getOrderDefault(tool); + return result.toString(); } @@ -265,6 +298,9 @@ public class CoreHqlPack { HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false); HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result); + // 添加默认排序 + HqlPack.getOrderDefault(message); + return result.toString(); } @@ -282,6 +318,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); + // 添加默认排序 + HqlPack.getOrderDefault(file); + return result.toString(); } @@ -296,6 +335,9 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result); + // 添加默认排序 + HqlPack.getOrderDefault(taskTimeExpression); + return result.toString(); } @@ -312,6 +354,9 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result); HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result); + // 添加默认排序 + HqlPack.getOrderDefault(taskTime); + return result.toString(); } @@ -338,6 +383,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + // 添加默认排序 + HqlPack.getOrderDefault(user); + return result.toString(); } @@ -354,6 +402,9 @@ public class CoreHqlPack { // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + // 添加默认排序 + HqlPack.getOrderDefault(dictionary); + return result.toString(); } @@ -371,6 +422,9 @@ public class CoreHqlPack { // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + // 添加默认排序 + HqlPack.getOrderDefault(dictionary); + return result.toString(); } @@ -393,6 +447,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(userInfo.getName(),"name",result); HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + // 添加默认排序 + HqlPack.getOrderDefault(userInfo); + return result.toString(); } @@ -414,6 +471,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(userInfo.getName(),"name",result); HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + // 添加默认排序 + HqlPack.getOrderDefault(userInfo); + return result.toString(); } @@ -428,6 +488,9 @@ public class CoreHqlPack { HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result); HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result); + // 添加默认排序 + HqlPack.getOrderDefault(localeLanguage); + return result.toString(); } @@ -443,35 +506,44 @@ public class CoreHqlPack { HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); + // 添加默认排序 + HqlPack.getOrderDefault(localeResource); + return result.toString(); } /** * 查询规则代码是否重复 - * @param sysOrderNoRule + * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRuleCode(SysOrderNoRule sysOrderNoRule){ + public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule){ StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(sysOrderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); // not - HqlPack.getNumNOEqualPack(sysOrderNoRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(orderNoRule.getId(),"id",result); + + // 添加默认排序 + HqlPack.getOrderDefault(orderNoRule); return result.toString(); } /** * 单号规则复杂查询,分页,排序 - * @param sysOrderNoRule + * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRule(SysOrderNoRule sysOrderNoRule){ + public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(sysOrderNoRule.getName(),"name",result); - HqlPack.getStringLikerPack(sysOrderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); + HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + + // 添加默认排序 + HqlPack.getOrderDefault(orderNoRule); return result.toString(); } @@ -492,6 +564,9 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); + // 添加默认排序 + HqlPack.getOrderDefault(sysRefUserMessage); + return result.toString(); }