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 @@
company_audit_by,
-
+
company_audit_time,
@@ -107,7 +107,7 @@
dept_audit_by,
-
+
dept_audit_time,
@@ -158,8 +158,8 @@
#{companyAuditBy,jdbcType=INTEGER},
-
- #{companyAuditTime,jdbcType=VARCHAR},
+
+ #{companyAuditTime},
#{companyAuditRemark,jdbcType=VARCHAR},
@@ -167,8 +167,8 @@
#{deptAuditBy,jdbcType=INTEGER},
-
- #{deptAuditTime,jdbcType=VARCHAR},
+
+ #{deptAuditTime},
#{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"
qr_code,
buy_price,
ma_vender,
- out_fac_time,
+ out_fac_time,
out_fac_code,
assets_code,
check_man,
- this_check_time,
- next_check_time,
+ this_check_time,
+ next_check_time,
gps_code,
rfid_code,
erp_code,
@@ -223,12 +223,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{qrCode},
#{buyPrice},
#{maVender},
- #{outFacTime},
+ #{outFacTime},
#{outFacCode},
#{assetsCode},
#{checkMan},
- #{thisCheckTime},
- #{nextCheckTime},
+ #{thisCheckTime},
+ #{nextCheckTime},
#{gpsCode},
#{rfidCode},
#{erpCode},
@@ -251,12 +251,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
qr_code = #{qrCode},
buy_price = #{buyPrice},
ma_vender = #{maVender},
- out_fac_time =#{outFacTime},
+ out_fac_time =#{outFacTime},
out_fac_code = #{outFacCode},
assets_code =#{assetsCode},
check_man = #{checkMan},
- this_check_time = #{thisCheckTime},
- next_check_time = #{nextCheckTime},
+ this_check_time = #{thisCheckTime},
+ next_check_time = #{nextCheckTime},
gps_code = #{gpsCode},
rfid_code = #{rfidCode},
erp_code = #{erpCode},
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 into ma_type_his_num (
storage_num,
- time,
+ time,
status,
company_id
)values(
#{storageNum},
- #{time},
+ #{time},
#{status},
#{companyId},
)
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_type_his_num
storage_num = #{storageNum},
- time = #{time},
+ time = #{time},
status = #{status},
company_id = #{companyId},
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 into ma_type_his_price (
ma_code,
- time,
+ time,
status,
company_id
)values(
#{leasePrice},
- #{time},
+ #{time},
#{status},
#{companyId},
)
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_type_his_price
ma_code = #{leasePrice},
- time = #{time},
+ time = #{time},
status = #{status},
company_id = #{companyId},
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
agreement_code,
- sign_time,
+ sign_time,
unit_id,
project_id,
create_by,
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{agreementCode},
- #{signTime},
+ #{signTime},
#{unitId},
#{projectId},
#{createBy},
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bm_agreement_info
- sign_time = #{signTime},
+ sign_time = #{signTime},
unit_id = #{unitId},
project_id = #{projectId},
create_by = #{createBy},
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"
back_person,
-
+
back_time,
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
direct_audit_by,
-
+
direct_audit_time,
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 @@
ma_vender,
check_man,
out_fac_code,
- this_check_time,
- next_check_time,
+ this_check_time,
+ next_check_time,
create_time
)values(
#{typeId},
@@ -129,8 +129,8 @@
#{maVender},
#{checkMan},
#{outFacCode},
- #{thisCheckTime},
- #{nextCheckTime},
+ #{thisCheckTime},
+ #{nextCheckTime},
sysdate()
)
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
task_id,
- purchase_time,
+ purchase_time,
arrival_time,
purchaser,
create_by,
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update purchase_part_info
- purchase_time = #{purchaseTime},
+ purchase_time = #{purchaseTime},
arrival_time = #{arrivalTime},
purchaser = #{purchaser},
create_by = #{createBy},
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
task_id,
- purchase_time,
+ purchase_time,
arrival_time,
purchaser,
create_by,
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{taskId},
- #{purchaseTime},
+ #{purchaseTime},
#{arrivalTime},
#{purchaser},
#{createBy},
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update purchase_check_info
- purchase_time = #{purchaseTime},
+ purchase_time = #{purchaseTime},
arrival_time = #{arrivalTime},
purchaser = #{purchaser},
create_by = #{createBy},
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
task_id,
- purchase_time,
+ purchase_time,
arrival_time,
purchaser,
create_by,
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update purchase_check_info
- purchase_time = #{purchaseTime},
+ purchase_time = #{purchaseTime},
arrival_time = #{arrivalTime},
purchaser = #{purchaser},
create_by = #{createBy},
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"
qr_code,
buy_price,
ma_vender,
- out_fac_time,
+ out_fac_time,
out_fac_code,
assets_code,
check_man,
- this_check_time,
- next_check_time,
+ this_check_time,
+ next_check_time,
gps_code,
rfid_code,
erp_code,
@@ -202,12 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{qrCode},
#{buyPrice},
#{maVender},
- #{outFacTime},
+ #{outFacTime},
#{outFacCode},
#{assetsCode},
#{checkMan},
- #{thisCheckTime},
- #{nextCheckTime},
+ #{thisCheckTime},
+ #{nextCheckTime},
#{gpsCode},
#{rfidCode},
#{erpCode},
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 @@
auditor,
-
+
audit_time,
@@ -80,7 +80,7 @@
#{auditor},
-
+
#{auditTime},