checkin2

common/model/checkin.go

@@ -1,5 +1,7 @@
 package model
 
+import "strings"
+
 type Checkin struct {
 	Id         int64
 	CorpId     int64
@@ -13,3 +15,11 @@ type Checkin struct {
 	CreateTime int64
 	UpdateTime int64
 }
+
+func (c *Checkin) IsCheckin() bool {
+	return c.EndTime > 0 && c.StartTime > 0 && c.EndTime > c.StartTime
+}
+
+func (c *Checkin) IsNormal() bool {
+	return strings.Trim(c.Exception, "\r\t\n ") == ""
+}

service/staff_salary.go

@@ -282,7 +282,7 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 {
 			continue
 		}
 
-		if checkin.Exception == "" {
+		if checkin.IsNormal() {
 			realWorkdays += 1
 			continue
 		}
@@ -296,7 +296,7 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 {
 		}
 
 		//其他按工作时长结算
-		if checkin.EndTime > 0 && checkin.StartTime > 0 {
+		if checkin.IsCheckin() {
 			duration := (float64(checkin.EndTime-checkin.StartTime)/float64(3600) - 1.5) / cast.ToFloat64(corp.GetConfig().WorkerHouer) //减去午休的1.5小时
 			realWorkdays += goutil.If(duration > 1, 1, duration)
 		}