diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/Controller.java.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/Controller.java.btl index cc57da2a..09ff0077 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/Controller.java.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/Controller.java.btl @@ -23,9 +23,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import ${packageName}.common.annotation.CommonLog; -import ${packageName}.common.pojo.CommonResult; -import ${packageName}.common.pojo.CommonValidList; +import vip.xiaonuo.common.annotation.CommonLog; +import vip.xiaonuo.common.pojo.CommonResult; +import vip.xiaonuo.common.pojo.CommonValidList; import ${packageName}.${moduleName}.modular.${busName}.entity.${className}; import ${packageName}.${moduleName}.modular.${busName}.param.${className}AddParam; import ${packageName}.${moduleName}.modular.${busName}.param.${className}EditParam; diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl index c19a402e..f7265756 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl @@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import ${packageName}.common.enums.CommonSortOrderEnum; -import ${packageName}.common.exception.CommonException; -import ${packageName}.common.page.CommonPageRequest; +import vip.xiaonuo.common.enums.CommonSortOrderEnum; +import vip.xiaonuo.common.exception.CommonException; +import vip.xiaonuo.common.page.CommonPageRequest; import ${packageName}.${moduleName}.modular.${busName}.entity.${className}; import ${packageName}.${moduleName}.modular.${busName}.mapper.${className}Mapper; import ${packageName}.${moduleName}.modular.${busName}.param.${className}AddParam; @@ -32,6 +32,16 @@ import ${packageName}.${moduleName}.modular.${busName}.param.${className}IdParam import ${packageName}.${moduleName}.modular.${busName}.param.${className}PageParam; import ${packageName}.${moduleName}.modular.${busName}.service.${className}Service; +<% +var searchCount = 0; +var searchLikeCount = 0; +for(var i = 0; i < configList.~size; i++) { + if(!configList[i].needTableId && configList[i].needPage) { searchCount ++; } + if(!configList[i].needTableId && configList[i].needPage && configList[i].needPageType == "like") { + searchLikeCount ++; + } +} +%> import java.util.List; /** @@ -46,6 +56,19 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c @Override public Page<${className}> page(${className}PageParam ${classNameFirstLower}PageParam) { QueryWrapper<${className}> queryWrapper = new QueryWrapper<>(); + <% if (searchLikeCount>0) { %> + //关键信息【模糊查询】 + if (ObjectUtil.isNotEmpty(${classNameFirstLower}PageParam.getSearchKey())) { + queryWrapper.and(queryWrapperLike -> { + <% for(var i = 0; i < configList.~size; i++) { %> + <% if(!configList[i].needTableId && configList[i].needPage && configList[i].needPageType == "like") { %> + queryWrapperLike.lambda().or().like(${className}::get${configList[i].fieldNameCamelCaseFirstUpper}, ${classNameFirstLower}PageParam.getSearchKey()); + <% } %> + <% } %> + }); + } + <% } %> + <% for(var i = 0; i < configList.~size; i++) { %> <% if(configList[i].needPage) { %> <% if(configList[i].effectType == 'datepicker') { %> diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/index.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/index.vue.btl index 9561c605..6c9deb05 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/index.vue.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/index.vue.btl @@ -1,18 +1,32 @@