From 7a268ed852ca462347cca383a6d0306ff54e1363 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 十一月 2024 15:05:21 +0800
Subject: [PATCH] 添加模版
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 123 ++++++++++++++++++++++++++++++++---------
1 files changed, 96 insertions(+), 27 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 dfdb382..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
@@ -1,16 +1,20 @@
package com.yuanchu.mom.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.pojo.InsOrderFile;
-import com.yuanchu.mom.service.InsOrderFileService;
-import com.yuanchu.mom.service.InsOrderPlanService;
-import com.yuanchu.mom.service.InsProductService;
+import com.yuanchu.mom.pojo.InsOrderState;
+import com.yuanchu.mom.pojo.InsProductResult;
+import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.vo.InsProductResultVo;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +22,10 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -31,10 +38,12 @@
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
+ private InsOrderUserService insOrderUserService;
private InsOrderFileService insOrderFileService;
private InsProductService insProductService;
+ private InsOrderStateService insOrderStateService;
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -70,24 +79,17 @@
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
- @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
- @PostMapping("/getReportModel")
- @ValueAuth
- public Result<?> getReportModel(Integer sampleId) {
- return Result.success(insOrderPlanService.getReportModel(sampleId));
- }
-
@ValueAuth
@PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
- public Result<?> getInsProduct(Integer id, Integer type, String laboratory) {
- return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory));
+ public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
+ return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
}
@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));
}
@@ -101,7 +103,7 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
- public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
@@ -115,12 +117,12 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, sampleCode);
+ public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
+ int num = insOrderPlanService.submitPlan(submitPlanDto);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueClassify("璁惧")
@ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
@DeleteMapping("/isItAllowedToModifyTheCollectedValues")
public Result<?> isItAllowedToModifyTheCollectedValues() {
@@ -130,10 +132,24 @@
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
@ValueAuth
- public Result<?> saveInsContext(String param) {
+ public Result<?> saveInsContext(String param, Integer num) {
Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveInsContext(param2);
+ 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
@@ -149,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
@@ -179,10 +195,63 @@
return Result.success(insProductService.write(insProductDto));
}
- @ValueAuth
- @ApiOperation(value = "娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)")
- @PostMapping("/temCycle")
- public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
- return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "鎻掗槦鎿嶄綔")
+ @PostMapping("/jumpTeam")
+ public Result<?> jumpTeam(@RequestBody InsOrderState insOrderState) {
+ return Result.success(insOrderStateService.jumpTeam(insOrderState));
}
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐨勫垹闄ら娈�")
+ @PostMapping("/deleteInsContext")
+ @ValueAuth
+ public Result<?> deleteInsContext(@RequestBody InsProductResultVo insProductResultVo) {
+ return Result.success(insOrderPlanService.deleteInsContext(insProductResultVo));
+ }
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐐瑰嚮妫�楠岄�夋嫨鐗堟湰")
+ @PostMapping("/chooseVersion")
+ @ValueAuth
+ public Result<?> chooseVersion(Integer orderStateId, Integer version) {
+ InsOrderState orderState = new InsOrderState();
+ orderState.setId(orderStateId);
+ orderState.setVersion(version);
+ return Result.success(insOrderStateService.updateById(orderState));
+ }
+
+ @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));
+ }
+
+ @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));
+ }
+
}
--
Gitblit v1.9.3