From 53e4d678884036a7177d015f034968e5d09d1e3c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:59:55 +0800
Subject: [PATCH] 完成数量等于本次报工数量-上次报工数量
---
model/report_work.go | 1 +
service/report_work.go | 6 ++++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/model/report_work.go b/model/report_work.go
index 7a297cc..7ccff11 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -18,6 +18,7 @@
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
ReportAmount int `json:"reportAmount"` //鎶ュ伐鏁伴噺
+ FinishAmount int `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
}
diff --git a/service/report_work.go b/service/report_work.go
index cf8deb4..308e97e 100644
--- a/service/report_work.go
+++ b/service/report_work.go
@@ -40,6 +40,11 @@
if startTs == 0 {
return errors.New("娌℃湁鎵惧埌褰撳墠鍊肩彮浜哄憳寮�濮嬫椂闂�")
}
+ finishAmount := params.ReportAmount
+ lastReportWork, err := GetLastReportWork(params.ProcedureId)
+ if err == nil {
+ finishAmount = params.ReportAmount - lastReportWork.ReportAmount
+ }
record := &model.ReportWork{
ProceduresID: params.ProcedureId,
@@ -51,6 +56,7 @@
StartTime: startTs,
EndTime: nowTs,
ReportAmount: params.ReportAmount,
+ FinishAmount: finishAmount,
WorkerID: params.WorkerID,
WorkerName: workerName,
}
--
Gitblit v1.8.0