From af25d1b7a6cd8655c6a982d99c4fbfbdbc4d67ce Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Apr 2022 16:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=B0=83=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BussDocumentLibraryEOController.java  |  4 +---
 .../document/entity/BussDocumentLibraryEO.java       | 12 ++++++++++++
 .../mapper/xml/BussDocumentLibraryEOMapper.xml       |  8 ++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

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<BussDocument
 	@ApiOperation(value="虚拟中心添加调用文档库数据--分页", notes="虚拟中心添加调用文档库数据--分页")
 	@PostMapping(value = "/queryPageInfoDummy")
 	public Result<?> queryPageInfoDummy(@RequestBody BussDocumentLibraryEO bussDocumentLibraryEO,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<BussDocumentLibraryEO> queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap());
-		Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(pageNo, pageSize);
+		Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize());
 		IPage<BussDocumentLibraryEO> 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 @@
 <mapper namespace="com.jero.modules.document.mapper.BussDocumentLibraryEOMapper">
     <resultMap id="BussDocumentLibraryEOResultMap" type="com.jero.modules.document.entity.BussDocumentLibraryEO">
         <id column="id" property="id" />
+        <id column="serial_number" property="serialNumber" />
+        <id column="title" property="title" />
+        <id column="shi4_yong4_fan4_wei2" property="shi4Yong4Fan4Wei2" />
+        <id column="state" property="state" />
+        <id column="technology_territory" property="technologyTerritory" />
+        <id column="xin1_che1_xing2_shi2_shi1_ri4_qi1" property="xin1Che1Xing2Shi2Shi1Ri4Qi1" />
+        <id column="implement_time" property="implementTime" />
+        <id column="corresponding_standard" property="correspondingStandard" />
     </resultMap>
 
     <insert id="insertInfo">