From 5d783decb229eb233b6fff9c3ec6a80c271ddc24 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 9 Sep 2024 10:11:47 +0800
Subject: [PATCH] datetime

---
 .../sgzb/base/api/domain/BackApplyInfo.java    |  8 +++++++-
 .../bonus/sgzb/base/api/domain/MachIneDto.java | 12 ++++++++++--
 .../mapper/app/LeaseApplyInfoMapper.xml        | 12 ++++++------
 .../resources/mapper/base/MaMachineMapper.xml  | 18 +++++++++---------
 .../mapper/base/MaTypeHisNumMapper.xml         |  6 +++---
 .../mapper/base/MaTypeHisPriceMapper.xml       |  6 +++---
 .../mapper/material/AgreementInfoMapper.xml    |  6 +++---
 .../mapper/material/BackApplyMapper.xml        |  4 ++--
 .../material/InventoryAndWarehousingMapper.xml |  8 ++++----
 .../material/PurchaseAccessoryMapper.xml       |  4 ++--
 .../material/PurchaseCheckInfoMapper.xml       |  6 +++---
 .../PurchaseCheckServiceCenterMapper.xml       |  4 ++--
 .../material/PurchaseMacodeInfoMapper.xml      | 12 ++++++------
 .../material/WorkSiteDirectManageMapper.xml    |  4 ++--
 14 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
index 18de002..31f2221 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
@@ -2,8 +2,10 @@ package com.bonus.sgzb.base.api.domain;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -139,6 +141,8 @@ public class BackApplyInfo extends BaseEntity {
 
     @Excel(name = "申请时间",sort = 7)
     @ApiModelProperty(value = "退料日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String backTime;
 
 
@@ -222,7 +226,9 @@ public class BackApplyInfo extends BaseEntity {
 
     /** 机具公司审批时间 */
     @ApiModelProperty(value = "机具公司审批时间")
-    private String directAuditTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date directAuditTime;
 
     /** 机具公司审批备注 */
     @ApiModelProperty(value = "机具公司审批备注")
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachIneDto.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachIneDto.java
index 6483cdd..467b332 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachIneDto.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachIneDto.java
@@ -1,11 +1,15 @@
 package com.bonus.sgzb.base.api.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 表单类型表单集合
@@ -72,11 +76,15 @@ public class MachIneDto {
 
     /** 本次检修日期 */
     @ApiModelProperty(value = "本次检修日期")
-    private String thisCheckTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date thisCheckTime;
 
     /** 下次检修日期 */
     @ApiModelProperty(value = "下次检修日期")
-    private String nextCheckTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date nextCheckTime;
 
     /** 单价 */
     @ApiModelProperty(value = "单价")
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
index 367f0d6..c351694 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
@@ -98,7 +98,7 @@
       <if test="companyAuditBy != null">
         company_audit_by,
       </if>
-      <if test="companyAuditTime != null and companyAuditTime != ''">
+      <if test="companyAuditTime != null">
         company_audit_time,
       </if>
       <if test="companyAuditRemark != null and companyAuditRemark != ''">
@@ -107,7 +107,7 @@
       <if test="deptAuditBy != null">
         dept_audit_by,
       </if>
-      <if test="deptAuditTime != null and deptAuditTime != ''">
+      <if test="deptAuditTime != null">
         dept_audit_time,
       </if>
       <if test="deptAuditRemark != null and deptAuditRemark != ''">
@@ -158,8 +158,8 @@
       <if test="companyAuditBy != null">
         #{companyAuditBy,jdbcType=INTEGER},
       </if>
-      <if test="companyAuditTime != null and companyAuditTime != ''">
-        #{companyAuditTime,jdbcType=VARCHAR},
+      <if test="companyAuditTime != null">
+        #{companyAuditTime},
       </if>
       <if test="companyAuditRemark != null and companyAuditRemark != ''">
         #{companyAuditRemark,jdbcType=VARCHAR},
@@ -167,8 +167,8 @@
       <if test="deptAuditBy != null">
         #{deptAuditBy,jdbcType=INTEGER},
       </if>
-      <if test="deptAuditTime != null and deptAuditTime != ''">
-        #{deptAuditTime,jdbcType=VARCHAR},
+      <if test="deptAuditTime != null">
+        #{deptAuditTime},
       </if>
       <if test="deptAuditRemark != null and deptAuditRemark != ''">
         #{deptAuditRemark,jdbcType=VARCHAR},
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
index 99c4c4e..0c546a9 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -199,12 +199,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="qrCode != null and qrCode != ''">qr_code,</if>
         <if test="buyPrice != null and buyPrice != ''">buy_price,</if>
         <if test="maVender != null and maVender != ''">ma_vender,</if>
-        <if test="outFacTime != null and outFacTime != ''">out_fac_time,</if>
+        <if test="outFacTime != null">out_fac_time,</if>
         <if test="outFacCode != null and outFacCode != ''">out_fac_code,</if>
         <if test="assetsCode != null and assetsCode != ''">assets_code,</if>
         <if test="checkMan != null and checkMan != ''">check_man,</if>
-        <if test="thisCheckTime != null and thisCheckTime != ''">this_check_time,</if>
-        <if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
+        <if test="thisCheckTime != null">this_check_time,</if>
+        <if test="nextCheckTime != null">next_check_time,</if>
         <if test="gpsCode != null and gpsCode != ''">gps_code,</if>
         <if test="rfidCode != null and rfidCode != ''">rfid_code,</if>
         <if test="erpCode != null and erpCode != ''">erp_code,</if>
@@ -223,12 +223,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="qrCode != null and qrCode != ''">#{qrCode},</if>
         <if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if>
         <if test="maVender != null and maVender != ''">#{maVender},</if>
-        <if test="outFacTime != null and outFacTime != ''">#{outFacTime},</if>
+        <if test="outFacTime != null">#{outFacTime},</if>
         <if test="outFacCode != null and outFacCode != ''">#{outFacCode},</if>
         <if test="assetsCode != null and assetsCode != ''">#{assetsCode},</if>
         <if test="checkMan != null and checkMan != ''">#{checkMan},</if>
-        <if test="thisCheckTime != null and thisCheckTime != ''">#{thisCheckTime},</if>
-        <if test="nextCheckTime != null and nextCheckTime != ''">#{nextCheckTime},</if>
+        <if test="thisCheckTime != null">#{thisCheckTime},</if>
+        <if test="nextCheckTime != null">#{nextCheckTime},</if>
         <if test="gpsCode != null and gpsCode != ''">#{gpsCode},</if>
         <if test="rfidCode != null and rfidCode != ''">#{rfidCode},</if>
         <if test="erpCode != null and erpCode != ''">#{erpCode},</if>
@@ -251,12 +251,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qrCode != null and qrCode != ''">qr_code = #{qrCode},</if>
             <if test="buyPrice != null and buyPrice != ''">buy_price = #{buyPrice},</if>
             <if test="maVender != null">ma_vender = #{maVender},</if>
-            <if test="outFacTime != null and outFacTime != ''">out_fac_time =#{outFacTime},</if>
+            <if test="outFacTime != null">out_fac_time =#{outFacTime},</if>
             <if test="outFacCode != null">out_fac_code = #{outFacCode},</if>
             <if test="assetsCode != null">assets_code =#{assetsCode},</if>
             <if test="checkMan != null and checkMan != ''">check_man = #{checkMan},</if>
-            <if test="thisCheckTime != ''">this_check_time = #{thisCheckTime},</if>
-            <if test="nextCheckTime != ''">next_check_time = #{nextCheckTime},</if>
+            <if test="thisCheckTime != null">this_check_time = #{thisCheckTime},</if>
+            <if test="nextCheckTime != null">next_check_time = #{nextCheckTime},</if>
             <if test="gpsCode != null and gpsCode != ''">gps_code = #{gpsCode},</if>
             <if test="rfidCode != null and rfidCode != ''">rfid_code = #{rfidCode},</if>
             <if test="erpCode != null and erpCode != ''">erp_code = #{erpCode},</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisNumMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
index 966355d..80ffa71 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
@@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="typeHisNumAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisNum">
         insert into ma_type_his_num (
         <if test="storageNum != null and storageNum != '' ">storage_num,</if>
-        <if test="time != null and time != '' ">time,</if>
+        <if test="time != null">time,</if>
         <if test="status != null and status != '' ">status,</if>
         <if test="companyId != null and companyId != ''">company_id</if>
         )values(
         <if test="storageNum != null and storageNum != ''">#{storageNum},</if>
-        <if test="time != null and time != ''">#{time},</if>
+        <if test="time != null">#{time},</if>
         <if test="status != null and status != ''">#{status},</if>
         <if test="companyId != null and companyId != ''">#{companyId},</if>
         )
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_type_his_num
         <set>
             <if test="storageNum != null and storageNum != ''">storage_num = #{storageNum},</if>
-            <if test="time != null and time != ''">time = #{time},</if>
+            <if test="time != null">time = #{time},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
index d3e13da..7a519cc 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
@@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="typeHisPriceAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
         insert into ma_type_his_price (
         <if test="leasePrice != null and leasePrice != '' ">ma_code,</if>
-        <if test="time != null and time != '' ">time,</if>
+        <if test="time != null">time,</if>
         <if test="status != null and status != '' ">status,</if>
         <if test="companyId != null and companyId != ''">company_id</if>
         )values(
         <if test="leasePrice != null and leasePrice != ''">#{leasePrice},</if>
-        <if test="time != null and time != ''">#{time},</if>
+        <if test="time != null">#{time},</if>
         <if test="status != null and status != ''">#{status},</if>
         <if test="companyId != null and companyId != ''">#{companyId},</if>
         )
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_type_his_price
         <set>
             <if test="leasePrice != null and leasePrice != ''">ma_code = #{leasePrice},</if>
-            <if test="time != null and time != ''">time = #{time},</if>
+            <if test="time != null">time = #{time},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
index ada1126..40d96ab 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into bm_agreement_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="agreementCode != null">agreement_code,</if>
-            <if test="signTime != null and signTime != ''">sign_time,</if>
+            <if test="signTime != null">sign_time,</if>
             <if test="unitId != null">unit_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="createBy != null">create_by,</if>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="agreementCode != null">#{agreementCode},</if>
-            <if test="signTime != null and signTime != ''">#{signTime},</if>
+            <if test="signTime != null">#{signTime},</if>
             <if test="unitId != null">#{unitId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="update">
         update bm_agreement_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="signTime != null and signTime != ''">sign_time = #{signTime},</if>
+            <if test="signTime != null">sign_time = #{signTime},</if>
             <if test="unitId != null">unit_id = #{unitId},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index e4fd483..cc983cf 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="backPerson != null and backPerson != ''">
             back_person,
         </if>
-        <if test="backTime != null and backTime != ''">
+        <if test="backTime != null">
             back_time,
         </if>
         <if test="phone != null and phone != ''">
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="directAuditBy != null">
             direct_audit_by,
         </if>
-        <if test="directAuditTime != null and directAuditTime != ''">
+        <if test="directAuditTime != null">
             direct_audit_time,
         </if>
         <if test="directAuditRemark != null">
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
index 69bea61..ca846bd 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
@@ -117,8 +117,8 @@
         <if test="maVender != null and maVender != ''">ma_vender,</if>
         <if test="checkMan != null and checkMan != ''">check_man,</if>
         <if test="outFacCode != null and outFacCode != ''">out_fac_code,</if>
-        <if test="thisCheckTime != null and thisCheckTime != ''">this_check_time,</if>
-        <if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
+        <if test="thisCheckTime != null">this_check_time,</if>
+        <if test="nextCheckTime != null">next_check_time,</if>
         create_time
         )values(
         <if test="typeId != null and typeId != ''">#{typeId},</if>
@@ -129,8 +129,8 @@
         <if test="maVender != null and maVender != ''">#{maVender},</if>
         <if test="checkMan != null and checkMan != ''">#{checkMan},</if>
         <if test="outFacCode != null and outFacCode != ''">#{outFacCode},</if>
-        <if test="thisCheckTime != null and thisCheckTime != ''">#{thisCheckTime},</if>
-        <if test="nextCheckTime != null and nextCheckTime != ''">#{nextCheckTime},</if>
+        <if test="thisCheckTime != null">#{thisCheckTime},</if>
+        <if test="nextCheckTime != null">#{nextCheckTime},</if>
         sysdate()
         )
     </insert>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
index 72db829..c565ceb 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into purchase_part_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskId != null">task_id,</if>
-            <if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
+            <if test="purchaseTime != null">purchase_time,</if>
             <if test="arrivalTime != null">arrival_time,</if>
             <if test="purchaser != null">purchaser,</if>
             <if test="createBy != null">create_by,</if>
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePurchasePartInfo" parameterType="com.bonus.sgzb.material.domain.PurchasePartInfo">
         update purchase_part_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="purchaseTime != null and purchaseTime != ''">purchase_time = #{purchaseTime},</if>
+            <if test="purchaseTime != null">purchase_time = #{purchaseTime},</if>
             <if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>
             <if test="purchaser != null">purchaser = #{purchaser},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 0c47656..0b8b0f2 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into purchase_check_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskId != null">task_id,</if>
-            <if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
+            <if test="purchaseTime != null">purchase_time,</if>
             <if test="arrivalTime != null">arrival_time,</if>
             <if test="purchaser != null">purchaser,</if>
             <if test="createBy != null">create_by,</if>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
-            <if test="purchaseTime != null and purchaseTime != ''">#{purchaseTime},</if>
+            <if test="purchaseTime != null">#{purchaseTime},</if>
             <if test="arrivalTime != null">#{arrivalTime},</if>
             <if test="purchaser != null">#{purchaser},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePurchaseCheckInfo" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
         update purchase_check_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="purchaseTime != null and purchaseTime != ''">purchase_time = #{purchaseTime},</if>
+            <if test="purchaseTime != null">purchase_time = #{purchaseTime},</if>
             <if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>
             <if test="purchaser != null">purchaser = #{purchaser},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
index 70e2b61..bbda98f 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into purchase_check_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskId != null">task_id,</if>
-            <if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
+            <if test="purchaseTime != null">purchase_time,</if>
             <if test="arrivalTime != null">arrival_time,</if>
             <if test="purchaser != null">purchaser,</if>
             <if test="createBy != null">create_by,</if>
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updatePurchaseCheckInfo" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
         update purchase_check_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="purchaseTime != null and purchaseTime != ''">purchase_time = #{purchaseTime},</if>
+            <if test="purchaseTime != null">purchase_time = #{purchaseTime},</if>
             <if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>
             <if test="purchaser != null">purchaser = #{purchaser},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index 0d794d1..459525e 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -179,12 +179,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="qrCode != null and qrCode != ''">qr_code,</if>
         <if test="buyPrice != null and buyPrice != ''">buy_price,</if>
         <if test="maVender != null and maVender != ''">ma_vender,</if>
-        <if test="outFacTime != null and outFacTime != ''">out_fac_time,</if>
+        <if test="outFacTime != null">out_fac_time,</if>
         <if test="outFacCode != null and outFacCode != ''">out_fac_code,</if>
         <if test="assetsCode != null and assetsCode != ''">assets_code,</if>
         <if test="checkMan != null and checkMan != ''">check_man,</if>
-        <if test="thisCheckTime != null and thisCheckTime != ''">this_check_time,</if>
-        <if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
+        <if test="thisCheckTime != null">this_check_time,</if>
+        <if test="nextCheckTime != null">next_check_time,</if>
         <if test="gpsCode != null and gpsCode != ''">gps_code,</if>
         <if test="rfidCode != null and rfidCode != ''">rfid_code,</if>
         <if test="erpCode != null and erpCode != ''">erp_code,</if>
@@ -202,12 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="qrCode != null and qrCode != ''">#{qrCode},</if>
         <if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if>
         <if test="maVender != null and maVender != ''">#{maVender},</if>
-        <if test="outFacTime != null and outFacTime != ''">#{outFacTime},</if>
+        <if test="outFacTime != null">#{outFacTime},</if>
         <if test="outFacCode != null and outFacCode != ''">#{outFacCode},</if>
         <if test="assetsCode != null and assetsCode != ''">#{assetsCode},</if>
         <if test="checkMan != null and checkMan != ''">#{checkMan},</if>
-        <if test="thisCheckTime != null and thisCheckTime != ''">#{thisCheckTime},</if>
-        <if test="nextCheckTime != null and nextCheckTime != ''">#{nextCheckTime},</if>
+        <if test="thisCheckTime != null">#{thisCheckTime},</if>
+        <if test="nextCheckTime != null">#{nextCheckTime},</if>
         <if test="gpsCode != null and gpsCode != ''">#{gpsCode},</if>
         <if test="rfidCode != null and rfidCode != ''">#{rfidCode},</if>
         <if test="erpCode != null and erpCode != ''">#{erpCode},</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
index 8e1e939..ce48e65 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
@@ -39,7 +39,7 @@
         <if test="auditor != null and auditor != ''">
             auditor,
         </if>
-        <if test="auditTime != null and auditTime != ''">
+        <if test="auditTime != null">
             audit_time,
         </if>
         <if test="auditRemark != null and auditRemark != ''">
@@ -80,7 +80,7 @@
         <if test="auditor != null and auditor != ''">
             #{auditor},
         </if>
-        <if test="auditTime != null and auditTime != ''">
+        <if test="auditTime != null">
             #{auditTime},
         </if>
         <if test="auditRemark != null and auditRemark != ''">