From 28addaa46cb97c20ad37e13eb10535de7b75e71c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 19:29:43 +0800
Subject: [PATCH] 首次报工开始时间为工序开始时间
---
utils/cmd.go | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/utils/cmd.go b/utils/cmd.go
index 018f63a..cbce3c6 100644
--- a/utils/cmd.go
+++ b/utils/cmd.go
@@ -6,13 +6,9 @@
"os/exec"
)
-func Cmd(directory, script string) error {
+func Cmd(script string) error {
// 鍒涘缓涓�涓墽琛屽懡浠ょ殑瀵硅薄
- cmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("cd %s && %s", directory, script))
-
- // 璁剧疆鍛戒护鐨勫伐浣滅洰褰�
- cmd.Dir = directory
-
+ cmd := exec.Command("/bin/bash", "-c", script)
// 灏嗗懡浠ょ殑杈撳嚭杩炴帴鍒板綋鍓嶈繘绋嬬殑杈撳嚭
cmd.Stderr = os.Stderr
@@ -30,3 +26,17 @@
}
return nil
}
+
+func Exec(command string) (outputStr string, err error) {
+ cmd := exec.Command(command)
+
+ // 鎹曡幏鍛戒护鐨勮緭鍑�
+ output, err := cmd.Output()
+ if err != nil {
+ return "", fmt.Errorf("鍛戒护鎵ц澶辫触: %v", err)
+ }
+
+ // 灏嗚緭鍑鸿浆鎹负瀛楃涓�
+ outputStr = string(output)
+ return
+}
--
Gitblit v1.8.0