diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java index 349fd209..dc36d9c9 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java @@ -4,10 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; @@ -15,16 +11,13 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; +import java.util.Map; @RestController("onlCgformFieldController") @RequestMapping({"/online/cgform/field"}) @@ -39,7 +32,7 @@ public class OnlCgformFieldController { private static final String EN_IS_NULL = "未找到对应实体"; @GetMapping({"/listByHeadCode"}) - public Result a(@RequestParam("headCode") String var1) { + public Result> a(@RequestParam("headCode") String var1) { LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformHead::getTableName, var1); OnlCgformHead var3 = this.onlCgformHeadService.getOne(var2); @@ -47,7 +40,7 @@ public class OnlCgformFieldController { } @GetMapping({"/listByHeadId"}) - public Result b(@RequestParam("headId") String var1) { + public Result> b(@RequestParam("headId") String var1) { QueryWrapper var2 = new QueryWrapper<>(); var2.eq("cgform_head_id", var1); var2.orderByAsc("order_num"); @@ -57,7 +50,7 @@ public class OnlCgformFieldController { @GetMapping({"/list"}) public Result> a(OnlCgformField var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { - Result var5 = new Result<>(); + Result> var5 = new Result<>(); QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); Page var7 = new Page<>(var2, var3); IPage var8 = this.onlCgformFieldService.page(var7, var6);