From 5208dce1708d415b39f4caffa5f23c83a7070199 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 18 四月 2024 14:44:30 +0800
Subject: [PATCH] 修改字段类型

---
 controllers/operation.go |   78 +++++++++++++++++++++-----------------
 1 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index af53200..229b1eb 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -873,12 +873,12 @@
 	var fileUrl string
 	if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
 		if conf.WebConf.CompanyName == "jialian" {
-			fileUrl, err = JialianInputOperation(operation)
+			fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
 			if err != nil {
 				util.ResponseFormat(c, code.RequestParamError, err.Error())
 				return
 			}
-		} else {
+		} else if conf.WebConf.CompanyName == "geruimi" {
 			fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
 			if err != nil {
 				util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -886,10 +886,18 @@
 			}
 		}
 	} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
-		fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
-		if err != nil {
-			util.ResponseFormat(c, code.RequestParamError, err.Error())
-			return
+		if conf.WebConf.CompanyName == "jialian" {
+			fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+			if err != nil {
+				util.ResponseFormat(c, code.RequestParamError, err.Error())
+				return
+			}
+		} else if conf.WebConf.CompanyName == "geruimi" {
+			fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+			if err != nil {
+				util.ResponseFormat(c, code.RequestParamError, err.Error())
+				return
+			}
 		}
 	} else {
 		util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
@@ -899,8 +907,8 @@
 	util.ResponseFormat(c, code.Success, fileUrl)
 }
 
-func JialianInputOperation(operation *models.Operation) (string, error) {
-	template, err := models.NewFileTemplateAttachmentSearch().SetCategory(14).First()
+func JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+	template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
 	if err != nil {
 		return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
 	}
@@ -921,7 +929,7 @@
 
 	rowIndex := 5
 	totalAmount := decimal.NewFromInt(0)
-	//totalPrice := decimal.NewFromInt(0)
+	totalPrice := decimal.NewFromInt(0)
 	for i, v := range operation.Details {
 		//璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
 		if i > 8 {
@@ -933,16 +941,14 @@
 		f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Amount.String())
 		f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.PurchasePrice.String())
 		if !v.Product.PurchasePrice.IsZero() {
-			//totalPrice = totalPrice.Add(v.Product.PurchasePrice)
-			price := v.Amount.Mul(v.Product.PurchasePrice).String()
+			ap := v.Amount.Mul(v.Product.PurchasePrice)
+			totalPrice = totalPrice.Add(ap)
+			price := ap.String()
 			split := strings.Split(price, ".")
 			if len(split) == 2 {
 				for n, a := range split[1] {
 					f.SetCellValue("Sheet1", string('M'+n)+strconv.Itoa(rowIndex), string(a))
 				}
-			} else {
-				f.SetCellValue("Sheet1", "M"+strconv.Itoa(rowIndex), "0")
-				f.SetCellValue("Sheet1", "N"+strconv.Itoa(rowIndex), "0")
 			}
 			s := split[0]
 			n := 0
@@ -960,27 +966,29 @@
 		totalAmount = totalAmount.Add(v.Amount)
 	}
 	//鍚堣
-	//if !totalPrice.IsZero() {
-	//	price := totalAmount.Mul(totalPrice).String()
-	//	split := strings.Split(price, ".")
-	//	if len(split) == 2 {
-	//		for n, a := range split[1] {
-	//			f.SetCellValue("Sheet1", string('M'+n)+"14", string(a))
-	//		}
-	//	}
-	//	s := split[0]
-	//	n := 0
-	//	for j := len(s) - 1; j >= 0; j-- {
-	//		if n == 6 {
-	//			f.SetCellValue("Sheet1", string('L'-n)+"14", s[:j])
-	//			break
-	//		}
-	//		f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
-	//		n++
-	//	}
-	//}
-	//f.SetCellValue("Sheet1", "D14", totalAmount)
-	//f.SetCellValue("Sheet1", "E14", totalPrice)
+	if !totalPrice.IsZero() {
+		price := totalPrice.String()
+		split := strings.Split(price, ".")
+		if len(split) == 2 {
+			for n, a := range split[1] {
+				f.SetCellValue("Sheet1", string('M'+n)+"14", string(a))
+			}
+		} else {
+			f.SetCellValue("Sheet1", "M14", "0")
+			f.SetCellValue("Sheet1", "N14", "0")
+		}
+		s := split[0]
+		n := 0
+		for j := len(s) - 1; j >= 0; j-- {
+			if n == 6 {
+				f.SetCellValue("Sheet1", string('L'-n)+"14", s[:j])
+				break
+			}
+			f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
+			n++
+		}
+	}
+	f.SetCellValue("Sheet1", "D14", totalAmount)
 
 	f.SetCellValue("Sheet1", "B15", operation.Manager)
 	f.SetCellValue("Sheet1", "D15", operation.Accountant)

--
Gitblit v1.8.0