From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块
---
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 ceea852..09966c9 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -71,6 +71,20 @@
}
/**
+ * 小程序列表分页
+ * @param traceability
+ * @param query
+ * @return
+ */
+ @GetMapping("/xcxpage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入traceability")
+ public R<IPage<TraceabilityVO>> xcxpage(TraceabilityVO traceability, Query query) {
+ IPage<TraceabilityVO> pages = traceabilityService.selectTraceabilityXcxPage(Condition.getPage(query), traceability);
+ return R.data(pages);
+ }
+
+ /**
* 自定义查询，不分页
* @param traceability
* @return
@@ -172,4 +186,15 @@
return R.data(traceabilityDTO);
}
+ /**
+ * 获取溯源详情信息（包含农产品信息，认证检测信息，产地（地块信息），农事记录，企业信息）扫码
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getTraceabilityDetailInfos")
+ public R<TraceabilityDetailDTO> getTraceabilityDetailInfos(Traceability traceability) {
+ TraceabilityDetailDTO traceabilityDTO = traceabilityService.getTraceabilityDetailInfos(traceability);
+ return R.data(traceabilityDTO);
+ }
+
}
--
Gitblit v1.9.3