From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
similarity index 77%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
index 920a1a2..f8b6e42 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
@@ -3,18 +3,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo;
-import com.yuanchu.limslaboratory.service.ReportCheckService;
+import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
+import com.yuanchu.limslaboratory.service.ReportAuditingService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@@ -29,13 +29,13 @@
*/
@Api(tags = "妫�楠屾ā鍧�-->鎶ュ憡瀹℃牳")
@RestController
-@RequestMapping("/reportCheck")
-public class ReportCheckController {
+@RequestMapping("/reportAuditing")
+public class ReportAuditingController {
/**
* 鏈嶅姟瀵硅薄
*/
- @Autowired
- private ReportCheckService reportCheckService;
+ @Resource
+ private ReportAuditingService reportAuditingService;
@ApiOperation("鏌ヨ鎶ュ憡瀹℃牳鍐呭")
@ApiImplicitParams(value = {
@@ -44,9 +44,9 @@
@ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
})
- @GetMapping("/selectAllReportCheck")
+ @GetMapping("/selectAllReportAuditing")
public Result selectAllReportCheck(Integer page, Integer pageSize, Integer status, String name) {
- IPage<ReportCheckVo> reportPage = reportCheckService.selectAllReportCheck(new Page<Object>(page, pageSize), status, name);
+ IPage<ReportAuditingVo> reportPage = reportAuditingService.selectAllReportAuditing(new Page<Object>(page, pageSize), status, name);
Map<String, Object> map = new HashMap<>();
map.put("total", reportPage.getTotal());
map.put("row", reportPage.getRecords());
--
Gitblit v1.9.3