add：合同评审添加最终优惠金额

README.md

@@ -1,3 +1,14 @@
 # ERP_storage
 
-仓库管理
+仓库管理
+
+## 项目部署
+
+### 1、修改配置文件
+conf/app.conf
+
+### 2、打包linux二进制包
+GOOS=linux GOARCH=amd64 go build ERP_storage.go
+
+### 3、启动服务
+./ERP_storage

controllers/ContractReview.go

@@ -604,8 +604,9 @@ func (c *ContractReviewController) Stock_Detail_Excel() {
 	f.SetCellValue("Sheet1", "E2", "项目负责人")
 	f.SetCellValue("Sheet1", "F2", "预计签约时间")
 	f.SetCellValue("Sheet1", "G2", "总金额")
-	f.SetCellValue("Sheet1", "H2", "是否有居间费")
-	f.SetCellValue("Sheet1", "I2", "居间费金额")
+	f.SetCellValue("Sheet1", "H2", "最终优惠金额")
+	f.SetCellValue("Sheet1", "I2", "是否有居间费")
+	f.SetCellValue("Sheet1", "J2", "居间费金额")
 	// 设置列宽
 	f.SetColWidth("Sheet1", "A", "A", 10)
 	f.SetColWidth("Sheet1", "B", "B", 10)
@@ -613,9 +614,9 @@ func (c *ContractReviewController) Stock_Detail_Excel() {
 	f.SetColWidth("Sheet1", "D", "D", 20)
 	f.SetColWidth("Sheet1", "E", "E", 12)
 	f.SetColWidth("Sheet1", "F", "F", 12)
-	f.SetColWidth("Sheet1", "G", "G", 10)
-	f.SetColWidth("Sheet1", "H", "H", 12)
-	f.SetColWidth("Sheet1", "I", "I", 10)
+	f.SetColWidth("Sheet1", "G", "H", 10)
+	f.SetColWidth("Sheet1", "I", "I", 12)
+	f.SetColWidth("Sheet1", "J", "J", 10)
 	line := 2
 
 	// 循环写入数据
@@ -629,12 +630,13 @@ func (c *ContractReviewController) Stock_Detail_Excel() {
 		f.SetCellValue("Sheet1", fmt.Sprintf("E%d", line), v.T_submit_name)
 		f.SetCellValue("Sheet1", fmt.Sprintf("F%d", line), v.T_predict_sign_time)
 		f.SetCellValue("Sheet1", fmt.Sprintf("G%d", line), v.T_money)
+		f.SetCellValue("Sheet1", fmt.Sprintf("H%d", line), v.T_discount_money)
 		T_have_brokerage_fee_str := "否"
 		if v.T_have_brokerage_fee == true {
 			T_have_brokerage_fee_str = "是"
 		}
-		f.SetCellValue("Sheet1", fmt.Sprintf("H%d", line), T_have_brokerage_fee_str)
-		f.SetCellValue("Sheet1", fmt.Sprintf("I%d", line), v.T_brokerage_fee_money)
+		f.SetCellValue("Sheet1", fmt.Sprintf("I%d", line), T_have_brokerage_fee_str)
+		f.SetCellValue("Sheet1", fmt.Sprintf("J%d", line), v.T_brokerage_fee_money)
 
 	}
 	Style4, _ := f.NewStyle(

dto/ContractReview.go

@@ -37,6 +37,7 @@ type ContractReviewInsertReq struct {
 	T_money               float64 `form:"T_money"`                             // 总金额
 	T_have_brokerage_fee  bool    `form:"T_have_brokerage_fee"`                // 是否有居间费
 	T_brokerage_fee_money float64 `form:"T_brokerage_fee_money"`               // 是否有居间费
+	T_discount_money      float64 `form:"T_discount_money"`                    // 最终优惠金额
 
 	ServiceItems    string                             `json:"ServiceItems"`    // 服务内容
 	ServiceItemList []models.ContractReviewServiceItem `json:"ServiceItemList"` // 服务内容
@@ -50,6 +51,7 @@ func (s *ContractReviewInsertReq) Generate(model *models.ContractReview) {
 	model.T_money = s.T_money
 	model.T_have_brokerage_fee = s.T_have_brokerage_fee
 	model.T_brokerage_fee_money = s.T_brokerage_fee_money
+	model.T_discount_money = s.T_discount_money
 	model.T_audit = 1
 	model.T_State = 1
 }
@@ -62,7 +64,8 @@ type ContractReviewUpdateReq struct {
 	T_predict_sign_time   string  `form:"T_predict_sign_time"`                 // 预计签约时间
 	T_money               float64 `form:"T_money"`                             // 总金额
 	T_have_brokerage_fee  bool    `form:"T_have_brokerage_fee"`                // 是否有居间费
-	T_brokerage_fee_money float64 `form:"T_brokerage_fee_money"`               // 是否有居间费
+	T_brokerage_fee_money float64 `form:"T_brokerage_fee_money"`               // 居间费金额
+	T_discount_money      float64 `form:"T_discount_money"`                    // 最终优惠金额
 
 	ServiceItems    string                             `json:"ServiceItems"`    // 服务内容
 	ServiceItemList []models.ContractReviewServiceItem `json:"ServiceItemList"` // 服务内容
@@ -76,6 +79,7 @@ func (s *ContractReviewUpdateReq) Generate(model *models.ContractReview) {
 	model.T_money = s.T_money
 	model.T_have_brokerage_fee = s.T_have_brokerage_fee
 	model.T_brokerage_fee_money = s.T_brokerage_fee_money
+	model.T_discount_money = s.T_discount_money
 }
 
 func (s *ContractReviewUpdateReq) GetId() interface{} {

models/ContractReview/ContractReview.go

@@ -24,21 +24,22 @@ func Get_T_audit_name(T_audt int) string {
 
 type ContractReview struct {
 	Id                         int     `json:"Id" gorm:"primaryKey;autoIncrement;comment:主键编码"` // 主键编码
-	T_name                     string  `json:"T_name" gorm:"size:128"`                              // 项目名称
-	T_address                  string  `json:"T_address" gorm:"size:128"`                           // 项目地址
-	T_submit                   string  `json:"T_submit" gorm:"size:128"`                            // 合同负责人
-	T_predict_sign_time        string  `json:"T_predict_sign_time" gorm:"size:128"`                 // 预计签约时间
-	T_money                    float64 `json:"T_money" gorm:"type:decimal(10,2)"`                   // 总金额
-	T_have_brokerage_fee       bool    `json:"T_have_brokerage_fee" gorm:"size:4"`                  // 是否有居间费
-	T_brokerage_fee_money      float64 `json:"T_brokerage_fee_money" gorm:"type:decimal(10,2)"`     // 是否有居间费
-	T_audit                    int     `json:"T_audit" gorm:"size:4"`                               // 审核状态 待提交审核1 待审核2 财务通过3 财务驳回4 总经理通过5 总经理驳回6
-	T_finance_approval_opinion string  `json:"T_finance_approval_opinion" gorm:"size:text"`         // 财务审批意见
-	T_manager_approval_opinion string  `json:"T_manager_approval_opinion" gorm:"size:text"`         // 总经理审批意见
+	T_name                     string  `json:"T_name" gorm:"size:128"`                          // 项目名称
+	T_address                  string  `json:"T_address" gorm:"size:128"`                       // 项目地址
+	T_submit                   string  `json:"T_submit" gorm:"size:128"`                        // 合同负责人
+	T_predict_sign_time        string  `json:"T_predict_sign_time" gorm:"size:128"`             // 预计签约时间
+	T_money                    float64 `json:"T_money" gorm:"type:decimal(10,2)"`               // 总金额
+	T_discount_money           float64 `json:"T_discount_money" gorm:"type:decimal(10,2)"`      // 最终优惠金额
+	T_have_brokerage_fee       bool    `json:"T_have_brokerage_fee" gorm:"size:4"`              // 是否有居间费
+	T_brokerage_fee_money      float64 `json:"T_brokerage_fee_money" gorm:"type:decimal(10,2)"` // 是否有居间费
+	T_audit                    int     `json:"T_audit" gorm:"size:4"`                           // 审核状态 待提交审核1 待审核2 财务通过3 财务驳回4 总经理通过5 总经理驳回6
+	T_finance_approval_opinion string  `json:"T_finance_approval_opinion" gorm:"size:text"`     // 财务审批意见
+	T_manager_approval_opinion string  `json:"T_manager_approval_opinion" gorm:"size:text"`     // 总经理审批意见
 
 	ServiceItemList []ContractReviewServiceItem `json:"ServiceItemList" gorm:"->;foreignkey:T_contract_review_id;references:Id"` // 角色
 
-	T_State    int     `json:"T_State" gorm:"column:t__state;size(2);default(1)"`                        // 0 删除（伪删除）   1 正常
-	CreateTime db.Time `json:"CreateTime" gorm:"column:create_time;autoCreateTime;comment:创建时间"`     // 创建时间
+	T_State    int     `json:"T_State" gorm:"column:t__state;size(2);default(1)"`                  // 0 删除（伪删除）   1 正常
+	CreateTime db.Time `json:"CreateTime" gorm:"column:create_time;autoCreateTime;comment:创建时间"`   // 创建时间
 	UpdateTime db.Time `json:"UpdateTime" gorm:"column:update_time;autoUpdateTime;comment:最后更新时间"` // 最后更新时间
 
 	T_submit_name string `json:"T_submit_name" gorm:"-"` // 合同负责人名称
@@ -58,8 +59,8 @@ type ContractReviewServiceItem struct {
 	T_remark             string          `json:"T_remark" gorm:"type:text"`              // 备注
 	ServiceItem          ServiceItemOmit `json:"ServiceItem" gorm:"->;foreignkey:T_service_item_id;references:Id"`
 
-	T_State    int     `json:"T_State" gorm:"column:t__state;size(2);default(1)"`               // 0 删除（伪删除）   1 正常
-	CreateTime db.Time `json:"-" gorm:"column:create_time;autoCreateTime;comment:创建时间"`     // 创建时间
+	T_State    int     `json:"T_State" gorm:"column:t__state;size(2);default(1)"`         // 0 删除（伪删除）   1 正常
+	CreateTime db.Time `json:"-" gorm:"column:create_time;autoCreateTime;comment:创建时间"`   // 创建时间
 	UpdateTime db.Time `json:"-" gorm:"column:update_time;autoUpdateTime;comment:最后更新时间"` // 最后更新时间
 }