From f23f7a18fe8fe3729dfb91af5b55b515b835c7d8 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 17 八月 2023 17:40:16 +0800 Subject: [PATCH] 问题修改 --- igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 38 +++++--------------------------------- 1 files changed, 5 insertions(+), 33 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java index e1df4fd..65b2400 100644 --- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java +++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java @@ -72,50 +72,22 @@ /** * 鏍规嵁checkId鑾峰彇妫�楠岄」淇℃伅 * - * checkStandardPR#listCheckItemsByCheckId + * checkStandardPR#listCheckItemsByParam * * @param param * @return */ @DataProvider - public List<CheckItemData> listCheckItemsByCheckId(Map<String, Object> param) { + @Expose + public List<CheckItemData> listCheckItemsByParam(Map<String, Object> param) { String checkId = (String) param.get("checkId"); - String deptId = (String) param.get("deptId"); String foodVariety = (String) param.get("foodVariety"); + String type = (String) param.get("type"); - return checkStandardManager.listCheckItem(checkId, null, deptId, foodVariety); + return checkStandardManager.listCheckItem(ContextUtil.getCompanyId(),checkId, foodVariety); } - /** - * 鏍规嵁foodVariety鑾峰彇妫�楠岄」淇℃伅 - * - * checkStandardPR#listCheckItemsByFoodVariety - * - * @param param - * @return - */ - @Expose - public List<CheckItemData> listCheckItemsByFoodVariety(Map<String, Object> param) { - - String deptId = (String) param.get("deptId"); - String foodVariety = (String) param.get("foodVariety"); - - return checkStandardManager.listCheckItem(null, null, deptId, foodVariety); - } - - -// /*=============== 鍖栭獙鎶ヨ〃鎵撳嵃鐩稿叧 ===============*/ -// /** -// * checkStandardPR#pageReportCheckData 鍒嗛〉鑾峰彇鍑哄叆搴撶殑鍖栭獙鍗曟嵁鎶ヨ〃淇℃伅 -// * -// * @param page -// * @param param -// */ -// @DataProvider -// public void pageReportCheckData(Page<ReportInoutCheckData> page, Map<String, Object> param) { -// jdbcInoutCheckService.pageReportCheckData(page, param); -// } /** * checkStandardPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛� -- Gitblit v1.9.3