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 3831369..513662f 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/DirectApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java index 76e71ea..4f34c10 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java @@ -1,8 +1,11 @@ package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; /** @@ -106,7 +109,9 @@ public class DirectApplyInfo extends BaseEntity { /** * 审核时间 */ - private String auditTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date auditTime; /** * 审核备注 */ diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java index 3a1c186..e0cf4b0 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java @@ -3,10 +3,13 @@ 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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; /** @@ -103,7 +106,9 @@ public class MaMachine extends BaseEntity { * 出厂日期 */ @ApiModelProperty(value = "出厂日期") - private String outFacTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date outFacTime; /** * 出厂编号 */ @@ -124,12 +129,16 @@ public class MaMachine extends BaseEntity { * 本次检验日期 */ @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; /** * gps编号 */ @@ -223,7 +232,9 @@ public class MaMachine extends BaseEntity { /** * 领料时间 */ - private String leaseTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date leaseTime; /** * 退料单位 */ @@ -235,7 +246,9 @@ public class MaMachine extends BaseEntity { /** * 退料时间 */ - private String backTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date backTime; @ApiModelProperty(value = "1:二维码绑定标识 2:rfid绑定标识") private Integer flag; 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 d4d8b9a..7756bf7 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; import java.math.BigDecimal; @@ -74,11 +78,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-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementApply.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementApply.java index 9c9a998..93df7d0 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementApply.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementApply.java @@ -1,8 +1,11 @@ package com.bonus.sgzb.base.api.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -38,7 +41,9 @@ public class SltAgreementApply { /** *创建时间 */ - private String createTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; /** *审核人 */ @@ -46,7 +51,9 @@ public class SltAgreementApply { /** *审核时间 */ - private String audiTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date audiTime; /** *状态0待审核1审核通过2审核驳回 */ diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java index 9e75789..8eabb3b 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java @@ -2,9 +2,12 @@ package com.bonus.sgzb.base.api.domain; import com.alibaba.excel.annotation.ExcelProperty; import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -60,13 +63,17 @@ public class SltAgreementInfo { */ // @Excel(name = "开始日期",sort = 6) @ExcelProperty(index = 6, value = "开始日期") - private String startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date startTime; /** * 退料时间 */ // @Excel(name = "结算日期",sort = 7) @ExcelProperty(index = 7, value = "结算日期") - private String endTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date endTime; /** * 0在用1退回 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/BmAgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/BmAgreementInfo.java index ca9c148..6cd769e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/BmAgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/BmAgreementInfo.java @@ -1,8 +1,10 @@ package com.bonus.sgzb.app.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -33,7 +35,9 @@ public class BmAgreementInfo implements Serializable { * 签订日期 */ @ApiModelProperty(value = "签订日期") - private String signTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date signTime; /** * 往来单位id diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index f5bab20..4eb954d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.app.domain; import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,7 +79,9 @@ public class LeaseApplyInfo implements Serializable { * 公司审批时间 */ @ApiModelProperty(value = "公司审批时间") - private String companyAuditTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date companyAuditTime; /** * 公司审批备注 @@ -96,7 +99,9 @@ public class LeaseApplyInfo implements Serializable { * 分管审批时间 */ @ApiModelProperty(value = "分管审批时间") - private String deptAuditTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deptAuditTime; /** * 分管审批备注 @@ -114,7 +119,9 @@ public class LeaseApplyInfo implements Serializable { * 机具分公司审批时间 */ @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-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index d2917bd..0733171 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -169,12 +169,20 @@ public class TmTask implements Serializable { private String backPerson; @ApiModelProperty(value = "退料人联系电话") private String phone; + @ApiModelProperty(value = "退料申请时间") - private String backTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date backTime; + @ApiModelProperty(value = "退料审核人 机具分公司审批人") private String directAuditBy; + @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 = "退料审核备注 机具分公司审批备注") private String directAuditRemark; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java index 29a74ff..3498d41 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java @@ -1,12 +1,15 @@ package com.bonus.sgzb.base.domain; +import com.bonus.sgzb.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data -public class MaPropSet { +public class MaPropSet extends BaseEntity { + + private static final long serialVersionUID = 1L; /** * ID */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java index e91347e..9358709 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java @@ -39,10 +39,6 @@ public class MaTypeFile extends BaseEntity { @Excel(name = "上传人") private String userId; - //上传时间 - @Excel(name = "上传时间") - private String time; - //帐号状态(0正常 1停用) @Excel(name = "帐号状态(0正常 1停用)") private String status; @@ -99,14 +95,6 @@ public class MaTypeFile extends BaseEntity { this.userId = userId; } - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - public String getStatus() { return status; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java index 4cf7de3..4db75b5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java @@ -1,6 +1,11 @@ package com.bonus.sgzb.base.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + public class MaTypeHisNum { /** @@ -14,7 +19,9 @@ public class MaTypeHisNum { /** * 存入日期 */ - private String time; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date time; /** * 帐号状态(0正常 1停用) */ @@ -43,11 +50,11 @@ public class MaTypeHisNum { } - public String getTime() { + public Date getTime() { return time; } - public void setTime(String time) { + public void setTime(Date time) { this.time = time; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java index 2c39b51..5067910 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java @@ -1,6 +1,11 @@ package com.bonus.sgzb.base.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + public class MaTypeHisPrice { /** * 类型ID @@ -13,7 +18,9 @@ public class MaTypeHisPrice { /** * 修改日期 */ - private String time; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date time; /** * 帐号状态(0正常 1停用) */ @@ -42,11 +49,11 @@ public class MaTypeHisPrice { } - public String getTime() { + public Date getTime() { return time; } - public void setTime(String time) { + public void setTime(Date time) { this.time = time; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java index 7c33cfc..155bce4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java @@ -2,6 +2,10 @@ package com.bonus.sgzb.base.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 org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 库管员配置ma_type_keeper(MaTypeKeeper)表实体类 @@ -22,10 +26,6 @@ public class MaTypeKeeper extends BaseEntity { @Excel(name = "用户") private Long userId; - //创建时间 - @Excel(name = "创建时间") - private String time; - //数据所属组织 @Excel(name = "数据所属组织") private String companyId; @@ -46,14 +46,6 @@ public class MaTypeKeeper extends BaseEntity { this.userId = userId; } - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - public String getCompanyId() { return companyId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index b8382cc..f72b4ee 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -71,6 +71,7 @@ public class MaTypeServiceImpl implements ITypeService { typeFile.setFileName(maType.getPhotoName()); typeFile.setFileUrl(maType.getPhotoUrl()); typeFile.setFileType("1"); + typeFile.setCreateTime(DateUtils.getNowDate()); typeFileMapper.insertMaTypeFile(typeFile); } // 文档路径保存 @@ -80,23 +81,27 @@ public class MaTypeServiceImpl implements ITypeService { typeFile1.setFileName(maType.getDocumentName()); typeFile1.setFileUrl(maType.getDocumentUrl()); typeFile1.setFileType("2"); + typeFile1.setCreateTime(DateUtils.getNowDate()); typeFileMapper.insertMaTypeFile(typeFile1); } // 库管员配置 MaTypeKeeper typeKeeper = new MaTypeKeeper(); typeKeeper.setUserId(maType.getKeeperUserId()); typeKeeper.setTypeId(typeId); + typeKeeper.setCreateTime(DateUtils.getNowDate()); maTypeMapper.insertKeeper(typeKeeper); // 维修员配置 MaTypeRepair typeRepair = new MaTypeRepair(); typeRepair.setUserId(maType.getRepairUserId()); typeRepair.setTypeId(typeId); + typeRepair.setCreateTime(DateUtils.getNowDate()); maTypeMapper.insertRepair(typeRepair); // 资产属性配置 MaPropSet propSet = new MaPropSet(); propSet.setTypeId(typeId); propSet.setPropId(maType.getPropId()); + propSet.setCreateTime(DateUtils.getNowDate()); maTypeMapper.insertMaPropSet(propSet); return i; } @@ -120,6 +125,8 @@ public class MaTypeServiceImpl implements ITypeService { typeFile.setFileName(maType.getPhotoName()); typeFile.setFileUrl(maType.getPhotoUrl()); typeFile.setFileType("1"); + typeFile.setCreateTime(DateUtils.getNowDate()); + typeFile.setUpdateTime(DateUtils.getNowDate()); typeFileMapper.insertMaTypeFile(typeFile); } // 文档路径保存 @@ -130,6 +137,8 @@ public class MaTypeServiceImpl implements ITypeService { typeFile1.setFileName(maType.getDocumentName()); typeFile1.setFileUrl(maType.getDocumentUrl()); typeFile1.setFileType("2"); + typeFile1.setCreateTime(DateUtils.getNowDate()); + typeFile1.setUpdateTime(DateUtils.getNowDate()); typeFileMapper.insertMaTypeFile(typeFile1); } // 库管员配置 @@ -138,6 +147,8 @@ public class MaTypeServiceImpl implements ITypeService { MaTypeKeeper typeKeeper = new MaTypeKeeper(); typeKeeper.setUserId(maType.getKeeperUserId()); typeKeeper.setTypeId(typeId); + typeKeeper.setCreateTime(DateUtils.getNowDate()); + typeKeeper.setUpdateTime(DateUtils.getNowDate()); maTypeMapper.insertKeeper(typeKeeper); } @@ -155,6 +166,8 @@ public class MaTypeServiceImpl implements ITypeService { MaPropSet propSet = new MaPropSet(); propSet.setTypeId(typeId); propSet.setPropId(maType.getPropId()); + propSet.setCreateTime(DateUtils.getNowDate()); + propSet.setUpdateTime(DateUtils.getNowDate()); maTypeMapper.insertMaPropSet(propSet); } return i; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 925762b..9343b4c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -286,7 +286,7 @@ public class BackApplyController extends BaseController { // -----重庆机具专属----- backApplyInfo.setStatus("1"); backApplyInfo.setDirectAuditBy(1); - backApplyInfo.setDirectAuditTime(DateUtils.getTime()); + backApplyInfo.setDirectAuditTime(DateUtils.getNowDate()); backApplyInfo.setDirectAuditRemark("系统自动审批"); /*设置任务ID*/ backApplyInfo.setTaskId(taskId); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 648517e..562bd19 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -7,6 +7,7 @@ import com.bonus.sgzb.base.api.domain.DirectApplyDetails; import com.bonus.sgzb.base.api.domain.DirectApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.SltAgreementInfo; +import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -127,7 +128,7 @@ public class WorkSiteDirectManageController extends BaseController { if (directApplyInfo != null) { directApplyInfo.setStatus("2"); directApplyInfo.setAuditor(SecurityUtils.getLoginUser().getUsername()); - directApplyInfo.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); + directApplyInfo.setAuditTime(DateUtils.getNowDate()); workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfo); } else { return AjaxResult.error("参数为空,审核失败"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index 4f0e44c..86154f4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -5,6 +5,7 @@ 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.math.BigDecimal; import java.util.Date; @@ -42,7 +43,9 @@ public class AgreementInfo extends BaseEntity { */ @Excel(name = "签订日期") @ApiModelProperty(value = "签订日期") - private String signTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date signTime; /** * 往来单位id diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java index 1576e31..27e131f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java @@ -1,6 +1,8 @@ package com.bonus.sgzb.material.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -30,11 +32,15 @@ public class ProjectMonthDetail { /** * 开始日期 */ - private String startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startTime; /** * 结束日期 */ - private String endTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endTime; /** * 结算天数 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java index 4a93f77..2058b7d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java @@ -2,10 +2,13 @@ package com.bonus.sgzb.material.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 org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; /** @@ -36,13 +39,17 @@ public class PurchaseCheckInfo extends BaseEntity /** 采购日期 */ @ApiModelProperty(value = "采购日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "采购日期") - private String purchaseTime; + private Date purchaseTime; /** 到货日期 */ @ApiModelProperty(value = "到货日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到货日期") - private String arrivalTime; + private Date arrivalTime; /** 采购员名称 */ @ApiModelProperty(value = "采购员名称") @@ -153,21 +160,21 @@ public class PurchaseCheckInfo extends BaseEntity { return taskId; } - public void setPurchaseTime(String purchaseTime) + public void setPurchaseTime(Date purchaseTime) { this.purchaseTime = purchaseTime; } - public String getPurchaseTime() + public Date getPurchaseTime() { return purchaseTime; } - public void setArrivalTime(String arrivalTime) + public void setArrivalTime(Date arrivalTime) { this.arrivalTime = arrivalTime; } - public String getArrivalTime() + public Date getArrivalTime() { return arrivalTime; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java index ba8d00c..f6dfa2e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java @@ -132,8 +132,10 @@ public class PurchasePartDetails extends BaseEntity private Integer inputNum; /** 入库时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "入库时间") - private String inputTime; + private Date inputTime; /** 入库人 */ @ApiModelProperty(value = "入库人") @@ -400,11 +402,11 @@ public class PurchasePartDetails extends BaseEntity this.modelId = modelId; } - public String getInputTime() { + public Date getInputTime() { return inputTime; } - public void setInputTime(String inputTime) { + public void setInputTime(Date inputTime) { this.inputTime = inputTime; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java index 6f1b999..24ce352 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java @@ -2,11 +2,14 @@ package com.bonus.sgzb.material.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 org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -32,13 +35,17 @@ public class PurchasePartInfo extends BaseEntity /** 采购日期 */ @ApiModelProperty(value = "采购日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "采购日期") - private String purchaseTime; + private Date purchaseTime; /** 到货日期 */ @ApiModelProperty(value = "到货日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "到货日期") - private String arrivalTime; + private Date arrivalTime; /** 采购员 */ @ApiModelProperty(value = "采购员") @@ -160,21 +167,21 @@ public class PurchasePartInfo extends BaseEntity { return taskId; } - public void setPurchaseTime(String purchaseTime) + public void setPurchaseTime(Date purchaseTime) { this.purchaseTime = purchaseTime; } - public String getPurchaseTime() + public Date getPurchaseTime() { return purchaseTime; } - public void setArrivalTime(String arrivalTime) + public void setArrivalTime(Date arrivalTime) { this.arrivalTime = arrivalTime; } - public String getArrivalTime() + public Date getArrivalTime() { return arrivalTime; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapAuditorSet.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapAuditorSet.java index a245219..dc794bf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapAuditorSet.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapAuditorSet.java @@ -1,8 +1,12 @@ package com.bonus.sgzb.material.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @ApiModel(description="报废审核人员配置") @Data @@ -55,7 +59,9 @@ public class ScrapAuditorSet { * 审核时间 */ @ApiModelProperty(value = "审核时间") - private String auditTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date auditTime; /** *驳回原因 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java index 4324f74..4952ec0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java @@ -259,7 +259,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { if ("1".equals(partDetails.getCheckResult())) { partDetails.setStatus(3); partDetails.setInputNum(partDetails.getCheckNum()); - partDetails.setInputTime(String.valueOf(DateUtils.getNowDate())); + partDetails.setInputTime(DateUtils.getNowDate()); partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); partDetails.setUpdateTime(DateUtils.getNowDate()); @@ -309,6 +309,10 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { return res; } + public static void main(String[] args) { + System.out.println(DateUtils.getNowDate()); + } + @Override public List exportList(PurchasePartInfo bean) { return purchaseAccessoryMapper.exportList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index cf1f53c..5219ee8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -136,6 +136,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { //修改装备状态 for (ScrapApplyDetails scrapApplyDetails: scrapApplyDetailList){ scrapApplyDetails.setAuditTime(new Date()); + scrapApplyDetails.setUpdateTime(DateUtils.getNowDate()); scrapApplyDetailsMapper.updateScrapApplyDetails(scrapApplyDetails); } //根据任务id查看是否还有未审核的设备 @@ -212,7 +213,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { public int scrapTaskReview(ScrapAuditorSet scrapAuditorSet) { log.info("ScrapApplyDetailsServiceImpl scrapTaskReview begin: {}", scrapAuditorSet); try { - scrapAuditorSet.setAuditTime(DateUtils.dateTimeNow()); + scrapAuditorSet.setAuditTime(new Date()); //修改审核状态 scrapAuditorSetMapper.updateStatus(scrapAuditorSet); //获取报废任务所有审核人员的审核详情 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index 08654a6..a702df7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.bonus.sgzb.base.api.domain.*; +import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; @@ -600,7 +601,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); directApplyInfos.setStatus("1"); directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); - directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); + directApplyInfos.setAuditTime(DateUtils.getNowDate()); res = refuseDirectApplyInfo(directApplyInfos); } else { return res; @@ -616,4 +617,8 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } return res; } + + public static void main(String[] args) { + System.out.println(new Date()); + } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml index f3f9b95..03ae447 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -542,19 +542,21 @@ ) - insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type) - values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},#{info.leaseType}); + insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time) + values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},#{info.leaseType},now()); update tm_task - set task_status=#{status} + set task_status=#{status}, + update_time = NOW() where task_id = #{taskId} update ma_machine - set ma_status=#{maStatus} + set ma_status=#{maStatus}, + update_time = NOW() where ma_id = #{maId} @@ -566,6 +568,7 @@ update slt_agreement_info set end_time = now(), + update_time = now(), back_id = #{record.parentId}, status = '1' where id = #{info.id} @@ -574,13 +577,14 @@ update slt_agreement_info set num = #{backNum}, end_time = now(), + update_time = now(), back_id = #{record.parentId}, status = '1' where id = #{info.id} - update back_check_details set is_finished = 1 where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1) + update back_check_details set is_finished = 1, update_time = now() where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1) 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 f8f8c91..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 @@ -71,7 +71,7 @@ values (#{code,jdbcType=VARCHAR}, #{taskId,jdbcType=INTEGER}, #{leasePerson,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{companyAuditBy,jdbcType=INTEGER}, #{companyAuditTime,jdbcType=VARCHAR}, #{companyAuditRemark,jdbcType=VARCHAR}, #{deptAuditBy,jdbcType=INTEGER}, #{deptAuditTime,jdbcType=VARCHAR}, - #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, NOW(), #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR},#{costBearingParty,jdbcType=VARCHAR}) @@ -98,7 +98,7 @@ company_audit_by, - + company_audit_time, @@ -107,7 +107,7 @@ dept_audit_by, - + dept_audit_time, @@ -116,9 +116,7 @@ create_by, - - create_time, - + create_time, update_by, @@ -160,8 +158,8 @@ #{companyAuditBy,jdbcType=INTEGER}, - - #{companyAuditTime,jdbcType=VARCHAR}, + + #{companyAuditTime}, #{companyAuditRemark,jdbcType=VARCHAR}, @@ -169,8 +167,8 @@ #{deptAuditBy,jdbcType=INTEGER}, - - #{deptAuditTime,jdbcType=VARCHAR}, + + #{deptAuditTime}, #{deptAuditRemark,jdbcType=VARCHAR}, @@ -178,9 +176,7 @@ #{createBy,jdbcType=VARCHAR}, - - #{createTime,jdbcType=TIMESTAMP}, - + NOW(), #{updateBy,jdbcType=VARCHAR}, @@ -248,15 +244,13 @@ update_by = #{updateBy,jdbcType=VARCHAR}, - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR}, company_id = #{companyId,jdbcType=INTEGER}, + update_time = NOW(), where id = #{id,jdbcType=INTEGER} @@ -277,7 +271,7 @@ create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, + update_time = NOW(), remark = #{remark,jdbcType=VARCHAR}, company_id = #{companyId,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER} @@ -509,7 +503,7 @@ #{item.type,jdbcType=VARCHAR}, #{item.companyAuditBy,jdbcType=INTEGER}, #{item.companyAuditTime,jdbcType=VARCHAR}, #{item.companyAuditRemark,jdbcType=VARCHAR}, #{item.deptAuditBy,jdbcType=INTEGER}, #{item.deptAuditTime,jdbcType=VARCHAR}, #{item.deptAuditRemark,jdbcType=VARCHAR}, - #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, + #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER} ) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 93664c4..a821d4c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -304,12 +304,14 @@ update tm_task - set task_status = #{status} + set task_status = #{status}, + update_time = NOW() where task_id = #{taskId} update slt_agreement_info - set num = #{num} + set num = #{num}, + update_time = now() where id = #{id} @@ -383,8 +385,8 @@ - insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type) - values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType}); + insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time) + values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now()); - update tm_task set `status` = '0' + update tm_task set `status` = '0',update_time = NOW() where task_id = #{taskId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseMapper.xml index 2b0c539..0282f3d 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseMapper.xml @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ma_house_info set del_flag = '2' where house_id = #{houseId} + update ma_house_info set del_flag = '2', update_time = NOW() where house_id = #{houseId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseSetMapper.xml index c3aa468..14374f6 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaHouseSetMapper.xml @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ma_house_set set del_flag = '2' where id = #{id} + update ma_house_set set del_flag = '2', update_time = NOW() where id = #{id} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml index 08bab02..450e330 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml @@ -169,6 +169,7 @@ binder = #{binder}, label_type = #{labelType}, company_id = #{companyId}, + update_time = NOW() where ma_id = #{maId} @@ -178,7 +179,7 @@ - update ma_label_bind set status = '2' where id = #{id} + update ma_label_bind set status = '2', update_time = NOW() where id = #{id} update ma_machine_label set - ma_id = #{maId},is_bind =#{isBind} + ma_id = #{maId},is_bind =#{isBind},update_time = NOW() where label_id =#{labelId} update ma_machine_label set - ma_id = #{maId},is_bind =1 + ma_id = #{maId},is_bind =1,update_time = NOW() where label_code =#{labelCode} 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 528d3b7..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}, @@ -265,6 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" buy_task = #{buyTask}, own_house = #{ownHouse}, company_id = #{companyId}, + update_time = sysdate() where ma_id = #{maId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml index a40302b..f87e3a7 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -116,7 +116,7 @@ user_id, status, company_id, - time + create_time )values( #{typeId}, #{maId}, @@ -225,13 +225,15 @@ type_id, user_id, - time, + create_time, + update_time, company_id, #{typeId}, #{userId}, - #{time}, + #{createTime}, + #{updateTime}, #{companyId}, @@ -241,13 +243,15 @@ type_id, user_id, - time, + create_time, + update_time, company_id, #{typeId}, #{userId}, - #{time}, + #{createTime}, + #{updateTime}, #{companyId}, @@ -301,11 +305,11 @@ - update ma_type_keeper set user_id = #{userId} where type_id = #{typeId} + update ma_type_keeper set user_id = #{userId},update_time = now() where type_id = #{typeId} - update ma_type_repair set user_id = #{userId} where type_id = #{typeId} + update ma_type_repair set user_id = #{userId},update_time = now() where type_id = #{typeId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml index 5e5e32b..43422e0 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml @@ -11,13 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select type_id, ma_id, file_name, file_url, file_type, user_id, time, status, company_id from ma_type_file + select type_id, ma_id, file_name, file_url, file_type, user_id, status, company_id from ma_type_file 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/LeaseRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml index d4e47eb..958f9a7 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml @@ -4,12 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id) - values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId}); + insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,create_time) + values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},now()); update slt_agreement_info - set num = #{num} + set num = #{num}, + update_time = now() where id = #{id} 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/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 62de417..394eb35 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update purchase_check_details set status = 0 where task_id = #{taskId} + update purchase_check_details set status = 0, update_time = NOW() where task_id = #{taskId} SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time, 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 ab00e53..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}, @@ -90,8 +90,8 @@ ) - insert into direct_apply_details(direct_id,type_id,ma_id,direct_num) - values (#{directId},#{typeId},#{maId}, #{directNum}) + insert into direct_apply_details(direct_id,type_id,ma_id,direct_num,create_time) + values (#{directId},#{typeId},#{maId}, #{directNum},NOW()) @@ -323,7 +323,7 @@ ) - update direct_apply_info set status = #{status},auditor=#{auditor},audit_time=#{auditTime} where id = #{id} + update direct_apply_info set status = #{status},auditor=#{auditor},audit_time=#{auditTime},update_time = now() where id = #{id} UPDATE