From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 231 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
new file mode 100644
index 0000000..4a7b154
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -0,0 +1,231 @@
+package com.ruoyi.inspect.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.inspect.dto.*;
+import com.ruoyi.inspect.pojo.InsOrderFile;
+import com.ruoyi.inspect.service.InsOrderFileService;
+import com.ruoyi.inspect.service.InsOrderPlanService;
+import com.ruoyi.inspect.service.InsProductService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 妫�楠屼换鍔�-鎺у埗灞�
+ */
+@RestController
+@RequestMapping("/insOrderPlan")
+@Api(tags = "妫�楠屼换鍔�")
+@AllArgsConstructor
+public class InsOrderPlanController {
+
+ private InsOrderPlanService insOrderPlanService;
+
+ private InsOrderFileService insOrderFileService;
+
+ private InsProductService insProductService;
+
+ @ApiOperation(value = "鍔ㄦ�佽幏鍙杢ab琛ㄥご")
+ @GetMapping("/getTabHeader")
+ public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, String samples) {
+ return Result.success(insOrderPlanService.getTabHeader(sonLaboratory, samples));
+ }
+
+ @ApiOperation(value = "鏌ョ湅缁撴灉鎸夐挳")
+ @PostMapping("/getInsOrderPlanList")
+ public Result getInsOrderPlanList(@RequestBody QueryResultDTO queryResultDTO) {
+ return Result.success(insOrderPlanService.getInsOrderPlanList(queryResultDTO));
+ }
+
+ @ApiOperation(value = "瀵煎嚭濮旀墭璐圭敤")
+ @GetMapping("/exportCommissionFees")
+ public void exportCommissionFees(Map<String, Object> data,HttpServletResponse response) {
+ insOrderPlanService.exportCommissionFees(data,response);
+ }
+
+ @ApiOperation(value = "瀵煎嚭寰呮浠诲姟")
+ @GetMapping("/exportUnInsProducts")
+ public void exportUnInsProducts(UnInsProductsDTO unInsProductsDTO, HttpServletResponse response) {
+ insOrderPlanService.exportUnInsProducts(unInsProductsDTO,response);
+ }
+
+ @ApiOperation(value = "瀵煎嚭鏌ョ湅妫�楠岀粨鏋淓xcel")
+ @PostMapping("/exportInsOrderPlanResult")
+ public void exportInsOrderPlanResult(@RequestBody QueryResultDTO data, HttpServletResponse response) {
+ insOrderPlanService.exportInsOrderPlanResult(data, response);
+ }
+
+ @ApiOperation(value = "鏌ョ湅妫�楠屼换鍔″垪琛�")
+ @GetMapping("/selectInsOrderPlanList")
+ public Result selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
+ return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
+ }
+
+ @ApiOperation(value = "妫�楠屽崟璇︽儏-浠诲姟鍒囨崲")
+ @GetMapping("/inspectionOrderDetailsTaskSwitching")
+ public Result inspectionOrderDetailsTaskSwitching(Page page,InsOrderPlanDTO insOrderPlanDTO) {
+ return Result.success(insOrderPlanService.inspectionOrderDetailsTaskSwitching(page, insOrderPlanDTO));
+ }
+
+ @ApiOperation(value = "璁ら鎸夐挳")
+ @PostMapping("/claimInsOrderPlan")
+ public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) {
+ return Result.success(insOrderPlanService.claimInsOrderPlan(data));
+ }
+
+ @ApiOperation(value = "妫�楠屾寜閽�")
+ @GetMapping("/doInsOrder")
+ public Result<?> doInsOrder(Integer id, String laboratory) {
+ return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
+ }
+
+ @ApiOperation(value = "鍒囨崲濂楃/鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+ @GetMapping("/getReportModel")
+ public Result<?> getReportModel(Integer sampleId, String sonLaboratory) {
+ return Result.success(insOrderPlanService.getReportModel(sampleId,sonLaboratory));
+ }
+
+ @GetMapping("/getInsProduct")
+ @ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
+ public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
+ return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
+ }
+
+ @ApiOperation(value = "浜ゆ帴鎸夐挳")
+ @PostMapping("/upPlanUser")
+ public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
+ return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+ }
+
+ @ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
+ @GetMapping("/upPlanUser2")
+ public Result<?> upPlanUser2(Integer orderId) {
+ return Result.success(insOrderPlanService.upPlanUser2(orderId));
+ }
+
+ @ApiOperation(value = "澶嶆牳鎸夐挳")
+ @PostMapping("/verifyPlan")
+ public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
+ }
+
+ @ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
+ @PostMapping("/checkSubmitPlan")
+ public Result<?> checkSubmitPlan(Integer orderId, String laboratory, String temperature,String humidity) {
+ return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory ,temperature,humidity));
+ }
+
+ @ApiOperation(value = "鎻愪氦妫�楠屼换鍔�")
+ @PostMapping("/submitPlan")
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
+ return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+ }
+
+ /**
+ *
+ * @param orderId
+ * @return
+ */
+ @GetMapping("/getEquipName")
+ public Result<?> getEquipName(@RequestParam("orderId") Integer orderId,@RequestParam("sonLaboratory") String sonLaboratory) {
+ return Result.success(insOrderPlanService.getEquipName(orderId,sonLaboratory));
+ }
+
+ /**
+ * @param param 妯℃澘鍐呭
+ * @param currentTable 褰撳墠妯℃澘id
+ * @param sampleId 褰撳墠鏍峰搧id
+ * @param orderId 褰撳墠璁㈠崟id
+ * @param sonLaboratory 瀛愯瘯楠屽
+ * @return
+ */
+ @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
+ @PostMapping("/saveInsContext")
+ public Result<?> saveInsContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory,Boolean isDelete) {
+ Map<String, Object> param2 = JSON.parseObject(param, Map.class);
+ insOrderPlanService.saveInsContext(param2, currentTable, sampleId, orderId, sonLaboratory,isDelete);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏌ョ湅妫�楠屽崟涓嬬殑闄勪欢鍒楄〃")
+ @GetMapping("/getFileList")
+ public Result<?> getFileList(Page page,InsOrderFile insOrderFile) {
+ return Result.success(insOrderPlanService.getFileList(page, insOrderFile));
+ }
+
+ @ApiOperation(value = "涓婁紶闄勪欢鎸夐挳")
+ @PostMapping("/uploadFile")
+ public Result<?> uploadFile(Integer orderId, MultipartFile file) {
+ return Result.success(insOrderPlanService.uploadFile(orderId, file));
+ }
+
+ @ApiOperation(value = "鍒犻櫎闄勪欢鎸夐挳")
+ @PostMapping("/delfile")
+ public Result<?> delfile(Integer id) {
+ return Result.success(insOrderFileService.removeById(id));
+ }
+
+ @ApiOperation(value = "涓嬭浇闄勪欢")
+ @GetMapping("/downFile")
+ public Result<?> downFile(Integer id) {
+ InsOrderFile insOrderFile = insOrderFileService.getById(id);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("type", insOrderFile.getType());
+ map.put("fileUrl", insOrderFile.getFileUrl());
+ return Result.success(map);
+ }
+
+ @ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
+ @PostMapping("/write")
+ public Result<?> write(@RequestBody InsProductDto insProductDto) {
+ return Result.success(insProductService.write(insProductDto));
+ }
+
+ @ApiOperation(value = "娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)")
+ @GetMapping("/temCycle")
+ public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
+ return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
+ }
+
+ @ApiOperation(value = "寮у瀭鐗规畩椤规煡鐪嬪垪琛ㄦ暟鎹�")
+ @GetMapping("/getSagTemperatureProducts")
+ public Result<?> getSagTemperatureProducts(Integer sampleId) {
+ return Result.success(insOrderPlanService.getSagTemperatureProducts(sampleId));
+ }
+
+ @ApiOperation(value = "(鐢靛姏鐨勫簲鍔涘簲鍙�)淇濆瓨妫�楠屽唴瀹�")
+ @PostMapping("/saveInsContext2")
+ public Result<?> saveInsContext2(@RequestBody InsProductResultDTO insProductResult) {
+ return Result.success(insOrderPlanService.saveInsContext2(insProductResult));
+ }
+
+ @ApiOperation("鏍规嵁璁㈠崟id鏌ヨ鏍峰搧淇℃伅")
+ @GetMapping("/getSampleInfoByOrderId")
+ public Result<?> getSampleInfoByOrderId(@RequestParam Integer id,@RequestParam String sonLaboratory){
+ return Result.success(insOrderPlanService.getSampleInfoByOrderId(id,sonLaboratory));
+ }
+
+
+ @ApiOperation("浠诲姟灞曠ず")
+ @GetMapping("/tasksShow")
+ public Result<?> tasksShow(Page page,String sonLaboratory){
+ return Result.success(insOrderPlanService.tasksShow(page,sonLaboratory));
+ }
+
+ @ApiOperation("鑾峰彇瀛愯瘯楠屽褰撴湀鐨勬�绘楠屼换鍔℃暟閲�")
+ @GetMapping("/getCurrentMonthPlanTotalBySonLaboratory")
+ public Result<?> getCurrentMonthPlanTotalBySonLaboratory(InsOrderPlanCountDTO insOrderPlanCountDTO){
+ return Result.success(insOrderPlanService.getCurrentMonthPlanTotalBySonLaboratory(insOrderPlanCountDTO.getSonLaboratory(),insOrderPlanCountDTO.getStartTime(),insOrderPlanCountDTO.getEndTime()));
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3