From 7dcb6f8665db1334940dca300c4b83c6cd81373d Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 23 四月 2024 15:00:44 +0800
Subject: [PATCH] 2024-04-23 印章后端关联实验室
---
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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..3fccae6 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,5 +1,6 @@
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;
@@ -10,6 +11,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
/**
@@ -32,7 +34,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 +52,8 @@
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
@PostMapping("/selectSeal")
public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
- //鑾峰彇褰撳墠椤垫暟
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