From 6c0984fd0a154658d9144fb3a00cf61d3f4e04b8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 28 九月 2022 15:39:31 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index f8a77e8..6d0fc7a 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -1,22 +1,25 @@
package com.dg.core.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
-import com.dg.core.db.gen.entity.GuideEvolveEntity;
-import com.dg.core.db.gen.entity.GuideRepairOrder;
-import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.*;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 工单管理
@@ -318,5 +321,27 @@
}
+ /**
+ * 获取工单列表(分页)
+ * @param matterName
+ * @return
+ */
+ @ApiOperation(" 获取工单列表(分页)")
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "matterName",required = false) String matterName)
+ {
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
+ int num=iGuideRepairOrderService.countConfigList(matterName);
+ return getDataTable(list,num);
+
+ }
+
+
}
--
Gitblit v1.7.1