fiee/micro-bundle
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-cjy-taskBanch' into dev

Browse Source
This commit is contained in:
cjy 2025-09-04 19:02:39 +08:00
commit b6dd26f8a3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/dao/taskDao.go
View File

@ -471,18 +471,20 @@ func GetEmployeeAssignedTasks(req *EmployeeTaskQueryRequest) ([]*model.TaskAssig
}
// 指派时间区间
if req.StartTime != "" {
if req.StartTime != "" && req.EndTime != "" {
query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime)
} else if req.StartTime != "" {
query = query.Where("operator_time >= ?", req.StartTime)
}
if req.EndTime != "" {
} else if req.EndTime != "" {
query = query.Where("operator_time <= ?", req.EndTime)
}
// 完成时间区间
if req.StartCompleteTime != "" {
if req.StartCompleteTime != "" && req.EndCompleteTime != "" {
query = query.Where("complete_time BETWEEN ? AND ?", req.StartCompleteTime, req.EndCompleteTime)
} else if req.StartCompleteTime != "" {
query = query.Where("complete_time >= ?", req.StartCompleteTime)
}
if req.EndCompleteTime != "" {
} else if req.EndCompleteTime != "" {
query = query.Where("complete_time <= ?", req.EndCompleteTime)
}
@ -698,10 +700,11 @@ func GetTaskAssignRecordsList(req *TaskAssignRecordsQueryRequest) ([]*model.Task
}
// 操作时间区间
if req.StartTime != "" {
if req.StartTime != "" && req.EndTime != "" {
query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime)
} else if req.StartTime != "" {
query = query.Where("operator_time >= ?", req.StartTime)
}
if req.EndTime != "" {
} else if req.EndTime != "" {
query = query.Where("operator_time <= ?", req.EndTime)
}