最后一次大修

db/finish.go

@@ -124,7 +124,7 @@ func GetTaskFinishList(ctx context.Context, pageSize, pageNum int64, conditions
 	return newTaskFinishs, totalTask, nil
 }
 
-func GetFinishData(ctx context.Context, projectID int64) ([]*gorm_model.RecruitStrategy, error) {
+func GetFinishData(ctx context.Context, projectID string) ([]*gorm_model.RecruitStrategy, error) {
 	var finishRecruitStrategy []*gorm_model.RecruitStrategy
 	db := GetReadDB(ctx)
 	// 查询Task表信息

db/project.go

@@ -38,8 +38,7 @@ func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition
 			db = db.Where(fmt.Sprintf("project_status != 5"))
 			db = db.Where(fmt.Sprintf("project_status != 7"))
 		}
-		if !util.IsBlank(value) && tag != "updated_at" && tag != "project_name" {
-			log.Println(tag, value.Interface())
+		if !util.IsBlank(value) && tag != "updated_at" && tag != "project_name" && tag != "project_id" {
 			db = db.Debug().Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		}
 		if tag == "updated_at" && value.Interface() != "0" {
@@ -49,6 +48,9 @@ func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition
 			//db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 			db = db.Where(fmt.Sprintf("project_name like '%%%s%%'", value.Interface()))
 		}
+		if tag == "project_id" && value.Interface() != "0" {
+			db = db.Debug().Where(fmt.Sprintf("%s = ?", tag), value.Interface())
+		}
 	}
 	// 查询总数
 	var total int64

db/task.go

@@ -90,7 +90,6 @@ func ChangeTaskStatus(ctx context.Context, taskIds []string, taskStatus string)
 	return recruitStrategysIDs, nil
 }
 
-
 func ChangeSpecialTaskStatus(ctx context.Context, taskIds []string, taskStatus string, taskStage string) error {
 	db := GetReadDB(ctx)
 	status, err := strconv.Atoi(taskStatus)
@@ -100,7 +99,7 @@ func ChangeSpecialTaskStatus(ctx context.Context, taskIds []string, taskStatus s
 		return err
 	}
 	if err := db.Debug().Model(&gorm_model.YoungeeTaskInfo{}).Where("task_id IN ?", taskIds).
-		Updates(gorm_model.YoungeeTaskInfo{TaskStatus: status, TaskStage: stage}).Error; err != nil {
+		Updates(gorm_model.YoungeeTaskInfo{TaskStatus: status, TaskStage: stage, SelectDate: time.Now()}).Error; err != nil {
 		logrus.WithContext(ctx).Errorf("[ChangeTaskStatus]2 error query mysql total, err:%+v", err)
 		return err
 	}

handler/accept_link.go

@@ -49,41 +49,11 @@ func (h *AcceptLinkHandler) run() {
 		log.Info("CreateProject fail,req:%+v", h.req)
 		return
 	}
-	h.resp.Message = "成功通过脚本"
+	h.resp.Message = "成功通过链接"
 	h.resp.Data = res
 	h.resp.Data = data
 }
 
-/***
-func (h *AcceptLinkHandler) run() {
-	data := http_model.AcceptLinkRequest{}
-	data = *h.req
-	isRefuse := data.IsRefuse
-	if isRefuse== 0 {
-		fmt.Println("Create in")
-		res, err := service.Project.Create(h.ctx, data)
-		if err != nil {
-			logrus.Errorf("[AcceptLinkHandler] call Create err:%+v\n", err)
-			util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, "")
-			log.Info("CreateProject fail,req:%+v", h.req)
-			return
-		}
-		h.resp.Message = "成功添加修改意见"
-		h.resp.Data = res
-	} else {
-		res, err := service.Logistics.Update(h.ctx, data)
-		if err != nil {
-			logrus.Errorf("[AcceptLinkHandler] call Create err:%+v\n", err)
-			util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, "")
-			log.Info("CreateProject fail,req:%+v", h.req)
-			return
-		}
-		h.resp.Message = "成功修改物流信息"
-		h.resp.Data = res
-	}
-
-}
-***/
 func (h *AcceptLinkHandler) checkParam() error {
 	return nil
 }

handler/data_opinion.go

@@ -49,7 +49,7 @@ func (h *DataOpinionHandler) run() {
 		log.Info("CreateProject fail,req:%+v", h.req)
 		return
 	}
-	h.resp.Message = "提交脚本修改意见成功"
+	h.resp.Message = "提交数据审核意见成功"
 	h.resp.Data = res
 	h.resp.Data = data
 }

route/init.go

@@ -33,14 +33,14 @@ func InitRoute(r *gin.Engine) {
 			}
 			c.JSON(200, resp)
 		})
-		m.GET("/product/getEnterpriseIds", handler.WrapGetEnterpriseIdsHandler)
-		m.POST("/product/list", handler.WrapFullProjectListHandler)
-		m.POST("/project/show", handler.WrapShowProjectHandler)
-		m.POST("/project/handle", handler.WrapProjectHandleHandler)
+		m.GET("/product/getEnterpriseIds", handler.WrapGetEnterpriseIdsHandler) // 获取所有企业用户id
+		m.POST("/product/list", handler.WrapFullProjectListHandler)             // 查询项目列表
+		m.POST("/project/show", handler.WrapShowProjectHandler)                 // 项目展示查询
+		m.POST("/project/handle", handler.WrapProjectHandleHandler)             // 项目线索处理
 		m.POST("/product/findall", handler.WrapFindEnterpriseAllProductHandler) //企业用户详情所有产品
-		m.POST("/product/findAllProduct", handler.WrapFindAllProductHandler)
-		m.POST("/project/create", handler.WrapCreateProjectHandler)
-		m.POST("/product/create", handler.WrapCreateProductHandler)
+		m.POST("/product/findAllProduct", handler.WrapFindAllProductHandler)    // 查找企业绑定的所有产品
+		m.POST("/project/create", handler.WrapCreateProjectHandler)             // 创建项目
+		m.POST("/product/create", handler.WrapCreateProductHandler)             // 创建产品
 		m.POST("/product/find", handler.WrapFindProductHandler)
 		m.POST("/product/deletePhotoUrl", handler.WrapDeletePhotoUrlHandler) // 在数据库中删除图片url
 		m.POST("/pay/paysum", handler.WrapPaySumHandler)
@@ -66,7 +66,7 @@ func InitRoute(r *gin.Engine) {
 		m.POST("/project/acceptscript", handler.WrapAcceptScriptHandler)                           // 同意脚本
 		m.POST("/project/tasksketchlist", handler.WrapTaskSketchListHandler)                       // 查询初稿列表
 		m.POST("/project/findsketchphoto", handler.WrapFindSketchPhotoHandler)                     // 查询脚本配图和视频demo
-		m.POST("/project/sketchopinion", handler.WrapSketchOpinionHandler)                         // 脚本审核意见提交
+		m.POST("/project/sketchopinion", handler.WrapSketchOpinionHandler)                         // 初稿审核意见提交
 		m.POST("/project/acceptsketch", handler.WrapAcceptSketchHandler)                           // 同意脚本
 		m.POST("/project/tasklinklist", handler.WrapTaskLinkListHandler)                           // 查询链接列表
 		m.POST("/project/linkopinion", handler.WrapLinkOpinionHandler)                             // 链接审核意见提交

service/finish.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/db"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
@@ -17,7 +16,7 @@ type finish struct {
 
 // GetFinishData FinishOpinion 在上传脚本表上提交修改意见
 func (*finish) GetFinishData(ctx context.Context, request http_model.GetFinishDataRequest) (*http_model.GetFinishData, error) {
-	finishRecruitStrategyList, err := db.GetFinishData(ctx, conv.MustInt64(request.ProjectId, 0))
+	finishRecruitStrategyList, err := db.GetFinishData(ctx, request.ProjectId)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Finish service] call CreateFinish error,err:%+v", err)
 		return nil, err

service/sketch.go

@@ -17,7 +17,7 @@ var Sketch *sketch
 type sketch struct {
 }
 
-// ReviseOption 在上传初稿表上提交修改意见
+// SketchOption ReviseOption 在上传初稿表上提交修改意见
 func (*sketch) SketchOption(ctx context.Context, request http_model.SketchOpinionRequest) (*http_model.SketchOpinionData, error) {
 	Sketch := gorm_model.YounggeeSketchInfo{
 		TaskID:        request.TaskID,