Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-22 deee597fa30e9a40792a4eb094b6ce45a35bc13f

 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);
    }

}