fix: 到款登记月份

models/fms/contract_invoice.go

@@ -133,12 +133,16 @@ func GetContractInvoiceItemList(condition string, pars []interface{}) (itemList
 func formatContractInvoice2ItemList(list []*ContractInvoice) (itemList []*ContractInvoiceItem) {
 	itemList = make([]*ContractInvoiceItem, 0)
 	for i := range list {
+		d := utils.TimeTransferString(utils.FormatDate, list[i].InvoiceDate)
+		if list[i].InvoiceType == ContractInvoiceTypePay {
+			d = utils.TimeTransferString(utils.FormatMonth, list[i].InvoiceDate)
+		}
 		itemList = append(itemList, &ContractInvoiceItem{
 			ContractInvoiceId:  list[i].ContractInvoiceId,
 			ContractRegisterId: list[i].ContractRegisterId,
 			Amount:             list[i].Amount,
 			InvoiceType:        list[i].InvoiceType,
-			InvoiceDate:        utils.TimeTransferString(utils.FormatDate, list[i].InvoiceDate),
+			InvoiceDate:        d,
 			Remark:             list[i].Remark,
 			CreateTime:         utils.TimeTransferString(utils.FormatDateTime, list[i].CreateTime),
 		})

models/fms/contract_register_log.go

@@ -56,6 +56,7 @@ func GetContractRegisterLogItemList(condition string, pars []interface{}) (itemL
 	list := make([]*ContractRegisterLog, 0)
 	err = global.DEFAULT_MYSQL.Model(ContractRegisterLog{}).
 		Where(condition, pars...).
+		Order("create_time DESC").
 		Find(&list).Error
 	if err != nil {
 		return

utils/constants.go

@@ -4,6 +4,7 @@ package utils
 const (
 	FormatTime            = "15:04:05"                //时间格式
 	FormatDate            = "2006-01-02"              //日期格式
+	FormatMonth           = "2006-01"                 //日期格式-年月
 	FormatDateCN          = "2006年01月02日"             //日期格式（中文）
 	FormatDateUnSpace     = "20060102"                //日期格式
 	FormatDateTime        = "2006-01-02 15:04:05"     //完整时间格式