From c83a32ddf1d9c7dc31c149406d62219fb7b54efa Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 24 五月 2021 15:44:41 +0800
Subject: [PATCH] 绕组实验更新接口
---
src/main/java/com/whyc/service/WindingExperimentService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/WindingExperimentService.java b/src/main/java/com/whyc/service/WindingExperimentService.java
index 3f73914..e0ce6f5 100644
--- a/src/main/java/com/whyc/service/WindingExperimentService.java
+++ b/src/main/java/com/whyc/service/WindingExperimentService.java
@@ -98,7 +98,7 @@
windingStep1.setDeviceId(experiment.getDeviceId());//瀛樿澶囩被鍨�
windingStep1.setRealName(realName); //娴嬭瘯浜�
windingStep1.setStatus(1); //鐘舵��:0-鏈紑濮�,1-杩涜涓�,2-宸插畬鎴�
-
+ windingStep1.setRzLink(experiment.getRz_link()); //鍚勭浉缁曠粍杩炴帴鎯呭喌 0 寮曞嚭; 1 鍐呴儴杩炴帴
if (mapper1.insert(windingStep1) > 0) {
flag = true;
} else {
@@ -322,17 +322,20 @@
/**
* 瀹為獙鏁版嵁 step鍙傛暟 1 2 瀵瑰簲瀹為獙姝ラ1銆�2
*
+ *
+ * @param rzLink
* @param step
* @param pageNum
* @param pageSize
* @return
*/
- public Response getExperimentWindingStep1(int step, int pageNum, int pageSize) {
+ public Response getExperimentWindingStep1(int rzLink, int step, int pageNum, int pageSize) {
PageHelper.startPage(pageNum, pageSize);
QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>();
wrapper.eq("step",step);
- List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
+ List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(rzLink,step);
+// List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
}
--
Gitblit v1.9.1