From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 07 二月 2025 14:19:28 +0800 Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev --- ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 6527c93..4db9030 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -1,11 +1,10 @@ package ${packageName}.service; -import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; -#if($table.crud || $table.sub) -import com.ruoyi.common.mybatis.core.page.TableDataInfo; -import com.ruoyi.common.mybatis.core.page.PageQuery; +#if($table.crud) +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; #end import java.util.Collection; @@ -21,33 +20,53 @@ /** * 鏌ヨ${functionName} + * + * @param ${pkColumn.javaField} 涓婚敭 + * @return ${functionName} */ ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}); -#if($table.crud || $table.sub) +#if($table.crud) /** - * 鏌ヨ${functionName}鍒楄〃 + * 鍒嗛〉鏌ヨ${functionName}鍒楄〃 + * + * @param bo 鏌ヨ鏉′欢 + * @param pageQuery 鍒嗛〉鍙傛暟 + * @return ${functionName}鍒嗛〉鍒楄〃 */ TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); #end /** - * 鏌ヨ${functionName}鍒楄〃 + * 鏌ヨ绗﹀悎鏉′欢鐨�${functionName}鍒楄〃 + * + * @param bo 鏌ヨ鏉′欢 + * @return ${functionName}鍒楄〃 */ List<${ClassName}Vo> queryList(${ClassName}Bo bo); /** * 鏂板${functionName} + * + * @param bo ${functionName} + * @return 鏄惁鏂板鎴愬姛 */ Boolean insertByBo(${ClassName}Bo bo); /** * 淇敼${functionName} + * + * @param bo ${functionName} + * @return 鏄惁淇敼鎴愬姛 */ Boolean updateByBo(${ClassName}Bo bo); /** * 鏍¢獙骞舵壒閲忓垹闄�${functionName}淇℃伅 + * + * @param ids 寰呭垹闄ょ殑涓婚敭闆嗗悎 + * @param isValid 鏄惁杩涜鏈夋晥鎬ф牎楠� + * @return 鏄惁鍒犻櫎鎴愬姛 */ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid); } -- Gitblit v1.9.3