bug_0620

db/s_local_life.go

@@ -228,6 +228,7 @@ func UpdateSLocal(ctx context.Context, sLocalInfo *gorm_model.YounggeeSLocalLife
 		StrategyStatus:     sLocalInfo.StrategyStatus,
 		CreateStrategyType: sLocalInfo.CreateStrategyType,
 		CreateStrategyId:   sLocalInfo.CreateStrategyId,
+		AgreeTime:          sLocalInfo.AgreeTime,
 	}
 	err := db.Model(&gorm_model.YounggeeSLocalLifeInfo{}).Where(whereCondition).Updates(sLocal).Error
 	if err != nil {

db/s_project.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/sirupsen/logrus"
 	"reflect"
+	"time"
 	"youngee_b_api/model/common_model"
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
@@ -123,11 +124,14 @@ func UpdateSProjectStatus(ctx context.Context, newSProject *http_model.SpecialSP
 	} else {
 		operatorType = 2
 	}
+	var currentTime time.Time
+	currentTime = time.Now()
 	whereCondition := gorm_model.SProjectInfo{SProjectId: newSProject.SProjectId}
 	sProjectInfo := gorm_model.SProjectInfo{
 		SProjectStatus: newSProject.SProjectStatus,
 		SubAccountId:   newSProject.SubAccountId,
 		OperatorType:   operatorType,
+		AgreeTime:      &currentTime,
 	}
 	err := db.Model(&gorm_model.SProjectInfo{}).Where(whereCondition).Updates(sProjectInfo).Error
 	if err != nil {

service/cooperate.go

@@ -20,7 +20,7 @@ func (*cooperate) GetEnterpriseInfoBySupplierId(ctx context.Context, request *ht
 	enterpriseListData = &http_model.EnterpriseListData{}
 
 	// 1. 根据服务商ID和合作状态查找信息
-	enterpriseListInfo, total, enterpriseListInfoErr := db.GetCooperateInfoByIds(ctx, request.SupplierId, request.CooperateStatus, request.PageSize, request.PageNum)
+	enterpriseListInfo, total, enterpriseListInfoErr := db.GetCooperateInfoByIds(ctx, request.SupplierId, request.CooperateStatus, request.PageSize, request.PageNum-1)
 	if enterpriseListInfoErr != nil {
 		return nil, enterpriseListInfoErr
 	}

service/s_local_life.go

@@ -60,6 +60,7 @@ func (*sLocalLife) CreateSLocalLife(ctx context.Context, request *http_model.Loc
 		sLocalLifeInfo.OperatorType = operatorType
 		currTime := time.Now()
 		sLocalLifeInfo.CreateTime = &currTime
+		sLocalLifeInfo.AgreeTime = &currTime
 
 		// 2. 入库
 		sLocalId, createErr := db.CreateSLocalLife(ctx, sLocalLifeInfo)
@@ -485,12 +486,15 @@ func (*sLocalLife) ChangeSupplierStatus(ctx context.Context, req *http_model.Spe
 	} else {
 		operatorType = 2
 	}
+	var currTime time.Time
+	currTime = time.Now()
 	sLocalInfo.SLocalId = req.SLocalId
 	sLocalInfo.SupplierId = req.SupplierId
 	sLocalInfo.SubAccountId = req.SubAccountId
 	sLocalInfo.OperatorType = operatorType
 	sLocalInfo.SLocalStatus = req.SLocalStatus
-	fmt.Println("data: ", sLocalInfo)
+	sLocalInfo.AgreeTime = &currTime
+	// fmt.Println("data: ", sLocalInfo)
 	err := db.UpdateSLocal(ctx, sLocalInfo)
 	if err != nil {
 		return err

service/s_project.go

@@ -54,6 +54,7 @@ func (*sProject) CreateSProject(ctx context.Context, request http_model.AddToLis
 		newSProject.ProjectType = 1
 		newSProject.ProductId = projectInfo.ProductID
 		newSProject.ProjectName = projectInfo.ProjectName
+		newSProject.AgreeTime = &currentTime
 	}
 	sProjectId, err := db.CreateSProject(ctx, newSProject)
 	if err != nil {
@@ -495,7 +496,7 @@ func (*sProject) GetSpecialSProjectList(ctx context.Context, supplierId int, pag
 			currSpecialProject.RecruitNum = specialProject.RecruitNum
 			currSpecialProject.SettleNum = specialProject.SettleNum
 			currSpecialProject.CreateTime = conv.MustString(specialProject.CreateTime)[0:19]
-			if specialProject.SProjectStatus == 2 {
+			if specialProject.SProjectStatus == 2 && specialProject.AgreeTime != nil {
 				currSpecialProject.AgreeTime = conv.MustString(specialProject.AgreeTime)[0:19]
 			}