From 61763cc1a182effa7e5535ac72d54a6a56f029eb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 09:52:41 +0800
Subject: [PATCH] word版审批表，确认表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
index 1962ee3..c810b36 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
@@ -12,7 +12,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.service.MachineImportService;
import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
@@ -64,7 +64,11 @@
@Operation(summary = "淇敼", description = "鏈哄簥淇℃伅")
@PostMapping("/update")
public R<Boolean> update(@RequestBody MachineSaveVO vo) {
- return R.<Boolean>status(service.updateMachine(vo));
+ try{
+ return R.data(service.updateMachine(vo));
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
}
@Operation(summary = "璇︽儏", description = "鏌ヨ鏈哄簥璇︽儏")
@@ -145,7 +149,7 @@
log.error("瀵煎嚭鍒嗘満搴婃ā鏉垮紓甯�", e);
}
}
-
+ /*
@Operation(summary = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�", description = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�")
@PostMapping("/gen-fileback-dirs")
public R<Void> genFileBackDirs(@RequestParam Long id) {
@@ -157,4 +161,5 @@
}
return R.status(true);
}
+ */
}
--
Gitblit v1.9.3