From deee597fa30e9a40792a4eb094b6ce45a35bc13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
index f61c84b..0950c11 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
@@ -6,6 +6,7 @@
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.drug.service.HDrugLogApplyService;
import com.ld.igds.models.DrugLogApply;
+import com.ld.igds.models.DrugLogDtl;
import com.ld.igds.models.DrugLogPeople;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,14 +38,12 @@
/**
* drugLogApplyPR#peopleList
*
- * @param id
+ * @param
* @return
* @throws Exception
*/
@DataProvider
- public List<DrugLogPeople> peopleList(String id) throws Exception {
- Map<String, Object> param = new HashMap<>();
- param.put("drugLogId", id);
+ public List<DrugLogPeople> peopleList(Map<String, Object> param) throws Exception {
return drugLogApplyService.drugLogPeopleList(param);
}
@@ -80,4 +79,16 @@
return drugLogApplyService.delDrugLogPeople(data);
}
+ /**
+ * drugLogApplyPR#peopleList
+ *
+ * @param
+ * @return
+ * @throws Exception
+ */
+ @DataProvider
+ public List<DrugLogDtl> dtlList(Map<String, Object> param) throws Exception {
+ return drugLogApplyService.drugLogDtlList(param);
+ }
+
}
--
Gitblit v1.9.3