From 044a95774a4f13eb8ab3f4e057cb311e44d659e9 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Fri, 6 Mar 2026 08:59:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/domain/RecordDeliveryTaskImg.java     | 15 ++-------------
 .../manager/RecordDeliveryTaskBaseketMapper.xml   |  6 +++---
 .../manager/RecordDeliveryTaskImgMapper.xml       | 10 +++-------
 .../manager/delivery_task/delivery_task.html      |  2 +-
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java
index f50148b..1e4591b 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java
@@ -28,10 +28,7 @@ public class RecordDeliveryTaskImg extends BaseEntity
     @Excel(name = "交接图片")
     private String imgPath;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date crateTime;
+
 
     public void setDeliveryImgId(Long deliveryImgId) 
     {
@@ -63,15 +60,7 @@ public class RecordDeliveryTaskImg extends BaseEntity
         return imgPath;
     }
 
-    public void setCrateTime(Date crateTime) 
-    {
-        this.crateTime = crateTime;
-    }
 
-    public Date getCrateTime() 
-    {
-        return crateTime;
-    }
 
     @Override
     public String toString() {
@@ -79,7 +68,7 @@ public class RecordDeliveryTaskImg extends BaseEntity
             .append("deliveryImgId", getDeliveryImgId())
             .append("taskCode", getTaskCode())
             .append("imgPath", getImgPath())
-            .append("crateTime", getCrateTime())
+
             .toString();
     }
 }
diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml
index a57bf50..93bf441 100644
--- a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml
+++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml
@@ -6,7 +6,7 @@
 
     <resultMap type="com.ruoyi.manager.domain.RecordDeliveryTaskBaseket" id="RecordDeliveryTaskBaseketResult">
         <result property="objid" column="objid"/>
-        <result property="crateTime" column="crate_time"/>
+        <result property="createTime" column="create_time"/>
         <result property="basketId" column="basket_id"/>
         <result property="taskCode" column="task_code"/>
         <association property="baseBasketInfo" javaType="com.ruoyi.manager.domain.BaseBasketInfo"
@@ -14,7 +14,7 @@
     </resultMap>
 
     <sql id="selectRecordDeliveryTaskBaseketVo">
-        select objid, crate_time, basket_id, basket_type, steel_grade, self_code, task_code
+        select objid, create_time, basket_id, basket_type, steel_grade, self_code, task_code
         from record_delivery_task_baseket rb
                  left join base_basket_info bbi on bbi.obj_id = rb.basket_id
     </sql>
@@ -23,7 +23,7 @@
             resultMap="RecordDeliveryTaskBaseketResult">
         <include refid="selectRecordDeliveryTaskBaseketVo"/>
         <where>
-            <if test="crateTime != null ">and crate_time = #{crateTime}</if>
+            <if test="createTime != null ">and crate_time = #{createTime}</if>
             <if test="basketId != null ">and basket_id = #{basketId}</if>
             <if test="taskCode != null ">and task_code = #{taskCode}</if>
         </where>
diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml
index 797d876..08e714c 100644
--- a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml
+++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml
@@ -4,15 +4,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.manager.mapper.RecordDeliveryTaskImgMapper">
     
-    <resultMap type="RecordDeliveryTaskImg" id="RecordDeliveryTaskImgResult">
+    <resultMap type="com.ruoyi.manager.domain.RecordDeliveryTaskImg" id="RecordDeliveryTaskImgResult">
         <result property="deliveryImgId"    column="delivery_img_id"    />
         <result property="taskCode"    column="task_code"    />
         <result property="imgPath"    column="img_path"    />
-        <result property="crateTime"    column="crate_time"    />
+        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectRecordDeliveryTaskImgVo">
-        select delivery_img_id, task_code, img_path, crate_time from record_delivery_task_img
+        select delivery_img_id, task_code, img_path, create_time from record_delivery_task_img
     </sql>
 
     <select id="selectRecordDeliveryTaskImgList" parameterType="RecordDeliveryTaskImg" resultMap="RecordDeliveryTaskImgResult">
@@ -20,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="taskCode != null  and taskCode != ''"> and task_code = #{taskCode}</if>
             <if test="imgPath != null  and imgPath != ''"> and img_path = #{imgPath}</if>
-            <if test="crateTime != null "> and crate_time = #{crateTime}</if>
         </where>
     </select>
     
@@ -34,12 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskCode != null">task_code,</if>
             <if test="imgPath != null">img_path,</if>
-            <if test="crateTime != null">crate_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskCode != null">#{taskCode},</if>
             <if test="imgPath != null">#{imgPath},</if>
-            <if test="crateTime != null">#{crateTime},</if>
          </trim>
     </insert>
 
@@ -48,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskCode != null">task_code = #{taskCode},</if>
             <if test="imgPath != null">img_path = #{imgPath},</if>
-            <if test="crateTime != null">crate_time = #{crateTime},</if>
         </trim>
         where delivery_img_id = #{deliveryImgId}
     </update>
diff --git a/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html b/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html
index 68c7175..4a32cb9 100644
--- a/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html
+++ b/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html
@@ -206,7 +206,7 @@
 
 
                     {
-                        field: 'crateTime',
+                        field: 'createTime',
                         title: '绑定时间'
                     },