作者 陈志颖

fix:员工状态

... ... @@ -442,3 +442,4 @@
BodyData:{}
2020/11/22 14:35:34.993 [D] [server.go:2843] <====Send RequestId:GET./cash-pool/activity/?companyId=311&offset=0&limit=20.1606026934804518000 BodyData:{"code":0,"data":{"activities":[{"activityId":77,"companyId":311,"countDown":1,"createTime":"2020-11-21T01:10:52.822645+08:00","deadline":1606060800000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5},{"activityId":78,"companyId":311,"countDown":1,"createTime":"2020-11-21T01:17:36.794075+08:00","deadline":1606060800000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5},{"activityId":79,"companyId":311,"countDown":1,"createTime":"2020-11-21T01:17:38.434336+08:00","deadline":1606060800000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5},{"activityId":81,"companyId":311,"countDown":2,"createTime":"2020-11-21T02:28:44.157965+08:00","deadline":1606147200000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":65,"exchangedSuMoney":13,"rate":5},{"activityId":83,"companyId":311,"countDown":6,"createTime":"2
2020/11/22 14:35:34.993 [D] [server.go:1925] | 127.0.0.1| 200 | 189.433845ms| match| GET  /cash-pool/activity/ r:/cash-pool/activity/
2020/11/22 15:22:03.137 [I] [???:0] http server Running on http://:8082
... ...
... ... @@ -200,7 +200,13 @@ func (employeeService *EmployeeService) ListEmployee(listEmployeeQuery *query.Li
employeeRepository = value
}
if count, employees, err := employeeRepository.Find(tool_funs.SimpleStructToMap(listEmployeeQuery)); err != nil {
if count, employees, err := employeeRepository.Find(map[string]interface{}{
"companyId": listEmployeeQuery.CompanyId,
"employeeNameMatch": listEmployeeQuery.EmployeeNameMatch,
"offset": listEmployeeQuery.Offset,
"status": 1,
"limit": listEmployeeQuery.Limit,
}); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
} else {
if err := transactionContext.CommitTransaction(); err != nil {
... ...
... ... @@ -80,7 +80,7 @@ func (service *AcceptanceTaskService) Acceptance(taskId int64, operatorUid int64
return nil, err
} else {
if participator == nil {
return nil, fmt.Errorf("无效的参与人: " + participator.EmployeeInfo.EmployeeName)
return nil, fmt.Errorf("无效的参与人")
}
participatorMap[participator.EmployeeInfo.Uid] = participator
participatorInfos = append(participatorInfos, participator.EmployeeInfo)
... ... @@ -111,7 +111,7 @@ func (service *AcceptanceTaskService) Acceptance(taskId int64, operatorUid int64
return nil, err
}
if receiver == nil {
return nil, fmt.Errorf("无效的任务领取者:" + receiver.EmployeeInfo.EmployeeName)
return nil, fmt.Errorf("无效的任务领取者")
}
employee = receiver
} else {
... ...