From 24e25747ff418a4eef4af19607cc520e9a82c25c Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 16 May 2025 15:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/vo/DrpContractPageVO.java | 54 +++++++++---------- .../purchase/domain/vo/DrpExcelInquiryVO.java | 14 ++--- .../domain/vo/DrpFinalBidsQuotePageVO.java | 14 ++--- .../domain/vo/DrpPurPlanDetailPageVO.java | 18 +++---- .../domain/vo/DrpQuoteComparisonDetailVO.java | 18 +++---- .../supply.purchase/DrpInspectGoodsMapper.xml | 2 +- .../DrpProcurementContractMapper.xml | 6 +-- .../DrpProductionPlanMapper.xml | 2 +- .../DrpPurPlanDetailMapper.xml | 2 +- .../DrpPurchaseInquiryDetailMapper.xml | 8 +-- .../DrpPurchaseInquiryMapper.xml | 6 +-- .../DrpPurchaseInquirySupplierMapper.xml | 4 +- ...DrpPurchaseMaterialWinBidRecordsMapper.xml | 24 ++++----- 13 files changed, 86 insertions(+), 86 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpContractPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpContractPageVO.java index 0d802d0..842e0ba 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpContractPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpContractPageVO.java @@ -51,11 +51,11 @@ public class DrpContractPageVO { @ApiModelProperty("创建人") private String createBy; @ApiModelProperty("创建时间") - private LocalDateTime crtime; + private LocalDateTime createTime; @ApiModelProperty("更新人") - private String upby; + private String updateBy; @ApiModelProperty("更新时间") - private LocalDateTime uptime; + private LocalDateTime updateTime; @ApiModelProperty("审批人") private String approveBy; @ApiModelProperty("审批完成时间") @@ -175,18 +175,6 @@ public class DrpContractPageVO { return this.remark; } - public LocalDateTime getCrtime() { - return this.crtime; - } - - public String getUpby() { - return this.upby; - } - - public LocalDateTime getUptime() { - return this.uptime; - } - public String getApproveBy() { return this.approveBy; } @@ -315,18 +303,6 @@ public class DrpContractPageVO { this.remark = remark; } - public void setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; - } - - public void setUpby(final String upby) { - this.upby = upby; - } - - public void setUptime(final LocalDateTime uptime) { - this.uptime = uptime; - } - public void setApproveBy(final String approveBy) { this.approveBy = approveBy; } @@ -394,4 +370,28 @@ public class DrpContractPageVO { public void setCreateBy(String createBy) { this.createBy = createBy; } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public LocalDateTime getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(LocalDateTime updateTime) { + this.updateTime = updateTime; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpExcelInquiryVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpExcelInquiryVO.java index 554b369..f53a052 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpExcelInquiryVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpExcelInquiryVO.java @@ -36,7 +36,7 @@ public class DrpExcelInquiryVO implements Serializable { @ApiModelProperty("决标时间") private String bidTime; @ApiModelProperty("制表时间") - private String crtime; + private String createTime; public String getInquiryId() { return this.inquiryId; @@ -90,10 +90,6 @@ public class DrpExcelInquiryVO implements Serializable { return this.bidTime; } - public String getCrtime() { - return this.crtime; - } - public void setInquiryId(final String inquiryId) { this.inquiryId = inquiryId; } @@ -146,7 +142,11 @@ public class DrpExcelInquiryVO implements Serializable { this.bidTime = bidTime; } - public void setCrtime(final String crtime) { - this.crtime = crtime; + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpFinalBidsQuotePageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpFinalBidsQuotePageVO.java index a976247..05358a4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpFinalBidsQuotePageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpFinalBidsQuotePageVO.java @@ -39,7 +39,7 @@ public class DrpFinalBidsQuotePageVO implements Serializable { @ApiModelProperty("指导价格") private Integer guidePrice; @ApiModelProperty("定价时间") - private LocalDateTime crtime; + private LocalDateTime createTime; public String getImageUrl() { return SysUtil.getCutFileUrl(this.imageUrl); @@ -93,10 +93,6 @@ public class DrpFinalBidsQuotePageVO implements Serializable { return this.guidePrice; } - public LocalDateTime getCrtime() { - return this.crtime; - } - public void setInquiryDetailId(final Long inquiryDetailId) { this.inquiryDetailId = inquiryDetailId; } @@ -149,7 +145,11 @@ public class DrpFinalBidsQuotePageVO implements Serializable { this.guidePrice = guidePrice; } - public void setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpPurPlanDetailPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpPurPlanDetailPageVO.java index 2a55f1d..2a1c248 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpPurPlanDetailPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpPurPlanDetailPageVO.java @@ -53,7 +53,7 @@ public class DrpPurPlanDetailPageVO { @ApiModelProperty("供应商id") private Long supllerId; @ApiModelProperty("创建时间") - private LocalDateTime crtime; + private LocalDateTime createTime; @ApiModelProperty("备注") private String remark; @ApiModelProperty("货品首选供应商id") @@ -159,10 +159,6 @@ public class DrpPurPlanDetailPageVO { return this.supllerId; } - public LocalDateTime getCrtime() { - return this.crtime; - } - public String getRemark() { return this.remark; } @@ -291,10 +287,6 @@ public class DrpPurPlanDetailPageVO { this.supllerId = supllerId; } - public void setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; - } - public void setRemark(final String remark) { this.remark = remark; } @@ -342,4 +334,12 @@ public class DrpPurPlanDetailPageVO { public void setCertName(final String certName) { this.certName = certName; } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpQuoteComparisonDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpQuoteComparisonDetailVO.java index b1ad7f7..e909001 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpQuoteComparisonDetailVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpQuoteComparisonDetailVO.java @@ -33,7 +33,7 @@ public class DrpQuoteComparisonDetailVO { @ApiModelProperty("指导价格") private Integer guidePrice; @ApiModelProperty("定价时间") - private LocalDateTime crtime; + private LocalDateTime createTime; @ApiModelProperty("说明") private String remark; @ApiModelProperty("图片") @@ -93,10 +93,6 @@ public class DrpQuoteComparisonDetailVO { return this.guidePrice; } - public LocalDateTime getCrtime() { - return this.crtime; - } - public String getRemark() { return this.remark; } @@ -157,10 +153,6 @@ public class DrpQuoteComparisonDetailVO { this.guidePrice = guidePrice; } - public void setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; - } - public void setRemark(final String remark) { this.remark = remark; } @@ -180,4 +172,12 @@ public class DrpQuoteComparisonDetailVO { public void setRecentMarketPrice(final Integer recentMarketPrice) { this.recentMarketPrice = recentMarketPrice; } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpInspectGoodsMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpInspectGoodsMapper.xml index ffbdef4..d4c626b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpInspectGoodsMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpInspectGoodsMapper.xml @@ -93,7 +93,7 @@ - ORDER BY a.crtime DESC + ORDER BY a.create_time DESC diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpProcurementContractMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpProcurementContractMapper.xml index 8f7f2de..b24f251 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpProcurementContractMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpProcurementContractMapper.xml @@ -41,10 +41,10 @@ and dpc.supplier_id = #{content.supplierId} - and dpc.crtime = ]]> #{content.crtimeStart} + and dpc.create_time = ]]> #{content.crtimeStart} - and dpc.crtime #{content.crtimeEnd} + and dpc.create_time #{content.crtimeEnd} and ac.area_id in @@ -52,7 +52,7 @@ #{areaId} - order by dpc.crtime desc + order by dpc.create_time desc @@ -98,7 +98,7 @@ and a.material_inquiry_id= #{materialInquiryId} - order by a.crtime desc + order by a.create_time desc @@ -217,7 +217,7 @@ where dmpd.material_id = #{materialId} and dmpd.unit_id = #{unitId} and dmp.del_flag = 0 and dmp.commit_status = 2 - order by dmp.crtime desc + order by dmp.create_time desc limit 3 @@ -277,13 +277,13 @@