temp commit

controller/contract/register.go

@@ -45,6 +45,7 @@ func (rg *RegisterController) List(c *gin.Context) {
 		return
 	}
 
+	// TODO:代付方
 	cond := `1 = 1`
 	pars := make([]interface{}, 0)
 	if req.Keyword != "" {
@@ -205,6 +206,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		return
 	}
 
+	// TODO:代付、补充协议
 	nowTime := time.Now().Local()
 	ob.ContractCode = req.ContractCode
 	ob.CrmContractId = req.CrmContractId

controller/crm/contract.go

@@ -34,6 +34,7 @@ func (rg *ContractController) SearchList(c *gin.Context) {
 		return
 	}
 
+	// TODO:代付、补充协议
 	// 补充协议暂不查询
 	cond := `status IN ('已审批', '已签回') AND contract_type IN ('新签合同', '续约合同')`
 	pars := make([]interface{}, 0)

models/fms/contract_register.go

@@ -28,6 +28,7 @@ type ContractRegister struct {
 	ContractStatus     int       `gorm:"column:contract_status" json:"contract_status" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回"`
 	RegisterStatus     int       `gorm:"column:register_status" json:"register_status" description:"登记状态: 1-进行中; 2-已完成;"`
 	Remark             string    `gorm:"column:remark" json:"remark" description:"备注信息"`
+	ServiceRemark      string    `gorm:"column:service_remark" json:"service_remark" description:"套餐备注信息"`
 	IsDeleted          int       `gorm:"column:is_deleted" json:"is_deleted" description:"是否已删除: 0-正常; 1-已删除"`
 	base.TimeBase
 }
@@ -156,6 +157,7 @@ type ContractRegisterAddReq struct {
 	ContractStatus int                     `json:"contract_status" binding:"oneof=1 2 3" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回"`
 	Remark         string                  `json:"remark" description:"备注信息"`
 	ProductId      int                     `json:"product_id" binding:"oneof=1 2" description:"产品ID"`
+	ServiceRemark  string                  `json:"service_remark" description:"套餐备注"`
 	Services       []ContractServiceAddReq `json:"services" description:"服务套餐内容"`
 }