添加字段，工种添加工种编码，用于计算工资（id无法固定工种信息）

yinbentan

2024-07-25 a904aa32e66688ba76c9e4b71b6738b0ba5f5d4f

添加字段，工种添加工种编码，用于计算工资（id无法固定工种信息）

 models/fineness.go

@@ -17,6 +17,7 @@
        WorkshopNumber  string          `gorm:"type:varchar(255);comment:车间编号" json:"workshopNumber" `           // 车间编号
        WorkshopName    string          `gorm:"type:varchar(255);comment:车间名称" json:"workshopName" `             // 车间名称
        WorkshopGroup   int             `gorm:"type:int(11);not null;default:0;comment:车组" json:"workshopGroup"` //车组
        MarketId        uint            `gorm:"type:int(11);comment:庄口ID" json:"marketId"`                       //庄口ID
        MarketNumber    string          `gorm:"size:255;comment:庄口" json:"marketNumber"`                         //庄口编号
        Market          string          `gorm:"type:varchar(255);not null;comment:庄口" json:"market"`             //庄口名称
        Spec            string          `gorm:"type:varchar(255);not null;comment:规格" json:"spec"`               //规格
@@ -101,6 +102,11 @@
    return slf
}

func (slf *FinenessRegisterSearch) SetFinishDate(finishDate string) *FinenessRegisterSearch {
    slf.FinishDate = finishDate
    return slf
}

func (slf *FinenessRegisterSearch) build() *gorm.DB {
    var db = slf.Orm.Table(slf.TableName())

@@ -140,6 +146,10 @@
        db = db.Where("workshop_group = ?", slf.WorkshopGroup)
    }

    if slf.FinishDate != "" {
        db = db.Where("finish_date = ?", slf.FinishDate)
    }

    return db
}


 models/fineness_check.go

@@ -32,6 +32,7 @@
        Orm      *gorm.DB
        Preload  bool
        Keyword  string
        FinenessRegisterIDs []uint
    }
)

@@ -73,6 +74,11 @@
    return slf
}

func (slf *FinenessCheckSearch) SetFinenessRegisterIDs(ids []uint) *FinenessCheckSearch {
    slf.FinenessRegisterIDs = ids
    return slf
}

func (slf *FinenessCheckSearch) SetKeyword(keyword string) *FinenessCheckSearch {
    slf.Keyword = keyword
    return slf
@@ -97,6 +103,10 @@
        db = db.Where("fineness_register_id = ?", slf.FinenessRegisterID)
    }

    if len(slf.FinenessRegisterIDs) != 0 {
        db = db.Where("fineness_register_id in ?", slf.FinenessRegisterIDs)
    }

    if slf.Preload {
        db = db.Model(&FinenessCheck{}).Preload("FinenessRegister")
    }

 models/raw_silk_price_standard.go

@@ -12,6 +12,7 @@
    RawSilkPriceStandard struct {
        gorm.Model
        MarketId     uint            `json:"marketId" gorm:"type:int(11);comment:庄口id"`
        MarketNumber string          `json:"marketNumber" gorm:"type:varchar(255);comment:庄口编码"`
        MarketName   string          `json:"marketName" gorm:"type:varchar(255);comment:庄口名称"`
        RawSilkGrade string          `json:"rawSilkGrade" gorm:"type:varchar(255);comment:生丝等级"`
        PayStandard  decimal.Decimal `json:"payStandard" gorm:"type:decimal(20,3);comment:薪酬标准"`
@@ -56,6 +57,11 @@
    return slf
}

func (slf *RawSilkPriceStandardSearch) SetMarketNumber(marketNumber string) *RawSilkPriceStandardSearch {
    slf.MarketNumber = marketNumber
    return slf
}

func (slf *RawSilkPriceStandardSearch) SetMarketNames(names []string) *RawSilkPriceStandardSearch {
    slf.MarketNames = names
    return slf
@@ -66,6 +72,10 @@

    if slf.ID > 0 {
        db = db.Where("id = ?", slf.ID)
    }

    if len(slf.MarketNumber) > 0 {
        db = db.Where("market_number = ", slf.MarketNumber)
    }

    if len(slf.MarketNames) > 0 {
@@ -105,6 +115,22 @@
    return records, total, nil
}

func (slf *RawSilkPriceStandardSearch) FindNotTotal() ([]*RawSilkPriceStandard, error) {
    var (
        records = make([]*RawSilkPriceStandard, 0)
        db      = slf.build()
    )

    if slf.PageNum*slf.PageSize > 0 {
        db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
    }
    if err := db.Order("updated_at desc").Find(&records).Error; err != nil {
        return records, fmt.Errorf("find records err: %v", err)
    }

    return records, nil
}

func (slf *RawSilkPriceStandardSearch) Save(record *RawSilkPriceStandard) error {
    var db = slf.build()


 models/worker.go

@@ -18,7 +18,8 @@
        ShopName       string                `gorm:"type:varchar(191);comment:车间名称，仅查询用" json:"shopName"`
        Status         constvar.WorkerStatus `gorm:"index;type:int(11);comment:人员状态" json:"status"`
        WorkTypeId     uint                  `gorm:"type:int(11);comment:工种id" json:"workTypeId"`
        WorkType       string                `gorm:"type:varchar(255);comment:工种" json:"workType"`
        WorkTypeCode   constvar.JobType      `gorm:"type:varchar(255);comment:工种代码" json:"workTypeCode"`
        WorkType       string                `gorm:"type:varchar(255);comment:工种名称" json:"workType"`
        GroupNumber    int                   `gorm:"type:int(11);comment:组别" json:"groupNumber"`
        EmploymentTime string                `gorm:"type:varchar(255);comment:入职时间" json:"employmentTime"`
        AddPeople      string                `gorm:"type:varchar(255);comment:添加人" json:"addPeople"`

 models/worker_position.go

@@ -31,6 +31,7 @@
        Keyword              string
        OverlappingDateStart string
        OverlappingDateEnd   string
        WorkerDate           string
    }
)