From d589bf94e8f1863336d23fdd951049622b64db68 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十一月 2024 16:36:43 +0800
Subject: [PATCH] csv文件调整
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 23 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 724cb63..ed69b35 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
@@ -8,12 +8,13 @@
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.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
-import com.yuanchu.mom.service.InsOrderFileService;
-import com.yuanchu.mom.service.InsOrderPlanService;
-import com.yuanchu.mom.service.InsOrderStateService;
-import com.yuanchu.mom.service.InsProductService;
+import com.yuanchu.mom.pojo.InsProductResult;
+import com.yuanchu.mom.pojo.InsSampleUser;
+import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
import com.yuanchu.mom.vo.Result;
@@ -39,11 +40,14 @@
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
+ private InsOrderUserService insOrderUserService;
private InsOrderFileService insOrderFileService;
private InsProductService insProductService;
private InsOrderStateService insOrderStateService;
+
+ private InsSampleUserMapper insSampleUserMapper;
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -89,7 +93,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));
}
@@ -117,8 +121,8 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
+ public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
+ int num = insOrderPlanService.submitPlan(submitPlanDto);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@@ -132,10 +136,24 @@
@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();
+ }
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+ @PostMapping("/saveInsContext2")
+ @ValueAuth
+ public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
+ return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
+ }
+
+ @ApiOperation(value = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+ @PostMapping("/saveInsContext3")
+ @ValueAuth
+ public Result<?> saveInsContext3(@RequestBody InsProductResult insProductResult) {
+ return Result.success(insOrderPlanService.saveInsContext3(insProductResult));
}
@ValueAuth
@@ -151,15 +169,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
@@ -188,13 +206,6 @@
return Result.success(insOrderStateService.jumpTeam(insOrderState));
}
- @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
- @PostMapping("/saveInsContext2")
- @ValueAuth
- public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
- return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
- }
-
@ApiOperation(value = "鐢佃矾璇曢獙鐨勫垹闄ら娈�")
@PostMapping("/deleteInsContext")
@ValueAuth
@@ -205,18 +216,58 @@
@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);
return Result.success(insOrderStateService.updateById(orderState));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
+ @PostMapping("/getInsOrderUserList")
+ @ApiOperation("鏌ョ湅妫�楠屽巻鍙插垪琛�")
+ public Result<?> getInsOrderUserList(Integer insOrderStateId) {
+ return Result.success(insOrderPlanService.getInsOrderUserList(insOrderStateId));
+ }
+
+ @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));
+ }
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "鎵爜鍑哄簱")
+ @PostMapping("/outInsOrderState")
+ 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 {
+ return Result.success(insOrderPlanService.preview(id));
+ }
+
+ @ValueAuth
+ @PostMapping("/getCheckUser")
+ @ApiOperation("鑾峰彇褰撳墠妫�楠屼换鍔＄殑鎵�鏈夋楠屽憳淇℃伅")
+ //杩欓噷鐨勪紶鍙傛槸鏍峰搧id,绛夋楠屼换鍔￠偅鍧楀叏鏀逛簡涔嬪悗杩欓噷灏辨病闂
+ public Result<?> getCheckUser(Integer id,String sonLaboratory) {
+ List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
+ .eq(InsSampleUser::getState, 0) //妫�楠屼汉
+ .eq(InsSampleUser::getInsSampleId, id)
+ .eq(InsSampleUser::getSonLaboratory, sonLaboratory));
+ return Result.success(insSampleUsers);
}
}
--
Gitblit v1.9.3