jobCenterBug

db/job.go

@@ -38,15 +38,17 @@ func DeleteJob(ctx context.Context, job gorm_model.YounggeeJob) error {
 }
 
 // FindJobByEnterpriseId 按商家ID查找岗位信息
-func FindJobByEnterpriseId(ctx context.Context, enterpriseId string) ([]*gorm_model.YounggeeJob, error) {
+func FindJobByEnterpriseId(ctx context.Context, enterpriseId string) ([]*gorm_model.YounggeeJob, int64, error) {
 	db := GetReadDB(ctx)
 	var Jobs []*gorm_model.YounggeeJob
+	var total int64
 	whereCondition := gorm_model.YounggeeJob{EnterpriseId: enterpriseId}
-	err := db.Model(gorm_model.YounggeeJob{}).Where(whereCondition).Find(&Jobs).Error
+	err := db.Model(gorm_model.YounggeeJob{}).Where(whereCondition).Find(&Jobs).Count(&total).Error
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
-	return Jobs, nil
+	// fmt.Println(Jobs)
+	return Jobs, total, nil
 }
 
 // FindJobByJobId 按照岗位Id查找岗位信息

model/http_model/find_all_job.go

@@ -10,8 +10,8 @@ type FindAllJobInfo struct {
 }
 
 type FindAllJobData struct {
-	JobName []*gorm_model.YounggeeJob `json:"sub_account_info"` // 岗位信息
-	Total   int64                     `json:"total"`            // 总数
+	JobInfo []*gorm_model.YounggeeJob `json:"job_info"` // 岗位信息
+	Total   int64                     `json:"total"`    // 总数
 }
 
 func NewFindAllJobRequest() *FindAllJobRequest {

route/init.go

@@ -15,7 +15,7 @@ func InitRoute(r *gin.Engine) {
 	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	business := r.Group("/youngee")
 	{
-		business.POST("/register", handler.WrapRegisterHandler)                   // 商家主账号注册
+		//business.POST("/register", handler.WrapRegisterHandler)                   // 商家主账号注册
 		business.POST("/addNewSubAccount", handler.WrapAddNewSubAccountHandler)   // 商家子账号注册
 		business.POST("/findAllSubAccount", handler.WrapFindAllSubAccountHandler) // 查找商家全部所属子账号
 		business.POST("/findAllJob", handler.WrapFindAllJobHandler)               // 查找商家全部所属岗位

service/job.go

@@ -65,12 +65,17 @@ func (*job) DeleteJob(ctx context.Context, request http_model.DeleteJobRequest)
 func (*job) FindJobByEnterpriseId(ctx context.Context, request http_model.FindAllJobRequest) (*http_model.FindAllJobData, error) {
 	var jobNameData *http_model.FindAllJobData
 	jobNameData = &http_model.FindAllJobData{}
-	jobInfo, jobErr := db.FindJobByEnterpriseId(ctx, request.EnterpriseId)
+	jobInfo, total, jobErr := db.FindJobByEnterpriseId(ctx, request.EnterpriseId)
 	if jobErr != nil {
 		return nil, jobErr
 	}
 	if jobInfo != nil {
-		jobNameData.JobName = jobInfo
+		for _, job := range jobInfo {
+			jobNameData.JobInfo = append(jobNameData.JobInfo, job)
+		}
+		jobNameData.Total = total
+	} else {
+		jobNameData.Total = 0
 	}
-	return nil, nil
+	return jobNameData, nil
 }