同步企业端修改内容

db/data.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"time"
@@ -13,6 +11,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 // GetTaskDataList 查询上传链接的task list
@@ -41,17 +42,8 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -127,6 +119,8 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 			newTaskDatas = append(newTaskDatas, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskDatas = append(newTaskDatas, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskDatas = append(newTaskDatas, v)
 		} else {
 			totalTask--
 		}

db/default.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"youngee_m_api/consts"
@@ -13,6 +11,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 func CountDefaultNum(ctx context.Context) (error, *http_model.CountNumOfDefaultsResponse) {
@@ -406,23 +407,12 @@ func GetTaskDefaultReviewList(ctx context.Context, projectID string, pageSize, p
 				db = db.Where("cur_default_type = 5")
 			}
 			continue
-		}
-		if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
+		} else if !util.IsBlank(value) {
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -491,6 +481,8 @@ func GetTaskDefaultReviewList(ctx context.Context, projectID string, pageSize, p
 			newTaskDefaultReviews = append(newTaskDefaultReviews, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskDefaultReviews = append(newTaskDefaultReviews, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskDefaultReviews = append(newTaskDefaultReviews, v)
 		} else {
 			totalTask--
 		}
@@ -516,21 +508,11 @@ func GetTaskDefaultDataList(ctx context.Context, projectID string, pageSize, pag
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -605,6 +587,8 @@ func GetTaskDefaultDataList(ctx context.Context, projectID string, pageSize, pag
 			newTaskDefaultDatas = append(newTaskDefaultDatas, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskDefaultDatas = append(newTaskDefaultDatas, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskDefaultDatas = append(newTaskDefaultDatas, v)
 		} else {
 			totalTask--
 		}
@@ -652,21 +636,11 @@ func GetTaskTerminatingList(ctx context.Context, projectID string, pageSize, pag
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
-				db1 = db1.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db1 = db1.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db1 = db1.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
+			} else if tag == "project_id" || tag == "strategy_id" {
+				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 			}
 		}
 	}
@@ -722,6 +696,8 @@ func GetTaskTerminatingList(ctx context.Context, projectID string, pageSize, pag
 			newTaskTerminatings = append(newTaskTerminatings, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskTerminatings = append(newTaskTerminatings, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskTerminatings = append(newTaskTerminatings, v)
 		} else {
 			totalTask--
 		}
@@ -748,21 +724,11 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -838,6 +804,8 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 			newTaskTerminateds = append(newTaskTerminateds, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskTerminateds = append(newTaskTerminateds, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskTerminateds = append(newTaskTerminateds, v)
 		} else {
 			totalTask--
 		}

db/finish.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"youngee_m_api/model/common_model"
@@ -12,6 +10,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 func GetTaskFinishList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskFinishInfo, int64, error) {
@@ -27,21 +28,11 @@ func GetTaskFinishList(ctx context.Context, projectID string, pageSize, pageNum
 		tag := field.Tag.Get("condition")
 		value := conditionValue.FieldByName(field.Name)
 		if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -123,6 +114,8 @@ func GetTaskFinishList(ctx context.Context, projectID string, pageSize, pageNum
 			newTaskFinishs = append(newTaskFinishs, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskFinishs = append(newTaskFinishs, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskFinishs = append(newTaskFinishs, v)
 		} else {
 			totalTask--
 		}

db/link.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"time"
@@ -13,6 +11,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 // GetTaskLinkList 查询上传链接的task list
@@ -37,21 +38,11 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 			}
 			continue
 		} else if !util.IsBlank(value) {
-			logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -119,6 +110,8 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 			newTaskLinks = append(newTaskLinks, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskLinks = append(newTaskLinks, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskLinks = append(newTaskLinks, v)
 		} else {
 			totalTask--
 		}

db/logistics.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"time"
@@ -13,6 +11,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 //新增
@@ -63,24 +64,15 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 		tag := field.Tag.Get("condition")
 		value := conditionValue.FieldByName(field.Name)
 		if !util.IsBlank(value) {
-			//logrus.Println("tag: ", tag)
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
-				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
 			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
+				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 			}
 		}
 	}
+
 	var taskInfos []gorm_model.YoungeeTaskInfo
 	db = db.Model(gorm_model.YoungeeTaskInfo{})
 	// 查询总数
@@ -98,22 +90,11 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 		taskIds = append(taskIds, taskInfo.TaskId)
 		taskMap[taskInfo.TaskId] = taskInfo
 	}
-	db1 := GetReadDB(ctx)
-	db1 = db1.Debug().Model(gorm_model.YoungeeTaskLogistics{})
 
-	// 根据Project条件过滤
-	conditionType2 := reflect.TypeOf(conditions).Elem()
-	conditionValue2 := reflect.ValueOf(conditions).Elem()
-	for i := 0; i < conditionType2.NumField(); i++ {
-		field := conditionType2.Field(i)
-		tag := field.Tag.Get("condition")
-		value := conditionValue2.FieldByName(field.Name)
-		//fmt.Printf("过滤展示 %+v %+v \n", value, tag)
-		if !util.IsBlank(value) && tag == "platform_nickname" { // input:1		taskIdsbase:1,2,3    string
-			db1 = db1.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-		}
-	}
+	// 查询物流信息
 	var logisticsInfos []gorm_model.YoungeeTaskLogistics
+	db1 := GetReadDB(ctx)
+	db1 = db1.Debug().Model(gorm_model.YoungeeTaskLogistics{})
 	db1 = db1.Model(gorm_model.YoungeeTaskLogistics{}).Where("task_id IN ?", taskIds).Find(&logisticsInfos)
 	logisticsMap := make(map[int]gorm_model.YoungeeTaskLogistics)
 	for _, logisticsInfo := range logisticsInfos {
@@ -137,7 +118,7 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 
 	var TaskLogisticss []*http_model.TaskLogistics
 	var taskLogisticss []*http_model.TaskLogisticsInfo
-	var newTaskLinks []*http_model.TaskLogisticsInfo
+	var newTaskLogisticss []*http_model.TaskLogisticsInfo
 	for _, taskId := range taskIds {
 		TaskLogistics := new(http_model.TaskLogistics)
 		TaskLogistics.Talent = taskMap[taskId]
@@ -149,15 +130,16 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 
 	for _, v := range taskLogisticss {
 		if platform_nickname == "" {
-			newTaskLinks = append(newTaskLinks, v)
+			newTaskLogisticss = append(newTaskLogisticss, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
-			newTaskLinks = append(newTaskLinks, v)
+			newTaskLogisticss = append(newTaskLogisticss, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskLogisticss = append(newTaskLogisticss, v)
 		} else {
 			totalTask--
 		}
 	}
-	// return fulltaskLogisticss, total, nil
-	return newTaskLinks, totalTask, nil
+	return newTaskLogisticss, totalTask, nil
 }
 
 // 修改任务表的物流状态

db/script.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"time"
@@ -13,6 +11,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 // GetTaskScriptList 查询上传脚本的task list
@@ -36,25 +37,16 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 				db = db.Where("task_stage > ?", 8)
 			}
 			continue
-		}
-		if !util.IsBlank(value) {
+		} else if !util.IsBlank(value) {
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
+
 	var taskInfos []gorm_model.YoungeeTaskInfo
 	db = db.Model(gorm_model.YoungeeTaskInfo{})
 	// 查询总数
@@ -119,6 +111,8 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 			newTaskScripts = append(newTaskScripts, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskScripts = append(newTaskScripts, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskScripts = append(newTaskScripts, v)
 		} else {
 			totalTask--
 		}

db/sketch.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"reflect"
 	"strings"
 	"time"
@@ -13,6 +11,9 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 // GetTaskSketchList 查询上传初稿的task list
@@ -40,17 +41,8 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 			if tag == "platform_nickname" {
 				platform_nickname = fmt.Sprintf("%v", value.Interface())
 				continue
-			} else if tag == "project_id" {
+			} else if tag == "project_id" || tag == "strategy_id" {
 				db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
-			} else if tag == "strategy_ids" {
-				strategyIds := strings.Split(fmt.Sprintf("%v", value.Interface()), ",")
-				var strategyIdList []int
-				for _, strategyId := range strategyIds {
-					strategyIdList = append(strategyIdList, conv.MustInt(strategyId, 0))
-				}
-				db = db.Where("strategy_id in ?", strategyIdList)
-			} else {
-				db = db.Where(fmt.Sprintf("%s like '%%%v%%'", tag, value.Interface()))
 			}
 		}
 	}
@@ -128,6 +120,8 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 			newTaskSketches = append(newTaskSketches, v)
 		} else if strings.Contains(v.PlatformNickname, platform_nickname) {
 			newTaskSketches = append(newTaskSketches, v)
+		} else if strings.Contains(conv.MustString(v.TaskID, ""), platform_nickname) {
+			newTaskSketches = append(newTaskSketches, v)
 		} else {
 			totalTask--
 		}

handler/logistics_number_info.go

@@ -0,0 +1,59 @@
+package handler
+
+import (
+	"youngee_m_api/consts"
+	"youngee_m_api/model/http_model"
+	"youngee_m_api/service"
+	"youngee_m_api/util"
+
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
+)
+
+func WrapGetLogisticsNumberInfoHandler(ctx *gin.Context) {
+	handler := newGetLogisticsNumberInfoHandler(ctx)
+	BaseRun(handler)
+}
+
+func newGetLogisticsNumberInfoHandler(ctx *gin.Context) *GetLogisticsNumberInfoHandler {
+	return &GetLogisticsNumberInfoHandler{
+		req:  http_model.NewGetLogisticsNumberInfoRequest(),
+		resp: http_model.NewGetLogisticsNumberInfoResponse(),
+		ctx:  ctx,
+	}
+}
+
+type GetLogisticsNumberInfoHandler struct {
+	req  *http_model.GetLogisticsNumberInfoRequest
+	resp *http_model.CommonResponse
+	ctx  *gin.Context
+}
+
+func (h *GetLogisticsNumberInfoHandler) getRequest() interface{} {
+	return h.req
+}
+func (h *GetLogisticsNumberInfoHandler) getContext() *gin.Context {
+	return h.ctx
+}
+func (h *GetLogisticsNumberInfoHandler) getResponse() interface{} {
+	return h.resp
+}
+
+func (h *GetLogisticsNumberInfoHandler) run() {
+	data := http_model.GetLogisticsNumberInfoRequest{}
+	data = *h.req
+	res, err := service.Number.GetLogisticsNumberInfo(h.ctx, data)
+	if err != nil {
+		logrus.Errorf("[GetLogisticsNumberInfoHandler] call GetLogisticsNumberInfo err:%+v\n", err)
+		util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, "")
+		log.Info("GetLogisticsNumberInfo fail,req:%+v", h.req)
+		return
+	}
+	h.resp.Message = ""
+	h.resp.Data = res
+}
+
+func (h *GetLogisticsNumberInfoHandler) checkParam() error {
+	return nil
+}

handler/project_update.go

@@ -1,13 +1,14 @@
 package handler
 
 import (
-	"github.com/caixw/lib.go/conv"
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
 )
 
 func WrapUpdateProjectHandler(ctx *gin.Context) {
@@ -48,7 +49,7 @@ func (h *UpdateProjectHandler) run() {
 		logrus.Info("UpdateProject fail,req:%+v", h.req)
 		return
 	}
-	//h.resp.Message = "项目更新成功"
+	h.resp.Message = "项目更新成功"
 	h.resp.Data = res
 }
 

handler/task_data_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,10 +63,10 @@ func (h *TaskDataListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DataStatus = util.IsNull(h.req.DataStatus)
 	if _, err := conv.Int64(h.req.DataStatus); err != nil {
 		errs = append(errs, err)

handler/task_default_data_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,6 +63,10 @@ func (h *TaskDefaultDataListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

handler/task_default_review_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,6 +63,10 @@ func (h *TaskDefaultReviewListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

handler/task_finish_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )

handler/task_link_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,10 +63,10 @@ func (h *TaskLinkListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.LinkStatus = util.IsNull(h.req.LinkStatus)
 	if _, err := conv.Int64(h.req.LinkStatus); err != nil {
 		errs = append(errs, err)

handler/task_logistics_list.go

@@ -9,6 +9,7 @@ import (
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -57,18 +58,18 @@ func (h *TaskLogisticsListHandler) checkParam() error {
 		errs = append(errs, errors.New("page param error"))
 	}
 	h.req.PageNum--
-	//h.req.ProjectId = util.IsNull(h.req.ProjectId)
-	//if _, err := conv.Int64(h.req.ProjectId); err != nil {
-	//	errs = append(errs, err)
-	//}
-	//h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	//if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	//	errs = append(errs, err)
-	//}
-	//h.req.LogisticsStatus = util.IsNull(h.req.LogisticsStatus)
-	//if _, err := conv.Int64(h.req.LogisticsStatus); err != nil {
-	//	errs = append(errs, err)
-	//}
+	h.req.ProjectId = util.IsNull(h.req.ProjectId)
+	if _, err := conv.Int64(h.req.ProjectId); err != nil {
+		errs = append(errs, err)
+	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
+	h.req.LogisticsStatus = util.IsNull(h.req.LogisticsStatus)
+	if _, err := conv.Int64(h.req.LogisticsStatus); err != nil {
+		errs = append(errs, err)
+	}
 	if len(errs) != 0 {
 		return fmt.Errorf("check param errs:%+v", errs)
 	}

handler/task_script_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,10 +63,10 @@ func (h *TaskScriptListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
-	// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	// 	errs = append(errs, err)
-	// }
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.ScriptStatus = util.IsNull(h.req.ScriptStatus)
 	if _, err := conv.Int64(h.req.ScriptStatus); err != nil {
 		errs = append(errs, err)

handler/task_sketch_list.go

@@ -9,6 +9,7 @@ import (
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -57,18 +58,18 @@ func (h *TaskSketchListHandler) checkParam() error {
 		errs = append(errs, errors.New("page param error"))
 	}
 	h.req.PageNum--
-	//h.req.ProjectId = util.IsNull(h.req.ProjectId)
-	//if _, err := conv.Int64(h.req.ProjectId); err != nil {
-	//	errs = append(errs, err)
-	//}
-	//// h.req.StrategyId = util.IsNull(h.req.StrategyId)
-	//// if _, err := conv.Int64(h.req.StrategyId); err != nil {
-	//// 	errs = append(errs, err)
-	//// }
-	//h.req.SketchStatus = util.IsNull(h.req.SketchStatus)
-	//if _, err := conv.Int64(h.req.SketchStatus); err != nil {
-	//	errs = append(errs, err)
-	//}
+	h.req.ProjectId = util.IsNull(h.req.ProjectId)
+	if _, err := conv.Int64(h.req.ProjectId); err != nil {
+		errs = append(errs, err)
+	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
+	h.req.SketchStatus = util.IsNull(h.req.SketchStatus)
+	if _, err := conv.Int64(h.req.SketchStatus); err != nil {
+		errs = append(errs, err)
+	}
 	if len(errs) != 0 {
 		return fmt.Errorf("check param errs:%+v", errs)
 	}

handler/task_terminated_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,6 +63,10 @@ func (h *TaskTerminatedListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

handler/task_terminating_list.go

@@ -3,13 +3,14 @@ package handler
 import (
 	"errors"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/service"
 	"youngee_m_api/util"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
@@ -62,6 +63,10 @@ func (h *TaskTerminatingListHandler) checkParam() error {
 	if _, err := conv.Int64(h.req.ProjectId); err != nil {
 		errs = append(errs, err)
 	}
+	h.req.StrategyId = util.IsNull(h.req.StrategyId)
+	if _, err := conv.Int64(h.req.StrategyId); err != nil {
+		errs = append(errs, err)
+	}
 	h.req.DefaultStatus = util.IsNull(h.req.DefaultStatus)
 	if _, err := conv.Int64(h.req.DefaultStatus); err != nil {
 		errs = append(errs, err)

model/common_model/talent_condition.go

@@ -8,7 +8,7 @@ type TalentConditions struct {
 	LinkStatus       int64  `condition:"link_status"`       // 链接状态
 	DataStatus       int64  `condition:"data_status"`       // 数据状态
 	DefaultStatus    int64  `condition:"default_status"`    // 违约状态
-	StrategyIds      string `condition:"strategy_ids"`      // 策略ID
+	StrategyId       int64  `condition:"strategy_id"`       // 策略ID
 	TaskId           string `condition:"task_id"`           // 任务ID
 	PlatformNickname string `condition:"platform_nickname"` // 账号昵称
 }

model/http_model/task_data.go

@@ -10,7 +10,7 @@ type TaskDataListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DataStatus       string `json:"data_status"`       // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_default_data.go

@@ -10,7 +10,7 @@ type TaskDefaultDataListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_default_review.go

@@ -10,7 +10,7 @@ type TaskDefaultReviewListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_finish.go

@@ -9,7 +9,7 @@ type TaskFinishListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DataStatus       string `json:"data_status"`       // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_link.go

@@ -10,7 +10,7 @@ type TaskLinkListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	LinkStatus       string `json:"link_status"`       // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_script.go

@@ -10,7 +10,7 @@ type TaskScriptListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	ScriptStatus     string `json:"script_status"`     // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_sketch.go

@@ -10,7 +10,7 @@ type TaskSketchListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	SketchStatus     string `json:"sketch_status"`     // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_terminated.go

@@ -10,7 +10,7 @@ type TaskTerminatedListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

model/http_model/task_terminating.go

@@ -10,7 +10,7 @@ type TaskTerminatingListRequest struct {
 	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
-	StrategyIds      string `json:"strategy_ids"`      // 策略ID
+	StrategyId       string `json:"strategy_id"`       // 策略ID
 	DefaultStatus    string `json:"default_status"`    // 稿件状态
 	PlatformNickname string `json:"platform_nickname"` // 账号昵称
 }

pack/task_data_list_conditions.go

@@ -1,9 +1,10 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskDataListRequestToCondition(req *http_model.TaskDataListRequest) *common_model.TalentConditions {
@@ -11,7 +12,7 @@ func HttpTaskDataListRequestToCondition(req *http_model.TaskDataListRequest) *co
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		DataStatus:       conv.MustInt64(req.DataStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

pack/task_default_list_conditions.go

@@ -1,16 +1,17 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskDefaultReviewListRequestToCondition(req *http_model.TaskDefaultReviewListRequest) *common_model.TalentConditions {
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		DefaultStatus:    conv.MustInt64(req.DefaultStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}
@@ -20,7 +21,7 @@ func HttpTaskDefaultDataListRequestToCondition(req *http_model.TaskDefaultDataLi
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		DefaultStatus:    conv.MustInt64(req.DefaultStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}
@@ -30,7 +31,7 @@ func HttpTaskTerminatingListRequestToCondition(req *http_model.TaskTerminatingLi
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		DefaultStatus:    conv.MustInt64(req.DefaultStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}
@@ -40,7 +41,7 @@ func HttpTaskTerminatedListRequestToCondition(req *http_model.TaskTerminatedList
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		DefaultStatus:    conv.MustInt64(req.DefaultStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

pack/task_finish_list_conditions.go

@@ -1,16 +1,17 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskFinishListRequestToCondition(req *http_model.TaskFinishListRequest) *common_model.TalentConditions {
 	//fmt.Printf("初稿转换 %+v", req)
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

pack/task_link_list_conditions.go

@@ -1,9 +1,10 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskLinkListRequestToCondition(req *http_model.TaskLinkListRequest) *common_model.TalentConditions {
@@ -11,7 +12,7 @@ func HttpTaskLinkListRequestToCondition(req *http_model.TaskLinkListRequest) *co
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		LinkStatus:       conv.MustInt64(req.LinkStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

pack/task_logistics_list_conditions.go

@@ -1,16 +1,17 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskLogisticsListRequestToCondition(req *http_model.TaskLogisticsListRequest) *common_model.TalentConditions {
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		LogisticsStatus:  conv.MustInt64(req.LogisticsStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyId, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

pack/task_script_list_conditions.go

@@ -1,16 +1,17 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskScriptListRequestToCondition(req *http_model.TaskScriptListRequest) *common_model.TalentConditions {
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		ScriptStatus:     conv.MustInt64(req.ScriptStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

pack/task_sketch_list_conditions.go

@@ -1,16 +1,17 @@
 package pack
 
 import (
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/http_model"
+
+	"github.com/caixw/lib.go/conv"
 )
 
 func HttpTaskSketchListRequestToCondition(req *http_model.TaskSketchListRequest) *common_model.TalentConditions {
 	return &common_model.TalentConditions{
 		ProjectId:        conv.MustInt64(req.ProjectId, 0),
 		SketchStatus:     conv.MustInt64(req.SketchStatus, 0),
-		StrategyIds:      conv.MustString(req.StrategyIds, ""),
+		StrategyId:       conv.MustInt64(req.StrategyId, 0),
 		TaskId:           conv.MustString(req.TaskId, ""),
 		PlatformNickname: conv.MustString(req.PlatformNickname, ""),
 	}

route/init.go

@@ -1,11 +1,12 @@
 package route
 
 import (
-	"github.com/gin-gonic/gin"
 	"youngee_m_api/handler"
 	"youngee_m_api/handler/operate"
 	"youngee_m_api/middleware"
 	"youngee_m_api/model/http_model"
+
+	"github.com/gin-gonic/gin"
 )
 
 func InitRoute(r *gin.Engine) {
@@ -47,6 +48,7 @@ func InitRoute(r *gin.Engine) {
 		m.POST("/project/all", handler.WrapGetAllProjectHandler)
 		m.POST("/project/taskList", handler.WrapProjectTaskListHandler)
 		m.POST("/project/changeTaskStatus", handler.WrapProjectChangeTaskStatusHandler)
+		m.POST("/project/getlogisticsnumberinfo", handler.WrapGetLogisticsNumberInfoHandler)
 		m.POST("/project/getlinknumberinfo", handler.WrapGetLinkNumberInfoHandler)
 		m.POST("/project/getdatanumberinfo", handler.WrapGetDataNumberInfoHandler)
 		m.POST("/project/getreviewnumberinfo", handler.WrapGetReviewNumberInfoHandler)

service/number_info.go

@@ -2,11 +2,12 @@ package service
 
 import (
 	"context"
-	"github.com/caixw/lib.go/conv"
 	"strings"
 	"youngee_m_api/db"
 	"youngee_m_api/model/http_model"
 
+	"github.com/caixw/lib.go/conv"
+
 	"github.com/sirupsen/logrus"
 )
 
@@ -89,3 +90,18 @@ func (*number) GetFinishNumberInfo(ctx context.Context, request http_model.GetFi
 
 	return NumberData, nil
 }
+
+func (*number) GetLogisticsNumberInfo(ctx context.Context, request http_model.GetLogisticsNumberInfoRequest) (*http_model.GetLogisticsNumberInfoData, error) {
+	var StrategyIdList []int64
+	StrategyIds := strings.Split(request.StrategyIds, ",")
+	for _, strategyId := range StrategyIds {
+		StrategyIdList = append(StrategyIdList, conv.MustInt64(strategyId, 0))
+	}
+	NumberData, err := db.GetLogisticsNumberInfo(ctx, request.ProjectId, StrategyIdList)
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)
+		return nil, err
+	}
+
+	return NumberData, nil
+}