From b96e4a05a6e7d85d5a10491dbbecd22158f4e9d1 Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期四, 11 七月 2024 11:04:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/BasJarController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java index 2d8aa66..5af2626 100644 --- a/src/main/java/com/zy/asrs/controller/BasJarController.java +++ b/src/main/java/com/zy/asrs/controller/BasJarController.java @@ -126,7 +126,7 @@ @PostMapping("/table/jar/state") - @ManagerAuth(memo = "RGV淇℃伅琛�") +// @ManagerAuth(memo = "JAR淇℃伅琛�") public R rgvStateTable(){ List<JarStateTableVo> list = new ArrayList<>(); List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no")); @@ -136,12 +136,12 @@ vo.setJarNo(basJar.getJarNo()); // RGV鍙� list.add(vo); - vo.setJarMode(basJar.getJarMode() == 1?"鑱旀満":"鑴辨満" ); // 妯″紡鐘舵�� - vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).desc); // 鐘舵�� + vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵�� + vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc); // 鐘舵�� vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙� vo.setRegion(basJar.getRegion()); vo.setJarCode(basJar.getJarCode()); - vo.setJarErr(basJar.getJarErr()); + vo.setJarErr(basJar.getJarErr$()); } return R.ok().add(list); -- Gitblit v1.9.1