From 8e90e43a4a88e16b59d5abeed9c638801a9269ff Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 21 十一月 2024 08:46:18 +0800 Subject: [PATCH] 加分支 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java index 0036898..88e2c02 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java @@ -89,7 +89,7 @@ @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "浠诲姟浜ゆ帴") @PostMapping("/upPlanUser") - public Result<?> upPlanUser(Integer userId, Integer orderId,String sonLaboratory) { + public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) { return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory)); } @@ -132,9 +132,9 @@ @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�") @PostMapping("/saveInsContext") @ValueAuth - public Result<?> saveInsContext(String param,Integer num) { + public Result<?> saveInsContext(String param, Integer num) { Map<String, Object> param2 = JSON.parseObject(param, Map.class); - insOrderPlanService.saveInsContext(param2,num); + insOrderPlanService.saveInsContext(param2, num); return Result.success(); } @@ -165,15 +165,15 @@ @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "涓婁紶闄勪欢") @PostMapping("/uploadFile") - public Result<?> uploadFile(Integer orderId, MultipartFile file) { - return Result.success(insOrderPlanService.uploadFile(orderId, file)); + public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory) { + return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory)); } @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "鍒犻櫎闄勪欢") @PostMapping("/delfile") public Result<?> delfile(Integer id) { - return Result.success(insOrderFileService.removeById(id)); + return Result.success(insOrderFileService.delfile(id)); } @ValueAuth @@ -212,7 +212,7 @@ @ApiOperation(value = "鐢佃矾璇曢獙鐐瑰嚮妫�楠岄�夋嫨鐗堟湰") @PostMapping("/chooseVersion") @ValueAuth - public Result<?> chooseVersion(Integer orderStateId,Integer version) { + public Result<?> chooseVersion(Integer orderStateId, Integer version) { InsOrderState orderState = new InsOrderState(); orderState.setId(orderStateId); orderState.setVersion(version); @@ -229,28 +229,28 @@ @ValueAuth @PostMapping("/getInsProduct2") @ApiOperation("鏌ョ湅妫�楠屽巻鍙�") - public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) { - return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request,num)); + public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) { + return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request, num)); } @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "鎵爜鎶ユ(鍏ュ簱)") @PostMapping("/scanInsOrderState") - public Result scanInsOrderState(String sonLaboratory,String sampleCode,String trees) { - return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode,trees)); + public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees) { + return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees)); } @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "鎵爜鍑哄簱") @PostMapping("/outInsOrderState") - public Result outInsOrderState(String sonLaboratory,String sampleCode) { - return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory,sampleCode)); + public Result outInsOrderState(String sonLaboratory, String sampleCode) { + return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode)); } @ValueAuth @PostMapping("/preview") @ApiOperation("棰勮鏂囦欢") - public Result<?> preview(Integer id)throws Exception { + public Result<?> preview(Integer id) throws Exception { return Result.success(insOrderPlanService.preview(id)); } -- Gitblit v1.9.3