新增金额描述

controller/contract/register.go

@@ -270,6 +270,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		logItem.OpData = opData
 		logItem.OpType = fms.ContractRegisterOpTypeSave
 		logItem.CreateTime = nowTime
+		logItem.Remark = req.Remark
 		if e = logItem.Create(); e != nil {
 			return
 		}
@@ -407,6 +408,7 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 		logItem.OpData = opData
 		logItem.OpType = fms.ContractRegisterOpTypeEdit
 		logItem.CreateTime = nowTime
+		logItem.Remark = req.Remark
 		if e = logItem.Create(); e != nil {
 			return
 		}
@@ -724,7 +726,7 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 				OpData:             opData,
 				OpType:             opType,
 				CreateTime:         nowTime,
-				Remark:             fmt.Sprint(adminInfo.RealName, " 删除", fms.ContractInvoiceKeyNameMap[opType], "金额", originInvoiceList[i].Amount, "元"),
+				AmountRemark:       fmt.Sprint("删除", fms.ContractInvoiceKeyNameMap[opType], "金额", originInvoiceList[i].Amount, "元"),
 			})
 		}
 	}
@@ -743,7 +745,7 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 			OpData:             opData,
 			OpType:             opType,
 			CreateTime:         nowTime,
-			Remark:             fmt.Sprint(adminInfo.RealName, " 新增", fms.ContractInvoiceKeyNameMap[opType], "金额", ia, "元"),
+			AmountRemark:       fmt.Sprint("新增", fms.ContractInvoiceKeyNameMap[opType], "金额", ia, "元"),
 		})
 	}
 

models/fms/contract_register_log.go

@@ -15,6 +15,7 @@ type ContractRegisterLog struct {
 	OpData             string    `gorm:"column:op_data" json:"op_data" description:"操作数据-JSON"`
 	OpType             int       `gorm:"column:op_type" json:"op_type" description:"操作类型: 1-合规登记; 2-开票登记; 3-到款登记; 4-修改合同状态; 5-删除合同登记; 6-合规编辑"`
 	Remark             string    `gorm:"column:remark" json:"remark" description:"备注信息"`
+	AmountRemark       string    `gorm:"column:amount_remark" json:"amount_remark" description:"金额描述"`
 	CreateTime         time.Time `gorm:"autoCreateTime;column:create_time" json:"create_time" description:"创建时间"`
 }
 
@@ -26,6 +27,7 @@ type ContractRegisterLogItem struct {
 	OpData             string `gorm:"column:op_data" json:"-" description:"操作数据-JSON"`
 	OpType             int    `gorm:"column:op_type" json:"op_type" description:"操作类型: 1-合规登记; 2-开票登记; 3-到款登记; 4-修改合同状态; 5-删除合同登记;"`
 	Remark             string `gorm:"column:remark" json:"remark" description:"备注信息"`
+	AmountRemark       string `gorm:"column:amount_remark" json:"amount_remark" description:"金额描述"`
 	CreateTime         string `gorm:"autoCreateTime;column:create_time" json:"create_time" description:"创建时间"`
 }
 
@@ -76,6 +78,7 @@ func formatContractRegisterLog2ItemList(list []*ContractRegisterLog) (itemList [
 			OpData:             list[i].OpData,
 			OpType:             list[i].OpType,
 			Remark:             list[i].Remark,
+			AmountRemark:       list[i].AmountRemark,
 			CreateTime:         utils.TimeTransferString(utils.FormatDateTime, list[i].CreateTime),
 		})
 	}