Merge branch 'contract_status_20230112'

models/fms/constants.go

@@ -11,6 +11,7 @@ const (
 	ContractStatusApproved    = 1 // 已审批
 	ContractStatusSendOut     = 2 // 单章寄出
 	ContractStatusCheckedBack = 3 // 已签回
+	ContractStatusEnd         = 4 // 已终止
 
 	// 合同登记状态
 	ContractRegisterStatusIng      = 1 // 进行中
@@ -43,12 +44,14 @@ var ContractStatusKeyNameMap = map[int]string{
 	ContractStatusApproved:    "已审批",
 	ContractStatusSendOut:     "单章寄出",
 	ContractStatusCheckedBack: "已签回",
+	ContractStatusEnd:         "已终止",
 }
 
 var ContractStatusNameKeyMap = map[string]int{
 	"已审批":  ContractStatusApproved,
 	"单章寄出": ContractStatusSendOut,
 	"已签回":  ContractStatusCheckedBack,
+	"已终止":  ContractStatusEnd,
 }
 
 var ContractInvoiceKeyNameMap = map[int]string{

models/fms/contract_register.go

@@ -150,7 +150,7 @@ type ContractRegisterDelReq struct {
 // ContractRegisterUpdateStatusReq 合同登记-修改合同状态请求体
 type ContractRegisterUpdateStatusReq struct {
 	ContractRegisterId int `json:"contract_register_id" binding:"required,gte=1" description:"登记ID"`
-	ContractStatus     int `json:"contract_status" binding:"oneof=1 2 3" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回"`
+	ContractStatus     int `json:"contract_status" binding:"oneof=1 2 3 4" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回; 4-已终止"`
 }
 
 // ContractRegisterAddReq 新增合同登记请求体
@@ -170,7 +170,7 @@ type ContractRegisterAddReq struct {
 	EndDate            string                  `json:"end_date" binding:"required" description:"合同结束日期"`
 	SignDate           string                  `json:"sign_date" description:"合同签订日期"`
 	AgreedPayTime      string                  `json:"agreed_pay_time" description:"约定付款时间(如:生效日起10日内)"`
-	ContractStatus     int                     `json:"contract_status" binding:"oneof=1 2 3" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回"`
+	ContractStatus     int                     `json:"contract_status" binding:"oneof=1 2 3 4" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回; 4-已终止"`
 	Remark             string                  `json:"remark" description:"备注信息"`
 	ProductId          int                     `json:"product_id" binding:"oneof=1 2" description:"产品ID"`
 	ServiceRemark      string                  `json:"service_remark" description:"套餐备注"`