fix: 代码生成问题修复

This commit is contained in:
Ray.Hao
2024-09-13 12:45:11 +08:00
parent a390d56842
commit 790ac8d692
5 changed files with 23 additions and 21 deletions

View File

@@ -43,7 +43,7 @@ public class ${entityName}Controller {
@Operation(summary = "新增${businessName}")
@PostMapping
@PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:add')")
public Result save${entityName}(@RequestBody @Valid ${entityName}Form formData ) {
public Result<Void> save${entityName}(@RequestBody @Valid ${entityName}Form formData ) {
boolean result = ${lowerFirstEntityName}Service.save${entityName}(formData);
return Result.judge(result);
}
@@ -61,7 +61,7 @@ public class ${entityName}Controller {
@Operation(summary = "修改${businessName}")
@PutMapping(value = "/{id}")
@PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:edit')")
public Result update${entityName}(
public Result<Void> update${entityName}(
@Parameter(description = "$!{businessName}ID") @PathVariable Long id,
@RequestBody @Validated ${entityName}Form formData
) {
@@ -72,7 +72,7 @@ public class ${entityName}Controller {
@Operation(summary = "删除${businessName}")
@DeleteMapping("/{ids}")
@PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:delete')")
public Result delete${entityName}s(
public Result<Void> delete${entityName}s(
@Parameter(description = "$!{businessName}ID多个以英文逗号(,)分割") @PathVariable String ids
) {
boolean result = ${lowerFirstEntityName}Service.delete${entityName}s(ids);

View File

@@ -174,10 +174,8 @@
<el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
#if($fieldConfig.formType == "INPUT")
<el-input
v-model="queryParams.$fieldConfig.fieldName"
v-model="formData.$fieldConfig.fieldName"
placeholder="$fieldConfig.fieldComment"
clearable
@keyup.enter="handleQuery()"
/>
#elseif($fieldConfig.formType == "SELECT")
#if($fieldConfig.dictType != "")
@@ -189,34 +187,34 @@
</el-select>
#end
#elseif($fieldConfig.formType == "RADIO")
<el-radio-group v-model="queryParams.$fieldConfig.fieldName">
<el-radio-group v-model="formData.$fieldConfig.fieldName">
<el-radio :value="0">选项一</el-radio>
<el-radio :value="1">选项二</el-radio>
</el-radio-group>
#elseif($fieldConfig.formType == "CHECK_BOX")
<el-checkbox-group v-model="queryParams.$fieldConfig.fieldName">
<el-checkbox-group v-model="formData.$fieldConfig.fieldName">
<el-checkbox :value="0">选项一</el-checkbox>
<el-checkbox :value="1">选项二</el-checkbox>
</el-checkbox-group>
#elseif($fieldConfig.formType == "INPUT_NUMBER")
<el-input-number
v-model="queryParams.$fieldConfig.fieldName"
v-model="formData.$fieldConfig.fieldName"
placeholder="$fieldConfig.fieldComment"
/>
#elseif($fieldConfig.formType == "SWITCH")
<el-switch
v-model="queryParams.$fieldConfig.fieldName"
v-model="formData.$fieldConfig.fieldName"
:active-value="1"
:inactive-value="0"
/>
#elseif($fieldConfig.formType == "TEXT_AREA")
<el-input type="textarea"
v-model="queryParams.$fieldConfig.fieldName"
v-model="formData.$fieldConfig.fieldName"
placeholder="$fieldConfig.fieldComment"
/>
#elseif($fieldConfig.formType == "DATE_TIME")
<el-date-picker
v-model="queryParams.$fieldConfig.fieldName"
v-model="formData.$fieldConfig.fieldName"
type="datetime"
placeholder="$fieldConfig.fieldComment"
value-format="YYYY-MM-DD HH:mm:ss"
@@ -224,7 +222,7 @@
#elseif($fieldConfig.formType == "DATE")
<el-date-picker
class="!w-[240px]"
v-model="queryParams.$fieldConfig.fieldName"
v-model="formData.$fieldConfig.fieldName"
type="date"
placeholder="$fieldConfig.fieldComment"
value-format="YYYY-MM-DD"

View File

@@ -1,6 +1,6 @@
package ${packageName}.${moduleName}.${subpackageName};
import com.youlai.boot.common.base.BasePageQuery;
import ${packageName}.common.base.BasePageQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,8 +23,6 @@ import java.math.BigDecimal;
@Setter
public class ${entityName}Query extends BasePageQuery {
private static final long serialVersionUID = 1L;
#if($fieldConfigs)
#foreach($fieldConfig in ${fieldConfigs})
#if($fieldConfig.isShowInQuery)