From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java | 116 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 40 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java
index 5d82afa..c0af352 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java
@@ -1,8 +1,13 @@
package com.ld.igds.drug.view;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.ld.igds.inout.InoutConstant;
+import com.ld.igds.models.DicTrigger;
+import com.ld.igds.util.ContextUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -14,57 +19,88 @@
/**
* 鐔忚捀绠＄悊鐨凱R
- *
+ *
* @author: andy.jia
* @description:
* @version:
* @data:2020骞�3鏈�6鏃�
- *
*/
@Component("drugPR")
public class DrugPR {
- @Autowired
- private HDrugService drugService;
+ @Autowired
+ private HDrugService drugService;
- /**
- * ${dorado.getDataProvider("drugPR#listDrug").getResult()}
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public List<Drug> listDrug(String name) throws Exception {
- return drugService.listDrug(name);
- }
- @DataProvider
- public void pageDrug(Page<Drug> page, Map<String, Object> param)
- throws Exception {
- drugService.pageDrug(page, param);
- }
+ // ${dorado.getDataProvider("drugPR#triggerPackage").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerPackage() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger("1", "鐡惰"));
+ list.add(new DicTrigger("2", "琚嬭"));
+ list.add(new DicTrigger("3", "鍏朵粬"));
+ return list;
+ }
- /**
- * drugPR#delDrug
- *
- * @param param
- * @throws Exception
- */
- @Expose
- public String delDrug(Drug data) throws Exception {
- return drugService.delDrug(data);
- }
+ // ${dorado.getDataProvider("drugPR#triggerLocation").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerLocation() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger("1", "鑽墏搴�"));
+ list.add(new DicTrigger("2", "鍏朵粬"));
+ return list;
+ }
- /**
- * drugPR#updateDrug 鏂板鎴栬�呬慨鏀�
- *
- * @param param
- * @throws Exception
- */
- @Expose
- public String updateDrug(Drug data) throws Exception {
- return drugService.updateDrug(data);
- }
+ // ${dorado.getDataProvider("drugPR#triggerUnit").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerUnit() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger("1", "鍏枻"));
+ list.add(new DicTrigger("2", "鍏�"));
+ list.add(new DicTrigger("3", "姣厠"));
+ return list;
+ }
+
+ /**
+ * ${dorado.getDataProvider("drugPR#listDrug").getResult()}
+ *
+ * @throws Exception
+ */
+ @DataProvider
+ public List<Drug> listDrug() throws Exception {
+ return drugService.listDrug(ContextUtil.getCompanyId(), null);
+ }
+
+ /**
+ * ${dorado.getDataProvider("drugPR#pageDrug").getResult()}
+ *
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageDrug(Page<Drug> page, Map<String, Object> param) throws Exception {
+ drugService.pageDrug(page, param);
+ }
+
+ /**
+ * ${dorado.getDataProvider("drugPR#saveDrug").getResult()}
+ *
+ * @throws Exception
+ */
+ @Expose
+ public void saveDrug(Drug drug) throws Exception {
+ drugService.saveDrug(drug);
+ }
+
+ /**
+ * drugPR#delDrug
+ *
+ * @param
+ * @throws Exception
+ */
+ @Expose
+ public String delDrug(Drug data) throws Exception {
+ return drugService.delDrug(data);
+ }
+
}
--
Gitblit v1.9.3