diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java index 8b889f4..e8922af 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java @@ -2,7 +2,12 @@ package net.maku.system.dao; import net.maku.framework.common.dao.BaseDao; import net.maku.system.entity.SysDictDataEntity; +import net.maku.system.vo.SysDictVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 字典数据 @@ -12,4 +17,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysDictDataDao extends BaseDao { + @Select("${sql}") + List selectListForSql(@Param("sql") String sql); + } diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java index 471b021..fa3b88e 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java @@ -30,4 +30,12 @@ public class SysDictTypeEntity extends BaseEntity { * 排序 */ private Integer sort; + /** + * 类型:1 静态常量 2 动态SQL + */ + private Integer type; + /** + * 动态sql + */ + private String sourceSql; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java index 3fe0723..44e4fe3 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java @@ -18,6 +18,7 @@ import net.maku.system.service.SysDictTypeService; import net.maku.system.vo.SysDictVO; import net.maku.system.query.SysDictTypeQuery; import net.maku.system.vo.SysDictTypeVO; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -92,6 +93,18 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl