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 | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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 40bf192..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
@@ -1,5 +1,6 @@
package com.ld.igds.inout.view;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -14,11 +15,15 @@
import com.ld.igds.inout.manager.InoutManager;
import com.ld.igds.inout.manager.InoutReportManager;
import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
+
import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
/**
* 鍑哄叆搴撹鍗曢〉闈㈢鐞�
@@ -31,12 +36,41 @@
@Component
public class InoutDataPR {
- @Autowired
+ @Resource
private InoutService inoutService;
- @Autowired
+ @Resource
private InoutReportManager inoutReportManager;
- @Autowired
+ @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;
+ }
/**
* inoutDataPR#pageInoutData
@@ -46,8 +80,7 @@
* @throws Exception
*/
@DataProvider
- public void pageInoutData(Page<InoutData> page, InoutParam param)
- throws Exception {
+ public void pageInoutData(Page<InoutData> page, InoutParam param) throws Exception {
// 璋冪敤鏍稿績鍖呬腑鏂规硶锛岄渶瑕佸仛瀵硅薄杞崲
param.setPage(page.getPageNo());
param.setLimit(page.getPageSize());
@@ -165,7 +198,6 @@
@Expose
public InoutData initAddData(String type) {
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
@@ -187,15 +219,11 @@
*/
@DataProvider
public InoutData initDataByHand(String type) {
-
IUser user = ContextUtil.getLoginUser();
-
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