diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 3090e3ff4..5cb95dac2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -438,11 +438,9 @@ public class BussDocumentLibraryEOController extends JeroController queryPageInfoDummy(@RequestBody BussDocumentLibraryEO bussDocumentLibraryEO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize()); IPage pageList = bussDocumentLibraryEOService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index cfefa526a..4e7368d63 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -1,6 +1,7 @@ package com.jero.modules.document.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -53,21 +54,27 @@ public class BussDocumentLibraryEO implements Serializable { /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") + @Dict(dicCode ="state") private java.lang.String state; /**技术领域*/ @Excel(name = "技术领域", width = 15) @ApiModelProperty(value = "技术领域") + @Dict(dicCode ="technology_territory") private java.lang.String technologyTerritory; /**新车型实施日期*/ @Excel(name = "新车型实施日期", width = 15) @ApiModelProperty(value = "新车型实施日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private java.lang.String xin1Che1Xing2Shi2Shi1Ri4Qi1; /**在产车实施日期*/ @Excel(name = "在产车实施日期", width = 15) @ApiModelProperty(value = "在产车实施日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private java.lang.String implementTime; /**对应标准*/ @@ -75,4 +82,9 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + @TableField(exist = false) + private Integer pageNo; + @TableField(exist = false) + private Integer pageSize; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml index 7886fc5f2..409eca2c1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml @@ -3,6 +3,14 @@ + + + + + + + +