From 6b1886314fd18f34740c96bb4fd86046600dd2c0 Mon Sep 17 00:00:00 2001 From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com> Date: 星期四, 16 五月 2024 17:08:36 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after --- inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java index 633cfdb..4ea2dbb 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.annotation.ValueClassify; import com.yuanchu.mom.pojo.StandardTemplate; import com.yuanchu.mom.service.StandardTemplateService; import com.yuanchu.mom.utils.JackSonUtil; @@ -20,7 +21,7 @@ public class StandardTemplateController { private StandardTemplateService standardTemplateService; - + @ValueClassify("鏍囧噯搴�") @ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃") @PostMapping("/selectStandardTemplatePageList") public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception { @@ -28,19 +29,19 @@ StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class); return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate)); } - + @ValueClassify("鏍囧噯搴�") @ApiOperation(value = "娣诲姞鍘熷璁板綍妯℃澘") @PostMapping("/addStandardTemplate") public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) { return Result.success(standardTemplateService.addStandardTemplate(standardTemplate)); } - + @ValueClassify("鏍囧噯搴�") @ApiOperation(value = "淇敼鍘熷璁板綍妯℃澘") @PostMapping("/upStandardTemplate") public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) { return Result.success(standardTemplateService.upStandardTemplate(standardTemplate)); } - + @ValueClassify("鏍囧噯搴�") @ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘") @PostMapping("/delStandardTemplate") public Result<?> delStandardTemplate(Integer id) { @@ -54,11 +55,11 @@ return Result.success(standardTemplateService.getStandardTemplate()); } - @ApiOperation(value = "閫氳繃妯℃澘id鍜岄」鐩悕绉拌幏鍙栨楠岄」妯℃澘鍐呭") - @PostMapping("/getStandTempThingByTIdAndPName") + @ApiOperation(value = "閫氳繃妯℃澘id鑾峰彇妫�楠岄」妯℃澘鍐呭") + @PostMapping("/getStandTempThingById") @ValueAuth - public Result<?> getStandTempThingByTIdAndPName(Integer templateId, String inspectionItem, String inspectionItemSubclass) { - return Result.success(standardTemplateService.getStandTempThingByTIdAndPName(templateId, inspectionItem, inspectionItemSubclass)); + public Result<?> getStandTempThingById(Integer id) { + return Result.success(standardTemplateService.getStandTempThingById(id)); } } -- Gitblit v1.9.3