Переглянути джерело

Merge branch 'feature/needs_business_contract' into debug

hsun 1 рік тому
батько
коміт
5e90a6231b
1 змінених файлів з 4 додано та 4 видалено
  1. 4 4
      controllers/eta_business/eta_business.go

+ 4 - 4
controllers/eta_business/eta_business.go

@@ -1025,8 +1025,8 @@ func (this *EtaBusinessController) Detail() {
 	resp.SigningStatus = item.SigningStatus
 	resp.Enable = item.Enable
 	resp.ContractId = item.ContractId
-	resp.SigningTime = item.SigningTime.Format(utils.FormatDate)
-	resp.ExpiredTime = item.ExpiredTime.Format(utils.FormatDate)
+	resp.SigningTime = utils.TimeTransferString(utils.FormatDate, item.SigningTime)
+	resp.ExpiredTime = utils.TimeTransferString(utils.FormatDate, item.ExpiredTime)
 	resp.CreateTime = item.CreateTime.Format(utils.FormatDateTime)
 	resp.ModifyTime = item.ModifyTime.Format(utils.FormatDateTime)
 
@@ -1097,8 +1097,8 @@ func (this *EtaBusinessController) ContractList() {
 		b := new(eta_business.EtaBusinessContractItem)
 		b.EtaBusinessContractId = v.EtaBusinessContractId
 		b.EtaBusinessId = v.EtaBusinessId
-		b.SigningTime = v.SigningTime.Format(utils.FormatDate)
-		b.ExpiredTime = v.ExpiredTime.Format(utils.FormatDate)
+		b.SigningTime = utils.TimeTransferString(utils.FormatDate, v.SigningTime)
+		b.ExpiredTime = utils.TimeTransferString(utils.FormatDate, v.ExpiredTime)
 		// 到期天数, 终止日按当天的23:59:59算
 		strEnd := v.ExpiredTime.Format(utils.FormatDate)
 		strEnd = strEnd + " 23:59:59"