feat:更新参标阶段调整

jyBXCore/rpc/internal/logic/updatebidstatuslogic.go

@@ -4,6 +4,7 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"jyBXCore/rpc/model/es"
+	"jyBXCore/rpc/model/mysql"
 	"jyBXCore/rpc/service"
 	"jyBXCore/rpc/util"
 	"time"
@@ -74,7 +75,10 @@ func (l *UpdateBidStatusLogic) UpdateBidStatus(in *bxcore.UpdateBidStatusReq) (*
 	// 2. 更新
 	if err := participateService.UpdateBidStatus(in, projectId); err != nil {
 		result.ErrMsg = err.Error()
-	} else {
+	} else if in.PositionType > 0 {
+		// p408 增加
+		mysql.NewParStage(in.EntId, projectId, "").UpdateStage()
+
 		result.Data = true
 		result.ErrCode = 0
 	}

jyBXCore/rpc/model/mysql/participateBid.go

@@ -43,6 +43,11 @@ var (
 	ParticipateStage           = "participate_stage_statistics" //阶段信息
 )
 
+type PostionIdEntUserId struct {
+	PositionId int64
+	EntUserId  int64
+}
+
 // 划转参标信息
 func TransferParticipateInfo(projectId string, in *bxcore.ParticipateActionReq) error {
 	defer MC.Catch()
@@ -179,6 +184,9 @@ func CancelParticipateInfo(in *bxcore.ParticipateActionReq, roleId int64) error
 		if roleId == 0 {
 			query["position_id"] = in.PositionId
 			tip = "终止参标"
+
+		} else {
+
 		}
 		insert := map[string]interface{}{
 			"state":       -1,

jyBXCore/rpc/service/participateStage.go → jyBXCore/rpc/model/mysql/participateStage.go

@@ -1,4 +1,4 @@
-package service
+package mysql
 
 import (
 	"app.yhyue.com/moapp/jybase/date"
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	IC "jyBXCore/rpc/init"
-	"jyBXCore/rpc/model/mysql"
 	"jyBXCore/rpc/util"
 	"strings"
 	"time"
@@ -20,13 +19,11 @@ type ParStage struct {
 	Stage      string //参标、终止参标（划转没有记录）
 }
 
-func NewParStage(entId, entUserId, positionId int64, projectId, stage string) *ParStage {
+func NewParStage(entId int64, projectId, stage string) *ParStage {
 	return &ParStage{
-		EntId:      entId,
-		EntUserId:  entUserId,
-		PositionId: positionId,
-		ProjectId:  projectId,
-		Stage:      stage,
+		EntId:     entId,
+		ProjectId: projectId,
+		Stage:     stage,
 	}
 }
 
@@ -34,10 +31,8 @@ func (p *ParStage) UpdateStage() {
 	var (
 		recordsMap      = map[string]string{}
 		updateInsertMap = map[string]interface{}{
-			"ent_id":      p.EntId,
-			"ent_user_id": p.EntUserId,
-			"position_id": p.PositionId,
-			"project_id":  p.ProjectId,
+			"ent_id":     p.EntId,
+			"project_id": p.ProjectId,
 		}
 		now        = time.Now()
 		createDate string
@@ -95,19 +90,19 @@ func (p *ParStage) UpdateStage() {
 			return
 		}
 		updateInsertMap["stage"] = string(jsonData)
-		if c := IC.BaseMysql.Count(mysql.ParticipateStage, map[string]interface{}{
-			"position_id": p.PositionId,
-			"project_id":  p.ProjectId,
+		if c := IC.BaseMysql.Count(ParticipateStage, map[string]interface{}{
+			"ent_id":     p.EntId,
+			"project_id": p.ProjectId,
 		}); c > 0 {
 			updateInsertMap["update_date"] = createDate
-			IC.BaseMysql.UpdateOrDeleteBySql(mysql.ParticipateStage, map[string]interface{}{
-				"position_id": p.PositionId,
-				"project_id":  p.ProjectId,
+			IC.BaseMysql.UpdateOrDeleteBySql(ParticipateStage, map[string]interface{}{
+				"ent_id":     p.EntId,
+				"project_id": p.ProjectId,
 			}, updateInsertMap)
 		} else {
 			updateInsertMap["create_date"] = date.FormatDate(&now, date.Date_Full_Layout)
 			updateInsertMap["update_date"] = createDate
-			IC.BaseMysql.Insert(mysql.ParticipateStage, updateInsertMap)
+			IC.BaseMysql.Insert(ParticipateStage, updateInsertMap)
 		}
 	}
 }

jyBXCore/rpc/service/participate.go

@@ -94,6 +94,11 @@ func ParticipateDo(in *bxcore.ParticipateActionReq) error {
 		if err := mysql.SaveParticipateInfo(in); err != nil {
 			return err
 		}
+		if in.PositionType > 0 {
+			// p408 增加
+			go mysql.NewParStage(in.EntId, in.ProjectIds, "参标").UpdateStage()
+		}
+
 	case "out": //终止参标
 		if in.BidIds == "" && in.ProjectIds == "" {
 			return fmt.Errorf("缺少参数")
@@ -104,6 +109,11 @@ func ParticipateDo(in *bxcore.ParticipateActionReq) error {
 		if err := mysql.CancelParticipateInfo(in, entRoleId); err != nil {
 			return err
 		}
+		if in.PositionType > 0 {
+			// p408 增加
+			go mysql.NewParStage(in.EntId, in.ProjectIds, "终止参标").UpdateStage()
+
+		}
 	case "transfer":
 		//PC端 多个项目-》一个人
 		//移动端  一个项目-》多个人