到款月格式改为date

controller/contract/register.go

@@ -1028,17 +1028,31 @@ func (rg *RegisterController) Export(c *gin.Context) {
 
 		// 开票/到款信息
 		ivList := invoiceMap[v.ContractRegisterId]
+		ivListLen := len(ivList)
 		if ivList != nil && len(ivList) > 0 {
-			for ia := range ivList {
-				dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", ivList[ia].InvoiceDate)) // 开票日
-				dataRow.AddCell().SetString(fmt.Sprint(ivList[ia].Amount))                                  // 开票金额
+			for ia := 0; ia < maxInvoice; ia++ {
+				if ia < ivListLen {
+					dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", ivList[ia].InvoiceDate)) // 开票日
+					dataRow.AddCell().SetString(fmt.Sprint(ivList[ia].Amount))                                  // 开票金额
+				} else {
+					// 这里要把不够的填充为空
+					dataRow.AddCell().SetString("")
+					dataRow.AddCell().SetString("")
+				}
 			}
 		}
 		pyList := paymentMap[v.ContractRegisterId]
-		if pyList != nil && len(pyList) > 0 {
-			for ib := range pyList {
-				dataRow.AddCell().SetString(utils.TimeTransferString("2006年01月", pyList[ib].InvoiceDate)) // 收款月
-				dataRow.AddCell().SetString(fmt.Sprint(pyList[ib].Amount))                                // 收款金额
+		pyListLen := len(pyList)
+		if pyList != nil && pyListLen > 0 {
+			for ib := 0; ib < maxInvoice; ib++ {
+				if ib < pyListLen {
+					dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", pyList[ib].InvoiceDate)) // 收款月
+					dataRow.AddCell().SetString(fmt.Sprint(pyList[ib].Amount))                                  // 收款金额
+				} else {
+					// 已经是最后的几列了其实可以不用填充空, 万一后面要加列此处还是填充上吧
+					dataRow.AddCell().SetString("")
+					dataRow.AddCell().SetString("")
+				}
 			}
 		}
 	}

models/fms/contract_invoice.go

@@ -133,16 +133,12 @@ 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:        d,
+			InvoiceDate:        utils.TimeTransferString(utils.FormatDate, list[i].InvoiceDate),
 			Remark:             list[i].Remark,
 			CreateTime:         utils.TimeTransferString(utils.FormatDateTime, list[i].CreateTime),
 		})