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 @@ - + - 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 @@ -23,7 +23,7 @@ resultMap="RecordDeliveryTaskBaseketResult"> - and crate_time = #{crateTime} + and crate_time = #{createTime} and basket_id = #{basketId} and task_code = #{taskCode} 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"> - + - + - 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 @@ -34,12 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" task_code, img_path, - crate_time, #{taskCode}, #{imgPath}, - #{crateTime}, @@ -48,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" task_code = #{taskCode}, img_path = #{imgPath}, - crate_time = #{crateTime}, where delivery_img_id = #{deliveryImgId} 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: '绑定时间' },