From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 19 十二月 2024 15:38:44 +0800 Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 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 6713044..339e4e6 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 @@ -5,10 +5,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.dto.InsOrderPlanDTO; -import com.yuanchu.mom.dto.InsProductDto; -import com.yuanchu.mom.dto.InsProductResultDto; -import com.yuanchu.mom.dto.SubmitPlanDto; +import com.yuanchu.mom.dto.*; import com.yuanchu.mom.mapper.InsSampleUserMapper; import com.yuanchu.mom.pojo.InsOrderFile; import com.yuanchu.mom.pojo.InsOrderState; @@ -127,6 +124,13 @@ return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�"); } + @ValueClassify("妫�楠屼换鍔�") + @ApiOperation(value = "妫�楠屼换鍔℃挙閿�鎻愪氦") + @PostMapping("/cancelSubmitPlan") + public Result cancelSubmitPlan(Integer orderStateId) { + return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId)); + } + @ValueClassify("璁惧") @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�") @DeleteMapping("/isItAllowedToModifyTheCollectedValues") @@ -150,6 +154,13 @@ return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos)); } + @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�(杩斿洖/鎻愪氦)") + @PostMapping("/saveInsContext2s") + @ValueAuth + public Result<?> saveInsContext2s(@RequestBody InsProductResultDtos insProductResultDtos) { + return Result.success(insOrderPlanService.saveInsContext2s(insProductResultDtos)); + } + @ApiOperation(value = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�") @PostMapping("/saveInsContext3") @ValueAuth -- Gitblit v1.9.3