From 54f1d5ed531f609cb3fdbba47cd3a88c0a50d4e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 22:23:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index 75361fa..bb8f517 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -7,11 +7,16 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasJarMast;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.vo.JarMastTableVo;
import com.zy.asrs.service.BasJarMastService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +28,26 @@
@Autowired
private BasJarMastService basJarMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ @RequestMapping(value = "/basJarMast/JatId/auth")
+ @ManagerAuth
+ public R getJatIdList(@RequestParam Integer id){
+ List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id));
+ if (Cools.isEmpty(jarMasts)){
+ return R.error("鏈煡璇㈠埌淇℃伅");
+ }
+ ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+ jarMasts.forEach(jarMast -> {
+ JarMastTableVo jarMastTableVo = new JarMastTableVo();
+ wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
+ wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
+ });
+ return R.ok(jarMastTableVos);
+ }
@RequestMapping(value = "/basJarMast/{id}/auth")
@ManagerAuth
@@ -60,14 +85,14 @@
}
@RequestMapping(value = "/basJarMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板纭寲缃愪綔涓�")
public R add(BasJarMast basJarMast) {
basJarMastService.insert(basJarMast);
return R.ok();
}
@RequestMapping(value = "/basJarMast/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊纭寲缃愪綔涓�")
public R update(BasJarMast basJarMast){
if (Cools.isEmpty(basJarMast) || null==basJarMast.getId()){
return R.error();
@@ -77,7 +102,7 @@
}
@RequestMapping(value = "/basJarMast/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎纭寲缃愪綔涓�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basJarMastService.deleteById(id);
--
Gitblit v1.9.1