From b5b16a26de0d84d7b5fb69b584377bdc3582e3ab Mon Sep 17 00:00:00 2001 From: wlzboy <66905212@qq.com> Date: 星期日, 21 九月 2025 20:43:08 +0800 Subject: [PATCH] feat: 更新评价功能 --- ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceOrder.java | 97 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 74 insertions(+), 23 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceOrder.java index 4cefa3f..9243548 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceOrder.java @@ -10,16 +10,18 @@ /** * 鏈嶅姟璁㈠崟瀵硅薄 service_order + * + * @author ruoyi */ public class ServiceOrder extends BaseEntity { private static final long serialVersionUID = 1L; - /** 璁㈠崟ID */ + /** 鏈嶅姟璁㈠崟ID */ private Long serviceOrdId; /** 鐢ㄦ埛ID */ @Excel(name = "鐢ㄦ埛ID") - private Integer serviceOrdUserID; + private Long serviceOrdUserID; /** 璁㈠崟绫诲埆 */ @Excel(name = "璁㈠崟绫诲埆") @@ -43,36 +45,36 @@ @Excel(name = "棰勭害鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date serviceOrdApptDate; - /** 鍏徃鍚嶇О */ - @Excel(name = "鍏徃鍚嶇О") + /** 鑱旂郴浜哄鍚� */ + @Excel(name = "鑱旂郴浜哄鍚�") private String serviceOrdCoName; - /** 鍏徃鐢佃瘽 */ - @Excel(name = "鍏徃鐢佃瘽") + /** 鑱旂郴浜虹數璇� */ + @Excel(name = "鑱旂郴浜虹數璇�") private String serviceOrdCoPhone; - /** 鐥呬汉濮撳悕 */ - @Excel(name = "鐥呬汉濮撳悕") + /** 鎮h�呭鍚� */ + @Excel(name = "鎮h�呭鍚�") private String serviceOrdPtName; - /** 鐥呬汉骞撮緞 */ - @Excel(name = "鐥呬汉骞撮緞") + /** 鎮h�呭勾榫� */ + @Excel(name = "鎮h�呭勾榫�") private String serviceOrdPtAge; - /** 鐥呬汉鎬у埆 */ - @Excel(name = "鐥呬汉鎬у埆") + /** 鎮h�呮�у埆 */ + @Excel(name = "鎮h�呮�у埆") private String serviceOrdPtSex; - /** 鐥呬汉浣撻噸 */ - @Excel(name = "鐥呬汉浣撻噸") + /** 鎮h�呬綋閲� */ + @Excel(name = "鎮h�呬綋閲�") private String serviceOrdPtKG; - /** 鐥呬汉鍥界睄 */ - @Excel(name = "鐥呬汉鍥界睄") + /** 鎮h�呭浗绫� */ + @Excel(name = "鎮h�呭浗绫�") private String serviceOrdPtNat; - /** 鐥呬汉韬唤璇佸彿 */ - @Excel(name = "鐥呬汉韬唤璇佸彿") + /** 鎮h�呰韩浠借瘉鍙� */ + @Excel(name = "鎮h�呰韩浠借瘉鍙�") private String serviceOrdPtIDCard; /** 鍑哄彂鐪佷唤 */ @@ -111,9 +113,24 @@ @Excel(name = "鏀粯閲戦") private BigDecimal serviceOrdTraPaidPrice; - /** 璁㈠崟澶囨敞 */ - @Excel(name = "璁㈠崟澶囨敞") + /** 澶囨敞 */ + @Excel(name = "澶囨敞") private String serviceOrdUnitRemarks; + + + /** 璋冨害鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "璋冨害鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date serviceOrdCCTime; + + /** 璇勪环 */ + @Excel(name = "璇勪环") + private String serviceOrdVisit; + + + /** 鍒嗛〉鍙傛暟 */ + private Integer pageNum; + private Integer pageSize; // Getters and Setters public Long getServiceOrdId() { @@ -124,11 +141,11 @@ this.serviceOrdId = serviceOrdId; } - public Integer getServiceOrdUserID() { + public Long getServiceOrdUserID() { return serviceOrdUserID; } - public void setServiceOrdUserID(Integer serviceOrdUserID) { + public void setServiceOrdUserID(Long serviceOrdUserID) { this.serviceOrdUserID = serviceOrdUserID; } @@ -316,9 +333,41 @@ this.serviceOrdUnitRemarks = serviceOrdUnitRemarks; } + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public Date getServiceOrdCCTime() { + return serviceOrdCCTime; + } + + public void setServiceOrdCCTime(Date serviceOrdCCTime) { + this.serviceOrdCCTime = serviceOrdCCTime; + } + + public String getServiceOrdVisit() { + return serviceOrdVisit; + } + + public void setServiceOrdVisit(String serviceOrdVisit) { + this.serviceOrdVisit = serviceOrdVisit; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("serviceOrdId", getServiceOrdId()) .append("serviceOrdUserID", getServiceOrdUserID()) .append("serviceOrdClass", getServiceOrdClass()) @@ -344,6 +393,8 @@ .append("serviceOrdTraPaidType", getServiceOrdTraPaidType()) .append("serviceOrdTraPaidPrice", getServiceOrdTraPaidPrice()) .append("serviceOrdUnitRemarks", getServiceOrdUnitRemarks()) + .append("pageNum", getPageNum()) + .append("pageSize", getPageSize()) .toString(); } } \ No newline at end of file -- Gitblit v1.9.1