From a904aa32e66688ba76c9e4b71b6738b0ba5f5d4f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 25 七月 2024 11:44:09 +0800
Subject: [PATCH] 添加字段，工种添加工种编码，用于计算工资（id无法固定工种信息）
---
controllers/attendance_controller.go | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/controllers/attendance_controller.go b/controllers/attendance_controller.go
index 4a5978d..984b09a 100644
--- a/controllers/attendance_controller.go
+++ b/controllers/attendance_controller.go
@@ -114,6 +114,7 @@
for _, worker := range workers {
if attendance.WorkerId == worker.ID {
attendance.WorkTypeId = worker.WorkTypeId
+ attendance.PhoneNum = worker.PhoneNum
break
}
}
@@ -202,7 +203,7 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- manages, total, err := models.NewAttendanceManageSearch().SetPage(params.Page, params.PageSize).Find()
+ manages, total, err := models.NewAttendanceManageSearch().SetPage(params.Page, params.PageSize).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err)
return
@@ -285,18 +286,27 @@
return
}
//鑾峰彇鏈堜唤澶╂暟
- location, err := time.ParseInLocation("2006-01", "2024-04", time.Local)
+ location, err := time.ParseInLocation("2006-01", params.Month, time.Local)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏈堜唤鏍煎紡閿欒")
return
}
year, month, _ := location.Date()
- date := timex.GetDate(year, month)
+ weeks := timex.GetWeeksOfMonth(year, month)
- manages, err := models.NewAttendanceManageSearch().SetMonth(params.Month).SetPreload(true).FindNotTotal()
+ manages, err := models.NewAttendanceManageSearch().SetMonth(params.Month).SetKeyword(params.Keyword).SetPreload(true).FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err)
return
+ }
+ weekMap := map[string]string{
+ "Sunday": "鍛ㄦ棩",
+ "Monday": "鍛ㄤ竴",
+ "Tuesday": "鍛ㄤ簩",
+ "Wednesday": "鍛ㄤ笁",
+ "Thursday": "鍛ㄥ洓",
+ "Friday": "鍛ㄤ簲",
+ "Saturday": "鍛ㄥ叚",
}
m := make(map[string]response.AttendanceStatistic)
@@ -311,11 +321,14 @@
as.Month = params.Month
as.WorkTypeId = manage.WorkTypeId
var details []response.AttendanceDetail
- for i := 1; i <= date; i++ {
- var ad response.AttendanceDetail
- ad.Date = i
- ad.Status = constvar.Vacation
- details = append(details, ad)
+ for _, week := range weeks {
+ for _, day := range week {
+ var ad response.AttendanceDetail
+ ad.Date = day.Day()
+ ad.WeekDay = weekMap[day.Weekday().String()]
+ ad.Status = constvar.Vacation
+ details = append(details, ad)
+ }
}
as.Details = details
}
--
Gitblit v1.8.0