From b331c9990a0396301e934daffe095f99d62d1c89 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 15:58:49 +0800
Subject: [PATCH] 任务获取修改，状态2只返回已开始和已结束的
---
model/plc_brand.go | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/model/plc_brand.go b/model/plc_brand.go
index a91bf44..4bf7bff 100644
--- a/model/plc_brand.go
+++ b/model/plc_brand.go
@@ -6,6 +6,7 @@
"errors"
"fmt"
"gorm.io/gorm"
+ "sync"
)
type (
@@ -129,17 +130,28 @@
}
// InitDefaultData 鍒濆鍖栨暟鎹�
-func (slf *PlcBrandSearch) InitDefaultData() error {
+func (slf *PlcBrandSearch) InitDefaultData(errCh chan<- error, wg *sync.WaitGroup) {
var (
db = slf.Orm.Table(slf.TableName())
total int64 = 0
)
+ defer wg.Done()
+
if err := db.Count(&total).Error; err != nil {
- return err
+ errCh <- err
+ return
}
if total != 0 {
- return nil
+ return
}
- records := []*PlcBrand{}
- return slf.CreateBatch(records)
+ records := []*PlcBrand{
+ {1, "娆у榫�"},
+ {2, "瑗块棬瀛�"},
+ {3, "鏉句笅"},
+ }
+ err := slf.CreateBatch(records)
+ if err != nil {
+ errCh <- err
+ return
+ }
}
--
Gitblit v1.8.0