From db3aaff2a2c18cf22902bf2071929a2b3af89342 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 11 四月 2024 14:03:54 +0800
Subject: [PATCH] 获取车辆编号和等级
---
controllers/workshop_manage_controller.go | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/controllers/workshop_manage_controller.go b/controllers/workshop_manage_controller.go
index 527e1d8..0cc7e7e 100644
--- a/controllers/workshop_manage_controller.go
+++ b/controllers/workshop_manage_controller.go
@@ -4,6 +4,7 @@
"github.com/gin-gonic/gin"
"silkserver/constvar"
"silkserver/controllers/request"
+ "silkserver/controllers/response"
"silkserver/extend/code"
"silkserver/extend/util"
"silkserver/models"
@@ -119,27 +120,41 @@
util.ResponseFormat(c, code.Success, groupMap)
}
-// GetWorkshopManageCar
+// GetCarAndLevel
//
// @Tags 绯荤粺璁剧疆/杞﹂棿绠＄悊
-// @Summary 鑾峰彇杞﹁締缂栧彿
+// @Summary 鑾峰彇杞﹁締缂栧彿鍜岀瓑绾�
// @Produce application/json
// @Param Authorization header string true "token"
// @Param object body request.GetWorkshopManageCar true "鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[][]int} "鎴愬姛"
-// @Router /api-jl/v1/system/getWorkshopManageCar [post]
-func (slf WorkshopManageController) GetWorkshopManageCar(c *gin.Context) {
+// @Success 200 {object} util.Response{data=response.CarAndLevel} "鎴愬姛"
+// @Router /api-jl/v1/system/getCarAndLevel [post]
+func (slf WorkshopManageController) GetCarAndLevel(c *gin.Context) {
var params request.GetWorkshopManageCar
err := c.BindJSON(¶ms)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- all, err := models.NewWorkshopManageSearch().SetWorkshopNumber(params.WorkshopNumber).SetGroupNumber(params.GroupNumber).FindAll()
+ all, err := models.NewWorkshopManageSearch().SetWorkshopName(params.WorkshopName).SetGroupNumber(params.GroupNumber).FindAll()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
}
+ fineness, err := models.NewFinenessRegisterSearch().SetWorkshop(params.WorkshopName).SetWorkshopGroup(params.GroupNumber).
+ SetMarket(params.MarketName).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ first, err := models.NewFinenessCheckSearch().SetID(fineness.FinenessCheckID).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ var data response.CarAndLevel
+ data.Level = first.FinenessGrade
+
carNum := make([][]int, 0)
for _, manage := range all {
car := make([]int, 0)
@@ -154,5 +169,7 @@
carNum = append(carNum, car)
}
}
- util.ResponseFormat(c, code.Success, carNum)
+ data.Car = carNum
+
+ util.ResponseFormat(c, code.Success, data)
}
--
Gitblit v1.8.0