From a89e21aa0d9dc9d8bb262addfb0da0ab62987e2a Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Mon, 8 Apr 2024 09:57:49 +0800 Subject: [PATCH] '123' --- .../main/java/com/ruoyi/quot/domain/Quot.java | 84 +-- .../technicalConfirm/domain/QuotJsqr.java | 361 ++++-------- .../technicalConfirm/QuotJsqrMapper.xml | 37 +- ruoyi-ui/src/views/quot/quot/index.vue | 4 +- .../technicalConfirm/index.vue | 519 +++++++++++++----- 5 files changed, 554 insertions(+), 451 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index 3371872..8b25ec8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -105,18 +105,18 @@ public class Quot extends BaseEntity private String quotJsxzGroup;//技术协助-分组 private String quotJsxzConfirmId;//技术协助-技术确认单id - private String quotJsxzConfirmCode;//技术协助-技术确认单号 - private String quotJsxzTlApprovalStatus;//技术协助-特缆协助状态 - private String quotJsxzTlRemark;//技术协助-特缆协助说明 - private String quotJsxzDyApprovalStatus;//技术协助-低压协助状态 - private String quotJsxzDyRemark;//技术协助-低压协助说明 + private String quotJsqrTlApprovalStatus;//技术协助-特缆协助状态 + private String quotJsqrTlRemark;//技术协助-特缆协助说明 - private String quotJsxzZyApprovalStatus;//技术协助-中压协助状态 - private String quotJsxzZyRemark;//技术协助-中压协助说明 + private String quotJsqrDyApprovalStatus;//技术协助-低压协助状态 + private String quotJsqrDyRemark;//技术协助-低压协助说明 - private String quotJsxzQtApprovalStatus;//技术协助-其他协助状态 - private String quotJsxzQtRemark;//技术协助-其他协助说明 + private String quotJsqrZyApprovalStatus;//技术协助-中压协助状态 + private String quotJsqrZyRemark;//技术协助-中压协助说明 + + private String quotJsqrQtApprovalStatus;//技术协助-其他协助状态 + private String quotJsqrQtRemark;//技术协助-其他协助说明 /** 报价单-产品信息 */ private List quotMaterialList; @@ -322,62 +322,28 @@ public class Quot extends BaseEntity public void setQuotJsxzApprovalStatus(String quotJsxzApprovalStatus) { this.quotJsxzApprovalStatus = quotJsxzApprovalStatus; } + public String getQuotJsqrTlApprovalStatus() { return quotJsqrTlApprovalStatus; } - public String getQuotJsxzConfirmCode() { return quotJsxzConfirmCode; } - public void setQuotJsxzConfirmCode(String quotJsxzConfirmCode) { this.quotJsxzConfirmCode = quotJsxzConfirmCode; } + public void setQuotJsqrTlApprovalStatus(String quotJsqrTlApprovalStatus) { this.quotJsqrTlApprovalStatus = quotJsqrTlApprovalStatus; } + public String getQuotJsqrTlRemark() { return quotJsqrTlRemark; } - public String getQuotJsxzTlApprovalStatus() { return quotJsxzTlApprovalStatus; } - public void setQuotJsxzTlApprovalStatus(String quotJsxzTlApprovalStatus) { this.quotJsxzTlApprovalStatus = quotJsxzTlApprovalStatus; } + public void setQuotJsqrTlRemark(String quotJsqrTlRemark) { this.quotJsqrTlRemark = quotJsqrTlRemark; } + public String getQuotJsqrDyApprovalStatus() { return quotJsqrDyApprovalStatus; } - public String getQuotJsxzTlRemark() { return quotJsxzTlRemark; } - public void setQuotJsxzTlRemark(String quotJsxzTlRemark) { this.quotJsxzTlRemark = quotJsxzTlRemark; } + public void setQuotJsqrDyApprovalStatus(String quotJsqrDyApprovalStatus) { this.quotJsqrDyApprovalStatus = quotJsqrDyApprovalStatus; } + public String getQuotJsqrDyRemark() { return quotJsqrDyRemark; } - public String getQuotJsxzDyApprovalStatus() { return quotJsxzDyApprovalStatus; } - public void setQuotJsxzDyApprovalStatus(String quotJsxzDyApprovalStatus) { this.quotJsxzDyApprovalStatus = quotJsxzDyApprovalStatus; } + public void setQuotJsqrDyRemark(String quotJsqrDyRemark) { this.quotJsqrDyRemark = quotJsqrDyRemark; } + public String getQuotJsqrZyApprovalStatus() { return quotJsqrZyApprovalStatus; } - public String getQuotJsxzDyRemark() { return quotJsxzDyRemark; } - public void setQuotJsxzDyRemark(String quotJsxzDyRemark) { this.quotJsxzDyRemark = quotJsxzDyRemark; } + public void setQuotJsqrZyApprovalStatus(String quotJsqrZyApprovalStatus) { this.quotJsqrZyApprovalStatus = quotJsqrZyApprovalStatus; } + public String getQuotJsqrZyRemark() { return quotJsqrZyRemark; } - public String getQuotJsxzZyApprovalStatus() { return quotJsxzZyApprovalStatus; } - public void setQuotJsxzZyApprovalStatus(String quotJsxzZyApprovalStatus) { this.quotJsxzZyApprovalStatus = quotJsxzZyApprovalStatus; } + public void setQuotJsqrZyRemark(String quotJsqrZyRemark) { this.quotJsqrZyRemark = quotJsqrZyRemark; } + public String getQuotJsqrQtApprovalStatus() { return quotJsqrQtApprovalStatus; } - public String getQuotJsxzZyRemark() { return quotJsxzZyRemark; } - public void setQuotJsxzZyRemark(String quotJsxzZyRemark) { this.quotJsxzZyRemark = quotJsxzZyRemark; } + public void setQuotJsqrQtApprovalStatus(String quotJsqrQtApprovalStatus) { this.quotJsqrQtApprovalStatus = quotJsqrQtApprovalStatus; } + public String getQuotJsqrQtRemark() { return quotJsqrQtRemark; } - public String getQuotJsxzQtApprovalStatus() { return quotJsxzQtApprovalStatus; } - public void setQuotJsxzQtApprovalStatus(String quotJsxzQtApprovalStatus) { this.quotJsxzQtApprovalStatus = quotJsxzQtApprovalStatus; } - - public String getQuotJsxzQtRemark() { return quotJsxzQtRemark; } - public void setQuotJsxzQtRemark(String quotJsxzQtRemark) { this.quotJsxzQtRemark = quotJsxzQtRemark; } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("quotId", getQuotId()) - .append("quotCode", getQuotCode()) - .append("quotSalesmanBm", getQuotSalesmanBm()) - .append("quotSalesmanName", getQuotSalesmanName()) - .append("quotCustomerName", getQuotCustomerName()) - .append("quotSalesmanDeptId", getQuotSalesmanDeptId()) - .append("quotSalesmanDeptName", getQuotSalesmanDeptName()) - .append("quotAddress", getQuotAddress()) - .append("quotPhone", getQuotPhone()) - .append("quotInquiryDate", getQuotInquiryDate()) - .append("quotProject", getQuotProject()) - .append("quotQuotationDate", getQuotQuotationDate()) - .append("quotQuotationFrom", getQuotQuotationFrom()) - .append("quotQuotationRequire", getQuotQuotationRequire()) - .append("quotFeedbackExplanation", getQuotFeedbackExplanation()) - .append("quotQuantity", getQuotQuantity()) - .append("quotTotalPrice", getQuotTotalPrice()) - .append("quotCheckUserName", getQuotCheckUserName()) - .append("quotCheckUserNickname", getQuotCheckUserNickname()) - .append("quotApprovalStatus", getQuotApprovalStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("quotMaterialList", getQuotMaterialList()) - .toString(); - } + public void setQuotJsqrQtRemark(String quotJsqrQtRemark) { this.quotJsqrQtRemark = quotJsqrQtRemark; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java index 887b2b6..9cfde43 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java @@ -182,6 +182,9 @@ public class QuotJsqr extends BaseEntity /** 其他组长确认意见 */ private String quotJsqrQtLeaderRemark; + /** 创建人 */ + private String createName; + public void setQuotJsqrId(String quotJsqrId) { this.quotJsqrId = quotJsqrId; @@ -200,37 +203,25 @@ public class QuotJsqr extends BaseEntity { return quotJsqrCode; } - public void setQuotJsqrTlApprovalStatus(String quotJsqrTlApprovalStatus) - { - this.quotJsqrTlApprovalStatus = quotJsqrTlApprovalStatus; - } + public void setQuotJsqrTlApprovalStatus(String quotJsqrTlApprovalStatus) { this.quotJsqrTlApprovalStatus = quotJsqrTlApprovalStatus; } public String getQuotJsqrTlApprovalStatus() { return quotJsqrTlApprovalStatus; } - public void setQuotJsqrTlOperateUserName(String quotJsqrTlOperateUserName) - { - this.quotJsqrTlOperateUserName = quotJsqrTlOperateUserName; - } + public void setQuotJsqrTlOperateUserName(String quotJsqrTlOperateUserName) { this.quotJsqrTlOperateUserName = quotJsqrTlOperateUserName; } public String getQuotJsqrTlOperateUserName() { return quotJsqrTlOperateUserName; } - public void setQuotJsqrTlOperateStatus(String quotJsqrTlOperateStatus) - { - this.quotJsqrTlOperateStatus = quotJsqrTlOperateStatus; - } + public void setQuotJsqrTlOperateStatus(String quotJsqrTlOperateStatus) { this.quotJsqrTlOperateStatus = quotJsqrTlOperateStatus; } public String getQuotJsqrTlOperateStatus() { return quotJsqrTlOperateStatus; } - public void setQuotJsqrTlOperateTime(String quotJsqrTlOperateTime) - { - this.quotJsqrTlOperateTime = quotJsqrTlOperateTime; - } + public void setQuotJsqrTlOperateTime(String quotJsqrTlOperateTime) { this.quotJsqrTlOperateTime = quotJsqrTlOperateTime; } public String getQuotJsqrTlOperateTime() { @@ -245,19 +236,13 @@ public class QuotJsqr extends BaseEntity { return quotJsqrTlRemark; } - public void setQuotJsqrTlCheckUserName(String quotJsqrTlCheckUserName) - { - this.quotJsqrTlCheckUserName = quotJsqrTlCheckUserName; - } + public void setQuotJsqrTlCheckUserName(String quotJsqrTlCheckUserName) { this.quotJsqrTlCheckUserName = quotJsqrTlCheckUserName; } public String getQuotJsqrTlCheckUserName() { return quotJsqrTlCheckUserName; } - public void setQuotJsqrTlCheckState(String quotJsqrTlCheckState) - { - this.quotJsqrTlCheckState = quotJsqrTlCheckState; - } + public void setQuotJsqrTlCheckState(String quotJsqrTlCheckState) { this.quotJsqrTlCheckState = quotJsqrTlCheckState; } public String getQuotJsqrTlCheckState() { @@ -272,82 +257,55 @@ public class QuotJsqr extends BaseEntity { return quotJsqrTlCheckTime; } - public void setQuotJsqrTlCheckRemark(String quotJsqrTlCheckRemark) - { - this.quotJsqrTlCheckRemark = quotJsqrTlCheckRemark; - } + public void setQuotJsqrTlCheckRemark(String quotJsqrTlCheckRemark) { this.quotJsqrTlCheckRemark = quotJsqrTlCheckRemark; } public String getQuotJsqrTlCheckRemark() { return quotJsqrTlCheckRemark; } - public void setQuotJsqrTlLeaderUserName(String quotJsqrTlLeaderUserName) - { - this.quotJsqrTlLeaderUserName = quotJsqrTlLeaderUserName; - } + public void setQuotJsqrTlLeaderUserName(String quotJsqrTlLeaderUserName) { this.quotJsqrTlLeaderUserName = quotJsqrTlLeaderUserName; } public String getQuotJsqrTlLeaderUserName() { return quotJsqrTlLeaderUserName; } - public void setQuotJsqrTlLeaderState(String quotJsqrTlLeaderState) - { - this.quotJsqrTlLeaderState = quotJsqrTlLeaderState; - } + public void setQuotJsqrTlLeaderState(String quotJsqrTlLeaderState) { this.quotJsqrTlLeaderState = quotJsqrTlLeaderState; } public String getQuotJsqrTlLeaderState() { return quotJsqrTlLeaderState; } - public void setQuotJsqrTlLeaderTime(String quotJsqrTlLeaderTime) - { - this.quotJsqrTlLeaderTime = quotJsqrTlLeaderTime; - } + public void setQuotJsqrTlLeaderTime(String quotJsqrTlLeaderTime) { this.quotJsqrTlLeaderTime = quotJsqrTlLeaderTime; } public String getQuotJsqrTlLeaderTime() { return quotJsqrTlLeaderTime; } - public void setQuotJsqrTlLeaderRemark(String quotJsqrTlLeaderRemark) - { - this.quotJsqrTlLeaderRemark = quotJsqrTlLeaderRemark; - } + public void setQuotJsqrTlLeaderRemark(String quotJsqrTlLeaderRemark) { this.quotJsqrTlLeaderRemark = quotJsqrTlLeaderRemark; } public String getQuotJsqrTlLeaderRemark() { return quotJsqrTlLeaderRemark; } - public void setQuotJsqrDyApprovalStatus(String quotJsqrDyApprovalStatus) - { - this.quotJsqrDyApprovalStatus = quotJsqrDyApprovalStatus; - } + public void setQuotJsqrDyApprovalStatus(String quotJsqrDyApprovalStatus) { this.quotJsqrDyApprovalStatus = quotJsqrDyApprovalStatus; } public String getQuotJsqrDyApprovalStatus() { return quotJsqrDyApprovalStatus; } - public void setQuotJsqrDyOperateUserName(String quotJsqrDyOperateUserName) - { - this.quotJsqrDyOperateUserName = quotJsqrDyOperateUserName; - } + public void setQuotJsqrDyOperateUserName(String quotJsqrDyOperateUserName) { this.quotJsqrDyOperateUserName = quotJsqrDyOperateUserName; } public String getQuotJsqrDyOperateUserName() { return quotJsqrDyOperateUserName; } - public void setQuotJsqrDyOperateStatus(String quotJsqrDyOperateStatus) - { - this.quotJsqrDyOperateStatus = quotJsqrDyOperateStatus; - } + public void setQuotJsqrDyOperateStatus(String quotJsqrDyOperateStatus) { this.quotJsqrDyOperateStatus = quotJsqrDyOperateStatus; } public String getQuotJsqrDyOperateStatus() { return quotJsqrDyOperateStatus; } - public void setQuotJsqrDyOperateTime(String quotJsqrDyOperateTime) - { - this.quotJsqrDyOperateTime = quotJsqrDyOperateTime; - } + public void setQuotJsqrDyOperateTime(String quotJsqrDyOperateTime) { this.quotJsqrDyOperateTime = quotJsqrDyOperateTime; } public String getQuotJsqrDyOperateTime() { @@ -362,19 +320,13 @@ public class QuotJsqr extends BaseEntity { return quotJsqrDyRemark; } - public void setQuotJsqrDyCheckUserName(String quotJsqrDyCheckUserName) - { - this.quotJsqrDyCheckUserName = quotJsqrDyCheckUserName; - } + public void setQuotJsqrDyCheckUserName(String quotJsqrDyCheckUserName) { this.quotJsqrDyCheckUserName = quotJsqrDyCheckUserName; } public String getQuotJsqrDyCheckUserName() { return quotJsqrDyCheckUserName; } - public void setQuotJsqrDyCheckState(String quotJsqrDyCheckState) - { - this.quotJsqrDyCheckState = quotJsqrDyCheckState; - } + public void setQuotJsqrDyCheckState(String quotJsqrDyCheckState) { this.quotJsqrDyCheckState = quotJsqrDyCheckState; } public String getQuotJsqrDyCheckState() { @@ -389,82 +341,55 @@ public class QuotJsqr extends BaseEntity { return quotJsqrDyCheckTime; } - public void setQuotJsqrDyCheckRemark(String quotJsqrDyCheckRemark) - { - this.quotJsqrDyCheckRemark = quotJsqrDyCheckRemark; - } + public void setQuotJsqrDyCheckRemark(String quotJsqrDyCheckRemark) { this.quotJsqrDyCheckRemark = quotJsqrDyCheckRemark; } public String getQuotJsqrDyCheckRemark() { return quotJsqrDyCheckRemark; } - public void setQuotJsqrDyLeaderUserName(String quotJsqrDyLeaderUserName) - { - this.quotJsqrDyLeaderUserName = quotJsqrDyLeaderUserName; - } + public void setQuotJsqrDyLeaderUserName(String quotJsqrDyLeaderUserName) { this.quotJsqrDyLeaderUserName = quotJsqrDyLeaderUserName; } public String getQuotJsqrDyLeaderUserName() { return quotJsqrDyLeaderUserName; } - public void setQuotJsqrDyLeaderState(String quotJsqrDyLeaderState) - { - this.quotJsqrDyLeaderState = quotJsqrDyLeaderState; - } + public void setQuotJsqrDyLeaderState(String quotJsqrDyLeaderState) { this.quotJsqrDyLeaderState = quotJsqrDyLeaderState; } public String getQuotJsqrDyLeaderState() { return quotJsqrDyLeaderState; } - public void setQuotJsqrDyLeaderTime(String quotJsqrDyLeaderTime) - { - this.quotJsqrDyLeaderTime = quotJsqrDyLeaderTime; - } + public void setQuotJsqrDyLeaderTime(String quotJsqrDyLeaderTime) { this.quotJsqrDyLeaderTime = quotJsqrDyLeaderTime; } public String getQuotJsqrDyLeaderTime() { return quotJsqrDyLeaderTime; } - public void setQuotJsqrDyLeaderRemark(String quotJsqrDyLeaderRemark) - { - this.quotJsqrDyLeaderRemark = quotJsqrDyLeaderRemark; - } + public void setQuotJsqrDyLeaderRemark(String quotJsqrDyLeaderRemark) { this.quotJsqrDyLeaderRemark = quotJsqrDyLeaderRemark; } public String getQuotJsqrDyLeaderRemark() { return quotJsqrDyLeaderRemark; } - public void setQuotJsqrZyApprovalStatus(String quotJsqrZyApprovalStatus) - { - this.quotJsqrZyApprovalStatus = quotJsqrZyApprovalStatus; - } + public void setQuotJsqrZyApprovalStatus(String quotJsqrZyApprovalStatus) { this.quotJsqrZyApprovalStatus = quotJsqrZyApprovalStatus; } public String getQuotJsqrZyApprovalStatus() { return quotJsqrZyApprovalStatus; } - public void setQuotJsqrZyOperateUserName(String quotJsqrZyOperateUserName) - { - this.quotJsqrZyOperateUserName = quotJsqrZyOperateUserName; - } + public void setQuotJsqrZyOperateUserName(String quotJsqrZyOperateUserName) { this.quotJsqrZyOperateUserName = quotJsqrZyOperateUserName; } public String getQuotJsqrZyOperateUserName() { return quotJsqrZyOperateUserName; } - public void setQuotJsqrZyOperateStatus(String quotJsqrZyOperateStatus) - { - this.quotJsqrZyOperateStatus = quotJsqrZyOperateStatus; - } + public void setQuotJsqrZyOperateStatus(String quotJsqrZyOperateStatus) { this.quotJsqrZyOperateStatus = quotJsqrZyOperateStatus; } public String getQuotJsqrZyOperateStatus() { return quotJsqrZyOperateStatus; } - public void setQuotJsqrZyOperateTime(String quotJsqrZyOperateTime) - { - this.quotJsqrZyOperateTime = quotJsqrZyOperateTime; - } + public void setQuotJsqrZyOperateTime(String quotJsqrZyOperateTime) { this.quotJsqrZyOperateTime = quotJsqrZyOperateTime; } public String getQuotJsqrZyOperateTime() { @@ -479,19 +404,13 @@ public class QuotJsqr extends BaseEntity { return quotJsqrZyRemark; } - public void setQuotJsqrZyCheckUserName(String quotJsqrZyCheckUserName) - { - this.quotJsqrZyCheckUserName = quotJsqrZyCheckUserName; - } + public void setQuotJsqrZyCheckUserName(String quotJsqrZyCheckUserName) { this.quotJsqrZyCheckUserName = quotJsqrZyCheckUserName; } public String getQuotJsqrZyCheckUserName() { return quotJsqrZyCheckUserName; } - public void setQuotJsqrZyCheckState(String quotJsqrZyCheckState) - { - this.quotJsqrZyCheckState = quotJsqrZyCheckState; - } + public void setQuotJsqrZyCheckState(String quotJsqrZyCheckState) { this.quotJsqrZyCheckState = quotJsqrZyCheckState; } public String getQuotJsqrZyCheckState() { @@ -506,82 +425,55 @@ public class QuotJsqr extends BaseEntity { return quotJsqrZyCheckTime; } - public void setQuotJsqrZyCheckRemark(String quotJsqrZyCheckRemark) - { - this.quotJsqrZyCheckRemark = quotJsqrZyCheckRemark; - } + public void setQuotJsqrZyCheckRemark(String quotJsqrZyCheckRemark) { this.quotJsqrZyCheckRemark = quotJsqrZyCheckRemark; } public String getQuotJsqrZyCheckRemark() { return quotJsqrZyCheckRemark; } - public void setQuotJsqrZyLeaderUserName(String quotJsqrZyLeaderUserName) - { - this.quotJsqrZyLeaderUserName = quotJsqrZyLeaderUserName; - } + public void setQuotJsqrZyLeaderUserName(String quotJsqrZyLeaderUserName) { this.quotJsqrZyLeaderUserName = quotJsqrZyLeaderUserName; } public String getQuotJsqrZyLeaderUserName() { return quotJsqrZyLeaderUserName; } - public void setQuotJsqrZyLeaderState(String quotJsqrZyLeaderState) - { - this.quotJsqrZyLeaderState = quotJsqrZyLeaderState; - } + public void setQuotJsqrZyLeaderState(String quotJsqrZyLeaderState) { this.quotJsqrZyLeaderState = quotJsqrZyLeaderState; } public String getQuotJsqrZyLeaderState() { return quotJsqrZyLeaderState; } - public void setQuotJsqrZyLeaderTime(String quotJsqrZyLeaderTime) - { - this.quotJsqrZyLeaderTime = quotJsqrZyLeaderTime; - } + public void setQuotJsqrZyLeaderTime(String quotJsqrZyLeaderTime) { this.quotJsqrZyLeaderTime = quotJsqrZyLeaderTime; } public String getQuotJsqrZyLeaderTime() { return quotJsqrZyLeaderTime; } - public void setQuotJsqrZyLeaderRemark(String quotJsqrZyLeaderRemark) - { - this.quotJsqrZyLeaderRemark = quotJsqrZyLeaderRemark; - } + public void setQuotJsqrZyLeaderRemark(String quotJsqrZyLeaderRemark) { this.quotJsqrZyLeaderRemark = quotJsqrZyLeaderRemark; } public String getQuotJsqrZyLeaderRemark() { return quotJsqrZyLeaderRemark; } - public void setQuotJsqrQtApprovalStatus(String quotJsqrQtApprovalStatus) - { - this.quotJsqrQtApprovalStatus = quotJsqrQtApprovalStatus; - } + public void setQuotJsqrQtApprovalStatus(String quotJsqrQtApprovalStatus) { this.quotJsqrQtApprovalStatus = quotJsqrQtApprovalStatus; } public String getQuotJsqrQtApprovalStatus() { return quotJsqrQtApprovalStatus; } - public void setQuotJsqrQtOperateUserName(String quotJsqrQtOperateUserName) - { - this.quotJsqrQtOperateUserName = quotJsqrQtOperateUserName; - } + public void setQuotJsqrQtOperateUserName(String quotJsqrQtOperateUserName) { this.quotJsqrQtOperateUserName = quotJsqrQtOperateUserName; } public String getQuotJsqrQtOperateUserName() { return quotJsqrQtOperateUserName; } - public void setQuotJsqrQtOperateStatus(String quotJsqrQtOperateStatus) - { - this.quotJsqrQtOperateStatus = quotJsqrQtOperateStatus; - } + public void setQuotJsqrQtOperateStatus(String quotJsqrQtOperateStatus) { this.quotJsqrQtOperateStatus = quotJsqrQtOperateStatus; } public String getQuotJsqrQtOperateStatus() { return quotJsqrQtOperateStatus; } - public void setQuotJsqrQtOperateTime(String quotJsqrQtOperateTime) - { - this.quotJsqrQtOperateTime = quotJsqrQtOperateTime; - } + public void setQuotJsqrQtOperateTime(String quotJsqrQtOperateTime) { this.quotJsqrQtOperateTime = quotJsqrQtOperateTime; } public String getQuotJsqrQtOperateTime() { @@ -596,19 +488,13 @@ public class QuotJsqr extends BaseEntity { return quotJsqrQtRemark; } - public void setQuotJsqrQtCheckUserName(String quotJsqrQtCheckUserName) - { - this.quotJsqrQtCheckUserName = quotJsqrQtCheckUserName; - } + public void setQuotJsqrQtCheckUserName(String quotJsqrQtCheckUserName) { this.quotJsqrQtCheckUserName = quotJsqrQtCheckUserName; } public String getQuotJsqrQtCheckUserName() { return quotJsqrQtCheckUserName; } - public void setQuotJsqrQtCheckState(String quotJsqrQtCheckState) - { - this.quotJsqrQtCheckState = quotJsqrQtCheckState; - } + public void setQuotJsqrQtCheckState(String quotJsqrQtCheckState) { this.quotJsqrQtCheckState = quotJsqrQtCheckState; } public String getQuotJsqrQtCheckState() { @@ -623,113 +509,86 @@ public class QuotJsqr extends BaseEntity { return quotJsqrQtCheckTime; } - public void setQuotJsqrQtCheckRemark(String quotJsqrQtCheckRemark) - { - this.quotJsqrQtCheckRemark = quotJsqrQtCheckRemark; - } + public void setQuotJsqrQtCheckRemark(String quotJsqrQtCheckRemark){ this.quotJsqrQtCheckRemark = quotJsqrQtCheckRemark; } - public String getQuotJsqrQtCheckRemark() - { + public String getQuotJsqrQtCheckRemark(){ return quotJsqrQtCheckRemark; } - public void setQuotJsqrQtLeaderUserName(String quotJsqrQtLeaderUserName) - { - this.quotJsqrQtLeaderUserName = quotJsqrQtLeaderUserName; - } + public void setQuotJsqrQtLeaderUserName(String quotJsqrQtLeaderUserName) { this.quotJsqrQtLeaderUserName = quotJsqrQtLeaderUserName; } - public String getQuotJsqrQtLeaderUserName() - { + public String getQuotJsqrQtLeaderUserName(){ return quotJsqrQtLeaderUserName; } - public void setQuotJsqrQtLeaderState(String quotJsqrQtLeaderState) - { - this.quotJsqrQtLeaderState = quotJsqrQtLeaderState; - } + public void setQuotJsqrQtLeaderState(String quotJsqrQtLeaderState) { this.quotJsqrQtLeaderState = quotJsqrQtLeaderState; } - public String getQuotJsqrQtLeaderState() - { + public String getQuotJsqrQtLeaderState(){ return quotJsqrQtLeaderState; } - public void setQuotJsqrQtLeaderTime(String quotJsqrQtLeaderTime) - { - this.quotJsqrQtLeaderTime = quotJsqrQtLeaderTime; - } + public void setQuotJsqrQtLeaderTime(String quotJsqrQtLeaderTime) { this.quotJsqrQtLeaderTime = quotJsqrQtLeaderTime; } - public String getQuotJsqrQtLeaderTime() - { + public String getQuotJsqrQtLeaderTime(){ return quotJsqrQtLeaderTime; } - public void setQuotJsqrQtLeaderRemark(String quotJsqrQtLeaderRemark) - { - this.quotJsqrQtLeaderRemark = quotJsqrQtLeaderRemark; - } + public void setQuotJsqrQtLeaderRemark(String quotJsqrQtLeaderRemark) { this.quotJsqrQtLeaderRemark = quotJsqrQtLeaderRemark; } - public String getQuotJsqrQtLeaderRemark() - { - return quotJsqrQtLeaderRemark; - } + public String getQuotJsqrQtLeaderRemark(){return quotJsqrQtLeaderRemark;} + public String getCreateName() { return createName; } - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("quotJsqrId", getQuotJsqrId()) - .append("quotJsqrCode", getQuotJsqrCode()) - .append("quotJsqrTlApprovalStatus", getQuotJsqrTlApprovalStatus()) - .append("quotJsqrTlOperateUserName", getQuotJsqrTlOperateUserName()) - .append("quotJsqrTlOperateStatus", getQuotJsqrTlOperateStatus()) - .append("quotJsqrTlOperateTime", getQuotJsqrTlOperateTime()) - .append("quotJsqrTlRemark", getQuotJsqrTlRemark()) - .append("quotJsqrTlCheckUserName", getQuotJsqrTlCheckUserName()) - .append("quotJsqrTlCheckState", getQuotJsqrTlCheckState()) - .append("quotJsqrTlCheckTime", getQuotJsqrTlCheckTime()) - .append("quotJsqrTlCheckRemark", getQuotJsqrTlCheckRemark()) - .append("quotJsqrTlLeaderUserName", getQuotJsqrTlLeaderUserName()) - .append("quotJsqrTlLeaderState", getQuotJsqrTlLeaderState()) - .append("quotJsqrTlLeaderTime", getQuotJsqrTlLeaderTime()) - .append("quotJsqrTlLeaderRemark", getQuotJsqrTlLeaderRemark()) - .append("quotJsqrDyApprovalStatus", getQuotJsqrDyApprovalStatus()) - .append("quotJsqrDyOperateUserName", getQuotJsqrDyOperateUserName()) - .append("quotJsqrDyOperateStatus", getQuotJsqrDyOperateStatus()) - .append("quotJsqrDyOperateTime", getQuotJsqrDyOperateTime()) - .append("quotJsqrDyRemark", getQuotJsqrDyRemark()) - .append("quotJsqrDyCheckUserName", getQuotJsqrDyCheckUserName()) - .append("quotJsqrDyCheckState", getQuotJsqrDyCheckState()) - .append("quotJsqrDyCheckTime", getQuotJsqrDyCheckTime()) - .append("quotJsqrDyCheckRemark", getQuotJsqrDyCheckRemark()) - .append("quotJsqrDyLeaderUserName", getQuotJsqrDyLeaderUserName()) - .append("quotJsqrDyLeaderState", getQuotJsqrDyLeaderState()) - .append("quotJsqrDyLeaderTime", getQuotJsqrDyLeaderTime()) - .append("quotJsqrDyLeaderRemark", getQuotJsqrDyLeaderRemark()) - .append("quotJsqrZyApprovalStatus", getQuotJsqrZyApprovalStatus()) - .append("quotJsqrZyOperateUserName", getQuotJsqrZyOperateUserName()) - .append("quotJsqrZyOperateStatus", getQuotJsqrZyOperateStatus()) - .append("quotJsqrZyOperateTime", getQuotJsqrZyOperateTime()) - .append("quotJsqrZyRemark", getQuotJsqrZyRemark()) - .append("quotJsqrZyCheckUserName", getQuotJsqrZyCheckUserName()) - .append("quotJsqrZyCheckState", getQuotJsqrZyCheckState()) - .append("quotJsqrZyCheckTime", getQuotJsqrZyCheckTime()) - .append("quotJsqrZyCheckRemark", getQuotJsqrZyCheckRemark()) - .append("quotJsqrZyLeaderUserName", getQuotJsqrZyLeaderUserName()) - .append("quotJsqrZyLeaderState", getQuotJsqrZyLeaderState()) - .append("quotJsqrZyLeaderTime", getQuotJsqrZyLeaderTime()) - .append("quotJsqrZyLeaderRemark", getQuotJsqrZyLeaderRemark()) - .append("quotJsqrQtApprovalStatus", getQuotJsqrQtApprovalStatus()) - .append("quotJsqrQtOperateUserName", getQuotJsqrQtOperateUserName()) - .append("quotJsqrQtOperateStatus", getQuotJsqrQtOperateStatus()) - .append("quotJsqrQtOperateTime", getQuotJsqrQtOperateTime()) - .append("quotJsqrQtRemark", getQuotJsqrQtRemark()) - .append("quotJsqrQtCheckUserName", getQuotJsqrQtCheckUserName()) - .append("quotJsqrQtCheckState", getQuotJsqrQtCheckState()) - .append("quotJsqrQtCheckTime", getQuotJsqrQtCheckTime()) - .append("quotJsqrQtCheckRemark", getQuotJsqrQtCheckRemark()) - .append("quotJsqrQtLeaderUserName", getQuotJsqrQtLeaderUserName()) - .append("quotJsqrQtLeaderState", getQuotJsqrQtLeaderState()) - .append("quotJsqrQtLeaderTime", getQuotJsqrQtLeaderTime()) - .append("quotJsqrQtLeaderRemark", getQuotJsqrQtLeaderRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + public void setCreateName(String createName) { this.createName = createName; } + + +/** 报价单信息 */ + /** 报价单号 */ + private String quotCode; + + /** 业务员 */ + private String quotSalesmanName; + + /** 客户名称 */ + private String quotCustomerName; + + /** 项目名称 */ + private String quotProject; + + /** 技术协助-协助状态 */ + private String quotJsxzApprovalStatus; + + /** 技术协助-分组 */ + private String quotJsxzGroup; + + /** 技术协助-标准 */ + private String quotJsxzStandard; + + /** 是否需要技术章 */ + private String quotJsxzChapter; + + /** 技术协助-技术要求 */ + private String quotJsxzTechnicalRequirement; + + public String getQuotCode() { return quotCode; } + public void setQuotCode(String quotCode) { this.quotCode = quotCode; } + + public String getQuotSalesmanName() { return quotSalesmanName; } + public void setQuotSalesmanName(String quotSalesmanName) { this.quotSalesmanName = quotSalesmanName; } + + public String getQuotCustomerName() { return quotCustomerName; } + public void setQuotCustomerName(String quotCustomerName) { this.quotCustomerName = quotCustomerName; } + + public String getQuotProject() { return quotProject; } + public void setQuotProject(String quotProject) { this.quotProject = quotProject; } + + public String getQuotJsxzApprovalStatus() { return quotJsxzApprovalStatus; } + public void setQuotJsxzApprovalStatus(String quotJsxzApprovalStatus) { this.quotJsxzApprovalStatus = quotJsxzApprovalStatus; } + + public String getQuotJsxzGroup() { return quotJsxzGroup; } + public void setQuotJsxzGroup(String quotJsxzGroup) { this.quotJsxzGroup = quotJsxzGroup; } + + public String getQuotJsxzStandard() { return quotJsxzStandard; } + public void setQuotJsxzStandard(String quotJsxzStandard) { this.quotJsxzStandard = quotJsxzStandard; } + + public String getQuotJsxzChapter() { return quotJsxzChapter; } + public void setQuotJsxzChapter(String quotJsxzChapter) { this.quotJsxzChapter = quotJsxzChapter; } + + public String getQuotJsxzTechnicalRequirement() { return quotJsxzTechnicalRequirement; } + public void setQuotJsxzTechnicalRequirement(String quotJsxzTechnicalRequirement) { this.quotJsxzTechnicalRequirement = quotJsxzTechnicalRequirement; } } diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml index a21384a..6e28abf 100644 --- a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml @@ -60,13 +60,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + left join sys_user u on u.user_name=a.create_by + left join sys_dept d on u.dept_id = d.dept_id + left join quot q on q.quot_jsxz_confirm_id = a.quot_jsqr_id + + - select quot_jsqr_id, quot_jsqr_code, quot_jsqr_tl_approval_status, quot_jsqr_tl_operate_user_name, quot_jsqr_tl_operate_status, quot_jsqr_tl_operate_time, quot_jsqr_tl_remark, quot_jsqr_tl_check_user_name, quot_jsqr_tl_check_state, quot_jsqr_tl_check_time, quot_jsqr_tl_check_remark, quot_jsqr_tl_leader_user_name, quot_jsqr_tl_leader_state, quot_jsqr_tl_leader_time, quot_jsqr_tl_leader_remark, quot_jsqr_dy_approval_status, quot_jsqr_dy_operate_user_name, quot_jsqr_dy_operate_status, quot_jsqr_dy_operate_time, quot_jsqr_dy_remark, quot_jsqr_dy_check_user_name, quot_jsqr_dy_check_state, quot_jsqr_dy_check_time, quot_jsqr_dy_check_remark, quot_jsqr_dy_leader_user_name, quot_jsqr_dy_leader_state, quot_jsqr_dy_leader_time, quot_jsqr_dy_leader_remark, quot_jsqr_zy_approval_status, quot_jsqr_zy_operate_user_name, quot_jsqr_zy_operate_status, quot_jsqr_zy_operate_time, quot_jsqr_zy_remark, quot_jsqr_zy_check_user_name, quot_jsqr_zy_check_state, quot_jsqr_zy_check_time, quot_jsqr_zy_check_remark, quot_jsqr_zy_leader_user_name, quot_jsqr_zy_leader_state, quot_jsqr_zy_leader_time, quot_jsqr_zy_leader_remark, quot_jsqr_qt_approval_status, quot_jsqr_qt_operate_user_name, quot_jsqr_qt_operate_status, quot_jsqr_qt_operate_time, quot_jsqr_qt_remark, quot_jsqr_qt_check_user_name, quot_jsqr_qt_check_state, quot_jsqr_qt_check_time, quot_jsqr_qt_check_remark, quot_jsqr_qt_leader_user_name, quot_jsqr_qt_leader_state, quot_jsqr_qt_leader_time, quot_jsqr_qt_leader_remark, create_by, create_time, update_by, update_time from quot_jsqr + select a.quot_jsqr_id, a.quot_jsqr_code, a.quot_jsqr_tl_approval_status, a.quot_jsqr_tl_operate_user_name, + a.quot_jsqr_tl_operate_status, a.quot_jsqr_tl_operate_time, a.quot_jsqr_tl_remark, a.quot_jsqr_tl_check_user_name, + a.quot_jsqr_tl_check_state, a.quot_jsqr_tl_check_time, a.quot_jsqr_tl_check_remark, a.quot_jsqr_tl_leader_user_name, + a.quot_jsqr_tl_leader_state, a.quot_jsqr_tl_leader_time, a.quot_jsqr_tl_leader_remark, a.quot_jsqr_dy_approval_status, + a.quot_jsqr_dy_operate_user_name, a.quot_jsqr_dy_operate_status, a.quot_jsqr_dy_operate_time, a.quot_jsqr_dy_remark, + a.quot_jsqr_dy_check_user_name, a.quot_jsqr_dy_check_state, a.quot_jsqr_dy_check_time, a.quot_jsqr_dy_check_remark, + a.quot_jsqr_dy_leader_user_name, a.quot_jsqr_dy_leader_state, a.quot_jsqr_dy_leader_time, a.quot_jsqr_dy_leader_remark, + a.quot_jsqr_zy_approval_status, a.quot_jsqr_zy_operate_user_name, a.quot_jsqr_zy_operate_status, a.quot_jsqr_zy_operate_time, + a.quot_jsqr_zy_remark, a.quot_jsqr_zy_check_user_name, a.quot_jsqr_zy_check_state, a.quot_jsqr_zy_check_time, + a.quot_jsqr_zy_check_remark, a.quot_jsqr_zy_leader_user_name, a.quot_jsqr_zy_leader_state, a.quot_jsqr_zy_leader_time, + a.quot_jsqr_zy_leader_remark, a.quot_jsqr_qt_approval_status, a.quot_jsqr_qt_operate_user_name, a.quot_jsqr_qt_operate_status, + a.quot_jsqr_qt_operate_time, a.quot_jsqr_qt_remark, a.quot_jsqr_qt_check_user_name, a.quot_jsqr_qt_check_state, + a.quot_jsqr_qt_check_time, a.quot_jsqr_qt_check_remark, a.quot_jsqr_qt_leader_user_name, a.quot_jsqr_qt_leader_state, + a.quot_jsqr_qt_leader_time, a.quot_jsqr_qt_leader_remark, a.create_by, a.create_time, a.update_by, a.update_time, + u.nick_name create_name,q.quot_code,q.quot_salesman_name,q.quot_customer_name,q.quot_project, + q.quot_jsxz_approval_status,q.quot_jsxz_group,q.quot_jsxz_standard,q.quot_jsxz_chapter,q.quot_jsxz_technical_requirement + from quot_jsqr a +