From e69229e91d9e44ae22a7fa97d85a1d2da1655a8d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Jul 2022 16:52:08 +0800
Subject: [PATCH] 溯源记录修改
---
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
index ef56345..ceea852 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -1,5 +1,4 @@
package org.springblade.modules.traceability.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -10,17 +9,14 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.recovery.entity.Recovery;
import org.springblade.modules.recovery.service.RecoveryService;
import org.springblade.modules.traceability.dto.TraceabilityDTO;
import org.springblade.modules.traceability.dto.TraceabilityDetailDTO;
import org.springblade.modules.traceability.entity.Traceability;
import org.springblade.modules.traceability.service.TraceabilityService;
import org.springblade.modules.traceability.vo.TraceabilityVO;
-import org.springframework.retry.annotation.Recover;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -75,6 +71,16 @@
}
/**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getTraceabilityList")
+ public R getTraceabilityList(TraceabilityVO traceability) {
+ return R.data(traceabilityService.getTraceabilityList(traceability));
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
--
Gitblit v1.9.3