From 246e6391b8b4798a1aff7c1f9d6cf6ffd35bbb1a Mon Sep 17 00:00:00 2001 From: FCL Date: Fri, 28 Nov 2025 15:09:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=80=E6=B5=8B=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/MaterialAssayStandardController.java | 4 ++++ .../admin/MaterialAssayStandardDetailController.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java index b4d9fc4..28aff4f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardController.java @@ -70,6 +70,10 @@ public class MaterialAssayStandardController implements BusinessControllerMarker @Operation(summary = "更新检测标准") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard:update')") public CommonResult updateMaterialAssayStandard(@Valid @RequestBody MaterialAssayStandardSaveReqVO updateReqVO) { + Long id = updateReqVO.getId(); + MaterialAssayStandardDO entity = materialAssayStandardService.getMaterialAssayStandard(id); + if("tempDataKey".equals(entity.getRemark())) + updateReqVO.setRemark(""); materialAssayStandardService.updateMaterialAssayStandard(updateReqVO); return success(true); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java index 4e326f8..b14fc5a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/MaterialAssayStandardDetailController.java @@ -74,6 +74,14 @@ public class MaterialAssayStandardDetailController implements BusinessController return success(jsonArray); } + @GetMapping("/getByStandardId") + @Operation(summary = "获得物料检测标准检测项目分页") + //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:query')") + public CommonResult> getByStandardId(@Valid MaterialAssayStandardDetailPageReqVO pageReqVO) { + List list = materialAssayStandardDetailService.getByStandardId(pageReqVO.getMaterialAssayStandardId()); + return success(list); + } + @PostMapping("/create") @Operation(summary = "创建物料检测标准检测项目") //@PreAuthorize("@ss.hasPermission('qms:material-assay-standard-detail:create')")