From 9c69441b741cb73862c270678296d516b27b5f86 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 18 三月 2024 01:04:51 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 2612e99..dc47e67 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -1,8 +1,17 @@
package com.yuanchu.mom.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.dto.InsOderDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsProductService;
+import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
@@ -12,6 +21,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
import java.util.Map;
@RestController
@@ -21,13 +33,40 @@
private InsOrderService insOrderService;
+ private InsSampleService insSampleService;
+
+ private InsProductService insProductService;
+
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
- System.out.println(1);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InsOrder itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
- return Result.success(insOrderService.selectInsOrderParameter(page, itemParameter));
+ SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
+ return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
+
+ @ApiOperation(value = "妫�楠屼笅鍙�")
+ @PostMapping("/upInsOrder")
+ public Result<?> upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
+ return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
+ }
+
+ @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/addInsOrder")
+ public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(map.get("list")));
+ List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
+ InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
+ return Result.success(insOrderService.addInsOrder(list, insOrder));
+ }
+
+ @ApiOperation(value = "鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿")
+ @PostMapping("/selectOrderManDay")
+ @ValueAuth
+ public Result<?> selectOrderManDay(Integer id) {
+ int day = insProductService.selectOrderManDay(id);
+ return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }
+
}
--
Gitblit v1.9.3