From 43a14ad6fbb68a9c0ce787acce28ce446aac13b0 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 13 七月 2023 14:14:51 +0800
Subject: [PATCH] 添加扦样信息
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index f7e5585..010e7ac 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -19,6 +19,7 @@
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -41,15 +42,33 @@
private InoutReportManager inoutReportManager;
@Resource
private InoutManager inoutManager;
-
-
-
+
+
// ${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}
@DataProvider
public List<DicTrigger> triggerRecordStatus1() {
List<DicTrigger> list = new ArrayList<DicTrigger>();
list.add(new DicTrigger(InoutConstant.RECORD_STATUS_DEL, "浣滃簾鍗�"));
list.add(new DicTrigger(InoutConstant.RECORD_STATUS_NORMAL, "姝ｅ父鍗�"));
+ return list;
+ }
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerResult() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.RESULT_1, "鍚堟牸"));
+ list.add(new DicTrigger(InoutConstant.RESULT_0, "涓嶅悎鏍�"));
+ return list;
+ }
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerSampleType").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerSampleType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.SAMPLE_TYPE_MANUAL, "浜哄伐"));
+ list.add(new DicTrigger(InoutConstant.SAMPLE_TYPE_AUTOMATIC, "鑷姩"));
+ list.add(new DicTrigger(InoutConstant.SAMPLE_TYPE_RANDOM, "鏅鸿兘闅忔満"));
return list;
}
@@ -204,9 +223,7 @@
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
- data.setCompleteTime(new Date());
data.setType(type);
- data.setIntelCard("0000");
data.setRegisterUser(user.getCname());
data.setDeptId(ContextUtil.subDeptId(user));
data.setCheckUser(user.getCname());
--
Gitblit v1.9.3