From 3d0b0140ee304ef6fb435fea5a9080ba637c6620 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 04 十二月 2023 19:41:44 +0800
Subject: [PATCH] 优化
---
service/report_work.go | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/service/report_work.go b/service/report_work.go
index 4a9db04..ea25a57 100644
--- a/service/report_work.go
+++ b/service/report_work.go
@@ -33,17 +33,12 @@
for _, worker := range procedure.ProceduresInfo.Workers {
if params.WorkerID == worker.WorkerID {
workerName = worker.WorkerName
- if worker.StartTime < nowTs {
- startTs = worker.StartTime
- }
}
}
if workerName == "" {
return errors.New("娌℃湁鎵惧埌褰撳墠鍊肩彮浜哄憳")
}
- if startTs == 0 {
- return errors.New("娌℃湁鎵惧埌褰撳墠鍊肩彮浜哄憳寮�濮嬫椂闂�")
- }
+
finishAmount := params.ReportAmount
lastReportWork, err := GetLastReportWork(params.ProcedureId)
if err == nil {
@@ -52,6 +47,8 @@
}
finishAmount = params.ReportAmount - lastReportWork.ReportAmount
startTs = lastReportWork.EndTime
+ } else {
+ startTs = procedure.RealStartTime
}
record := &model.ReportWork{
@@ -95,7 +92,7 @@
return err
}
- err = NewProgressService().UpdateProgressByProceduresId(procedure.ID, int64(params.ReportAmount))
+ err = NewProgressService().UpdateProgressByProceduresId(procedure.ID, params.ReportAmount)
return nil
}
--
Gitblit v1.8.0