问诊订单-导出

api/controller/orderInquiry.go

@@ -16,28 +16,29 @@ type OrderInquiry struct{}
 
 // GetOrderInquiryPage 获取问诊订单列表-分页
 func (r *OrderInquiry) GetOrderInquiryPage(c *gin.Context) {
-	req := requests.OrderInquiryRequest{}
-	if err := c.ShouldBind(&req.GetOrderInquiryPage); err != nil {
+	orderInquiryRequest := requests.OrderInquiryRequest{}
+	req := orderInquiryRequest.GetOrderInquiryPage
+	if err := c.ShouldBind(&req); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(req.GetOrderInquiryPage); err != nil {
+	if err := global.Validate.Struct(req); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
 
-	if req.GetOrderInquiryPage.Page == 0 {
-		req.GetOrderInquiryPage.Page = 1
+	if req.Page == 0 {
+		req.Page = 1
 	}
 
-	if req.GetOrderInquiryPage.PageSize == 0 {
-		req.GetOrderInquiryPage.PageSize = 20
+	if req.PageSize == 0 {
+		req.PageSize = 20
 	}
 
 	orderInquiryDao := dao.OrderInquiryDao{}
-	orderInquiry, total, err := orderInquiryDao.GetOrderInquiryPageSearch(req.GetOrderInquiryPage, req.GetOrderInquiryPage.Page, req.GetOrderInquiryPage.PageSize)
+	orderInquiry, total, err := orderInquiryDao.GetOrderInquiryPageSearch(req, req.Page, req.PageSize)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
@@ -51,8 +52,8 @@ func (r *OrderInquiry) GetOrderInquiryPage(c *gin.Context) {
 	}
 
 	result := make(map[string]interface{})
-	result["page"] = req.GetOrderInquiryPage.Page
-	result["page_size"] = req.GetOrderInquiryPage.PageSize
+	result["page"] = req.Page
+	result["page_size"] = req.PageSize
 	result["total"] = total
 	result["data"] = GetOrderInquiryPageResponses
 	responses.OkWithData(result, c)