From 4db47217c4be9553cf924e7fd534d32cc09eb62c Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 14 Nov 2024 08:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/collect/RelCodeBatchResponse.java | 32 +++++++++++++++++++
 .../mapper/collect/RelCodeBatchMapper.xml     | 24 ++------------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
index cc13680d..73253360 100644
--- a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
@@ -86,8 +86,40 @@ public class RelCodeBatchResponse {
     private Integer packLayer;
 
     private String erpId;
+
+    @TableField(value = "createTime")
+    @ApiModelProperty(value = "")
+    private Date createTime;
+
+    @TableField(value = "`createUser`")
+    @ApiModelProperty(value = "")
+    private String createUser;
+
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value = "")
+    private Date updateTime;
+
+    @TableField(value = "updateUser")
+    @ApiModelProperty(value = "")
+    private String updateUser;
+
+    @TableField(value = "uploadFlagUp")
+    @ApiModelProperty(value = "")
+    private Integer uploadFlagUp;
+
+    @TableField(value = "uploadFlagDown")
+    @ApiModelProperty(value = "")
+    private Integer uploadFlagDown;
+
+    /**
+     * 父级码
+     */
+
+    @TableField(value = "parentCode")
+    @ApiModelProperty(value = "")
     private String parentCode;
 
+
     /**
      * curCode
      */
diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
index af6385a1..d9ae59be 100644
--- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.collect.RelCodeBatchMapper">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.collect.RelCodeBatch">
-    <!--@mbg.generated-->
-    <!--@Table udi_wms_ywj.rel_code_batch-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="productCode" jdbcType="VARCHAR" property="productCode" />
-    <result column="subTypeNo" jdbcType="VARCHAR" property="subTypeNo" />
-    <result column="cascadeRatio" jdbcType="VARCHAR" property="cascadeRatio" />
-    <result column="packageSpec" jdbcType="VARCHAR" property="packageSpec" />
-    <result column="comment" jdbcType="VARCHAR" property="comment" />
-    <result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
-    <result column="madeDate" jdbcType="TIMESTAMP" property="madeDate" />
-    <result column="validateDate" jdbcType="TIMESTAMP" property="validateDate" />
-    <result column="workShop" jdbcType="VARCHAR" property="workShop" />
-    <result column="lineName" jdbcType="VARCHAR" property="lineName" />
-    <result column="lineManager" jdbcType="VARCHAR" property="lineManager" />
-    <result column="erpId" jdbcType="VARCHAR" property="erpId" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, productCode, subTypeNo, `cascadeRatio`, packageSpec, `comment`, batchNo, madeDate,
-    validateDate, workShop, lineName, lineManager, erpId
-  </sql>
 
   <select id="filterList" parameterType="com.glxp.api.req.collect.RelCodeBatchRequest" resultType="com.glxp.api.res.collect.RelCodeBatchResponse">
     select
@@ -85,5 +63,7 @@
         <![CDATA[ and a.validateDate <= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S') ]]>
       </if>
     </where>
+    group by a.id
   </select>
+
 </mapper>