From 45911c561e52453391f72726157bec7134fc8a82 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 16 四月 2024 11:11:54 +0800
Subject: [PATCH] 报工数量改成非必传
---
service/report_work.go | 11 +++++------
model/request/common.go | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/model/request/common.go b/model/request/common.go
index 49f61b6..26ac8b1 100644
--- a/model/request/common.go
+++ b/model/request/common.go
@@ -16,7 +16,7 @@
type ReportWork struct {
ProcedureId uint `json:"procedureId,string" binding:"required"` //宸ュ簭id
ReportAmount int `json:"reportAmount" binding:"required"` //鎶ュ伐鏁伴噺
- WorkerID string `json:"workerID" binding:"required"` //鎶ュ憡鑰卛d
+ WorkerID string `json:"workerID"` //鎶ュ憡鑰卛d
}
type ReportWorkList struct {
diff --git a/service/report_work.go b/service/report_work.go
index 4d7a0cb..99d7a82 100644
--- a/service/report_work.go
+++ b/service/report_work.go
@@ -31,13 +31,12 @@
nowTs := time.Now().Unix()
var startTs int64
var workerName string
- for _, worker := range procedure.ProceduresInfo.Workers {
- if params.WorkerID == worker.WorkerID {
- workerName = worker.WorkerName
+ if params.WorkerID != "" {
+ for _, worker := range procedure.ProceduresInfo.Workers {
+ if params.WorkerID == worker.WorkerID {
+ workerName = worker.WorkerName
+ }
}
- }
- if workerName == "" {
- return errors.New("娌℃湁鎵惧埌褰撳墠鍊肩彮浜哄憳")
}
finishAmount := params.ReportAmount
--
Gitblit v1.8.0