From 71a860affbf97e7be13a2059b6cb001bfd368adb Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 28 四月 2024 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
index d406559..8ac9dfd 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -1,15 +1,16 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
/**
@@ -32,7 +33,15 @@
@ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟")
@PostMapping("/addSeal")
public Result addSeal(@RequestBody Seal seal) {
- return Result.success(sealService.addSeal(seal));
+ int i = sealService.addSeal(seal);
+ if(i>0){
+ Integer labId = seal.getLabId();
+ List<Laboratory> laboratory = sealService.Laboratory(labId);
+ return Result.success(laboratory);
+ }else{
+ return Result.fail();
+ }
+
}
@ApiOperation(value = "淇敼鍗扮珷鍙傛暟")
@PostMapping("/upSeal")
@@ -42,11 +51,10 @@
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
@PostMapping("/selectSeal")
public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
- //鑾峰彇褰撳墠椤垫暟
+ System.out.println(data);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- //鑾峰彇褰撳墠鍗扮珷淇℃伅
Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
- //鑾峰彇鍒嗛〉鏁版嵁
return Result.success(sealService.selectSeal(page,seal));
+
}
}
--
Gitblit v1.9.3