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 f6dfa2e..ef33bac 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 @@ -135,7 +135,7 @@ public class PurchasePartDetails extends BaseEntity @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "入库时间") - private Date inputTime; + private String inputTime; /** 入库人 */ @ApiModelProperty(value = "入库人") @@ -402,11 +402,11 @@ public class PurchasePartDetails extends BaseEntity this.modelId = modelId; } - public Date getInputTime() { + public String getInputTime() { return inputTime; } - public void setInputTime(Date inputTime) { + public void setInputTime(String inputTime) { this.inputTime = inputTime; } 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 4952ec0..c744786 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(DateUtils.getNowDate()); + partDetails.setInputTime(DateUtils.getNowDate().toString()); partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); partDetails.setUpdateTime(DateUtils.getNowDate());