diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index cbe83ab3..5b00394d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -49,8 +49,8 @@ public class FieldCommon { ); public static final String MODULE = "module"; // 表名标识 - public static final String ORDER_BY = "orderBy"; // 升序还是倒序标识 - public static final String ORDER_BY_FIELD = "orderByField"; // 排序字段 + public static final String ORDER_BY = "order"; // 升序还是倒序标识 + public static final String ORDER_BY_FIELD = "column"; // 排序字段 // "str_to_date('" + sdf.format(new Date()) + "','%Y-%m-%d %H:%i:%s')" public static final String STR_TO_DATE_PREFIX = "str_to_date('"; // 格式化时间格式的前缀 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 706ea69b..8ab9abc5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1774,9 +1774,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 给拼装的查询条件排序 **/ private void orderBySort(Map parameterMap, StringBuilder selectCondition) { - if ("1".equals(parameterMap.get(FieldCommon.ORDER_BY))) { + if ("asc".equals(parameterMap.get(FieldCommon.ORDER_BY))) { selectCondition.append(" asc"); //正序 - } else if ("2".equals(parameterMap.get(FieldCommon.ORDER_BY))) { + } else if ("desc".equals(parameterMap.get(FieldCommon.ORDER_BY))) { selectCondition.append(" desc"); //倒序 } } @@ -1787,11 +1787,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 给拼装的查询条件排序(多日期) **/ private void orderBySortDateMany(Map parameterMap, StringBuilder selectCondition) { - if ("1".equals(parameterMap.get(FieldCommon.ORDER_BY))) { + if ("asc".equals(parameterMap.get(FieldCommon.ORDER_BY))) { selectCondition.append(" order by STR_TO_DATE(SUBSTRING_INDEX(" + parameterMap.get(FieldCommon.ORDER_BY_FIELD) + ", ',', 1), '%Y-%m-%d')"); selectCondition.append(" asc"); //正序 - } else if ("2".equals(parameterMap.get(FieldCommon.ORDER_BY))) { + } else if ("desc".equals(parameterMap.get(FieldCommon.ORDER_BY))) { selectCondition.append(" order by STR_TO_DATE(SUBSTRING_INDEX(" + parameterMap.get(FieldCommon.ORDER_BY_FIELD) + ", ',', -1), '%Y-%m-%d')"); selectCondition.append(" desc"); //倒序