From b1e41d3ea0b1dd4daa8b006839ae1c77510ed55e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 12 Jun 2024 18:27:08 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java  | 1 +
 .../main/resources/mapper/EmisWaybillProblemInfoMapper.xml  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index 7b4b532ce..e1f46fde5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -57,6 +57,7 @@ public class EmisWaybillProblemInfo extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date registerDate;
     /* 登记保存时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date registerSaveDate;
     /* 数据来源 pc,app */
     private String dataFrom;
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index 6de3df502..70dbd91e5 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -134,7 +134,7 @@
             <if test="registerManDept != null and registerManDept != ''">register_man_dept,</if>
             <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code,</if>
             <if test="registerDate != null">register_date,</if>
-            <if test="registerSaveDate != null and registerSaveDate != ''">register_save_date,</if>
+            <if test="registerSaveDate != null ">register_save_date,</if>
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
             <if test="status != null and status != ''">status,</if>
             <if test="isSendSiteRegister != null and isSendSiteRegister != ''">is_send_site_register,</if>
@@ -169,7 +169,7 @@
             <if test="registerManDept != null and registerManDept != ''">#{registerManDept},</if>
             <if test="registerSiteCode != null and registerSiteCode != ''">#{registerSiteCode},</if>
             <if test="registerDate != null">#{registerDate},</if>
-            <if test="registerSaveDate != null and registerSaveDate != ''">#{registerSaveDate},</if>
+            <if test="registerSaveDate != null">#{registerSaveDate},</if>
             <if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="isSendSiteRegister != null and isSendSiteRegister != ''">#{isSendSiteRegister},</if>
@@ -207,7 +207,7 @@
             <if test="registerManDept != null and registerManDept != ''">register_man_dept = #{registerManDept},</if>
             <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code = #{registerSiteCode},</if>
             <if test="registerDate != null">register_date = #{registerDate},</if>
-            <if test="registerSaveDate != null and registerSaveDate != ''">register_save_date = #{registerSaveDate},</if>
+            <if test="registerSaveDate != null">register_save_date = #{registerSaveDate},</if>
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="isSendSiteRegister != null and isSendSiteRegister != ''">is_send_site_register = #{isSendSiteRegister},</if>