From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口

---
 controllers/dict_controller.go |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/controllers/dict_controller.go b/controllers/dict_controller.go
index 8c8d8fb..7366885 100644
--- a/controllers/dict_controller.go
+++ b/controllers/dict_controller.go
@@ -16,7 +16,7 @@
 // AddMiniDict
 //
 //	@Tags		鏁版嵁瀛楀吀
-//	@Summary	娣诲姞杩蜂綘瀛楀吀
+//	@Summary	娣诲姞瀛楀吀淇℃伅
 //	@Produce	application/json
 //	@Param		object	body		request.AddMiniDict	true	"鍙傛暟"
 //	@Success	200		{object}	util.Response		"鎴愬姛"
@@ -56,7 +56,7 @@
 // EditMiniDict
 //
 //	@Tags		鏁版嵁瀛楀吀
-//	@Summary	缂栬緫杩蜂綘瀛楀吀
+//	@Summary	缂栬緫瀛楀吀淇℃伅
 //	@Produce	application/json
 //	@Param		object	body		request.EditMiniDict	true	"鍙傛暟"
 //	@Success	200		{object}	util.Response			"鎴愬姛"
@@ -84,6 +84,7 @@
 	}
 
 	record := models.MiniDict{
+		Type:      params.Type,
 		Name:      params.Name,
 		Value:     params.Value,
 		IsDefault: params.IsDefault,
@@ -100,8 +101,8 @@
 
 // DeleteMiniDict
 //
-//	@Tags		灞炴�у�煎拰瀵硅薄
-//	@Summary	鍒犻櫎灞炴�у�煎拰瀵硅薄
+//	@Tags		鏁版嵁瀛楀吀
+//	@Summary	鍒犻櫎瀛楀吀淇℃伅
 //	@Param		id	path		string			true	"id"
 //	@Success	200	{object}	util.Response	"鎴愬姛"
 //	@Router		/api-wms/v1/dict/delete/{id} [delete]
@@ -177,12 +178,12 @@
 
 // GetMiniDictList
 //
-//		@Tags		鏁版嵁瀛楀吀
-//		@Summary	鑾峰彇杩蜂綘瀛楀吀鍒楄〃
-//		@Produce	application/json
-//	 @Param		object	query		request.GetMiniDictList	true	"鍙傛暟"
-//		@Success	200		{object}	util.ResponseList{data=[]models.MiniDict}	"鎴愬姛"
-//		@Router		/api-wms/v1/dict/getDictList [get]
+//	@Tags		鏁版嵁瀛楀吀
+//	@Summary	鑾峰彇瀛楀吀淇℃伅鍒楄〃
+//	@Produce	application/json
+//	 @Param		object	body		request.GetMiniDictList	true	"鍙傛暟"
+//	@Success	200		{object}	util.ResponseList{data=[]models.MiniDict}	"鎴愬姛"
+//	@Router		/api-wms/v1/dict/getDictList [post]
 func (slf DictController) GetMiniDictList(c *gin.Context) {
 	var params request.GetMiniDictList
 	if err := c.BindJSON(&params); err != nil {
@@ -190,12 +191,16 @@
 		return
 	}
 
-	if !params.Type.Valid() {
-		util.ResponseFormat(c, code.RequestParamError, "瀛楀吀绫诲瀷閿欒")
-		return
+	//if !params.Type.Valid() {
+	//	util.ResponseFormat(c, code.RequestParamError, "瀛楀吀绫诲瀷閿欒")
+	//	return
+	//}
+	dictSearch := models.NewMiniDictSearch()
+	if params.Type.Valid() {
+		dictSearch.SetType(params.Type)
 	}
 
-	list, total, err := models.NewMiniDictSearch().SetType(params.Type).Find()
+	list, total, err := dictSearch.Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
 		return

--
Gitblit v1.8.0