From 8a3d1498529b90781113821f8d97a7afee5ed7b3 Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期一, 17 六月 2024 09:26:27 +0800
Subject: [PATCH] 新增/修改产品-对动态属性的支持Attributes->AttributeValues

---
 controllers/report_forms_controller.go |   65 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 6d7b0ce..5f907fa 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -8,7 +8,6 @@
 	"wms/constvar"
 	"wms/extend/code"
 	"wms/extend/util"
-	"wms/models"
 	"wms/pkg/logx"
 	"wms/request"
 	"wms/service"
@@ -83,11 +82,6 @@
 	if err != nil {
 		logx.Errorf("DownloadInventoryForms Export err:%v", err)
 		util.ResponseFormat(c, code.InternalError, "瀵煎嚭鏁版嵁鍒版枃浠跺け璐�")
-		return
-	}
-
-	if err != nil {
-		util.ResponseFormat(c, code.RequestParamError, "瀵煎嚭澶辫触")
 		return
 	}
 
@@ -225,6 +219,12 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
 		return
 	}
+
+	if params.BaseOperationType == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "鍩虹鎿嶄綔绫诲瀷涓嶈兘涓虹┖")
+		return
+	}
+
 	historyFormsService := service.NewHistoryFormsService()
 	list, err := historyFormsService.FetchAll(params)
 	if err != nil {
@@ -306,11 +306,6 @@
 		return
 	}
 
-	if err != nil {
-		util.ResponseFormat(c, code.RequestParamError, "瀵煎嚭澶辫触")
-		return
-	}
-
 	fileContentDisposition := "attachment;filename=\"" + url.QueryEscape(filename) + "\""
 	c.Header("Content-Type", "application/xlsx")
 	c.Header("Content-Disposition", fileContentDisposition)
@@ -333,13 +328,57 @@
 		return
 	}
 
-	list, total, err := models.NewMonthStatsSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetDate(params.Date).Find()
+	monthFormsService := service.NewMonthFormsService()
+	total, err := monthFormsService.Count(params)
 	if err != nil {
+		logx.Errorf("MonthStats count err:%v", err)
+		util.ResponseFormat(c, code.InternalError, "鏌ヨ鎬绘暟澶辫触")
+		return
+	}
+	result, err := monthFormsService.Query(params)
+	if err != nil {
+		logx.Errorf("MonthStats query err:%v", err)
 		util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
 		return
 	}
 
-	util.ResponseFormatList(c, code.Success, list, int(total))
+	util.ResponseFormatList(c, code.Success, result, int(total))
+}
+
+// DownloadMonthStats
+// @Tags      鎶ヨ〃
+// @Summary   涓嬭浇鏈堝害缁熻搴撳瓨鎶ヨ〃
+// @Produce   application/json
+// @Param     object  body  request.GetMonthStats true  "鏌ヨ鍙傛暟"
+// @Param     Authorization	header string true "token"
+// @Success   200 {object} util.ResponseList{data=[]models.MonthStats}	"鎴愬姛"
+// @Router    /api-wms/v1/forms/downloadMonthStats [post]
+func (slf ReportFormsController) DownloadMonthStats(c *gin.Context) {
+	var params request.GetMonthStats
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+		return
+	}
+
+	monthFormsService := service.NewMonthFormsService()
+	list, err := monthFormsService.FetchAll(params)
+	if err != nil {
+		logx.Errorf("DownloadMonthStats FetchAll err:%v", err)
+		util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+		return
+	}
+	filename, err := monthFormsService.Export(list)
+	if err != nil {
+		logx.Errorf("DownloadMonthStats Export err:%v", err)
+		util.ResponseFormat(c, code.InternalError, "瀵煎嚭鏁版嵁鍒版枃浠跺け璐�")
+		return
+	}
+
+	fileContentDisposition := "attachment;filename=\"" + url.QueryEscape(filename) + "\""
+	c.Header("Content-Type", "application/xlsx")
+	c.Header("Content-Disposition", fileContentDisposition)
+	c.File(filename)
+	defer os.Remove(filename)
 }
 
 // DoMonthStats

--
Gitblit v1.8.0