Merge branch 'dev' into test

@@ -2,10 +2,11 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"github.com/beego/beego/v2/core/validation"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
+
+	"github.com/beego/beego/v2/core/validation"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
 )
 )
 
 
 type CreateAttendanceCommand struct {
 type CreateAttendanceCommand struct {
@@ -14,7 +15,7 @@ type CreateAttendanceCommand struct {
 	// 考勤类型 1.正常 2.支援
 	// 考勤类型 1.正常 2.支援
 	AttendanceType int `cname:"考勤类型" json:"attendanceType,omitempty"`
 	AttendanceType int `cname:"考勤类型" json:"attendanceType,omitempty"`
 	// 生产班组Id
 	// 生产班组Id
-	ProductGroupId int `cname:"生产班组Id" json:"productGroupId,omitempty" valid:"Required"`
+	// ProductGroupId int `cname:"生产班组Id" json:"productGroupId,omitempty" valid:"Required"`
 	// 生产工人
 	// 生产工人
 	ProductWorkerId int `cname:"生产工人" json:"productWorkerId,omitempty" valid:"Required"`
 	ProductWorkerId int `cname:"生产工人" json:"productWorkerId,omitempty" valid:"Required"`
 	// 车间ID
 	// 车间ID

@@ -105,11 +105,11 @@ func (attendanceService *AttendanceService) CreateAttendance(operateInfo *domain
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
 
 
-	var productGroup *domain.ProductGroup
-	_, productGroup, err = factory.FastPgProductGroup(transactionContext, cmd.ProductGroupId)
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
+	// var productGroup *domain.ProductGroup
+	// _, productGroup, err = factory.FastPgProductGroup(transactionContext, cmd.ProductGroupId)
+	// if err != nil {
+	// 	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	// }
 
 
 	//var workTime float64 = 0
 	//var workTime float64 = 0
 	//if cmd.WorkTime-cmd.BreakTime > 0 {
 	//if cmd.WorkTime-cmd.BreakTime > 0 {
@@ -145,9 +145,9 @@ func (attendanceService *AttendanceService) CreateAttendance(operateInfo *domain
 		CreatedAt:        time.Now(),
 		CreatedAt:        time.Now(),
 		UpdatedAt:        time.Now(),
 		UpdatedAt:        time.Now(),
 		Ext: domain.NewExt(org.OrgName).WithAttendanceExt(&domain.ProductAttendanceRecordExt{
 		Ext: domain.NewExt(org.OrgName).WithAttendanceExt(&domain.ProductAttendanceRecordExt{
-			GroupName:      productGroup.GroupName,
-			ProductGroupId: productGroup.ProductGroupId,
-			BreakTime:      cmd.BreakTime,
+			// GroupName:      productGroup.GroupName,
+			// ProductGroupId: productGroup.ProductGroupId,
+			BreakTime: cmd.BreakTime,
 		}),
 		}),
 		ProductDate: productDate,
 		ProductDate: productDate,
 	}
 	}