审稿管理

db/script.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"time"
 	"youngee_b_api/model/common_model"
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
@@ -14,7 +15,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// 查询上传脚本的task list
+// GetTaskScriptList 查询上传脚本的task list
 func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskScriptInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息
@@ -74,7 +75,7 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 		}
 	}
 	var ScriptInfos []gorm_model.YounggeeScriptInfo
-	db1 = db1.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id IN ? AND is_submit=? AND is_review=?", taskIds, 1, 0).Find(&ScriptInfos)
+	db1 = db1.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id IN ? AND is_submit=? ", taskIds, 1).Find(&ScriptInfos)
 	ScriptMap := make(map[int]gorm_model.YounggeeScriptInfo)
 	for _, ScriptInfo := range ScriptInfos {
 		ScriptMap[conv.MustInt(ScriptInfo.TaskID)] = ScriptInfo
@@ -115,8 +116,40 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 	taskScripts = pack.TaskScriptToTaskInfo(TaskScripts)
 
 	for _, v := range taskScripts {
-		fmt.Println("taskScript: \n", *v)
+		fmt.Printf("taskScript: %+v \n", *v)
 	}
 	// return fulltaskScript, total, nil
 	return taskScripts, totalTask, nil
 }
+
+// 提交意见
+func ReviseOption(ctx context.Context, TaskID int, ReviseOpinion string) error {
+	db := GetReadDB(ctx)
+	err := db.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id = ?", TaskID).Updates(map[string]interface{}{"revise_opinion": ReviseOpinion, "reject_at": time.Now(), "is_review": 0}).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Script db] call RevisieOption error,err:%+v", err)
+		return err
+	}
+	err = db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", TaskID).Updates(gorm_model.YoungeeTaskInfo{ScriptStatus: 3}).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Script db] call RevisieOption error,err:%+v", err)
+		return err
+	}
+	return nil
+}
+
+// 同意脚本
+func AcceptScript(ctx context.Context, TaskID int) error {
+	db := GetReadDB(ctx)
+	err := db.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id = ?", TaskID).Updates(map[string]interface{}{"is_ok": 1, "is_review": 1}).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Script db] call AcceptScript error,err:%+v", err)
+		return err
+	}
+	err = db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", TaskID).Updates(gorm_model.YoungeeTaskInfo{ScriptStatus: 5}).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Script db] call AcceptScript  error,err:%+v", err)
+		return err
+	}
+	return nil
+}

handler/accept_script.go

@@ -0,0 +1,89 @@
+package handler
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
+	"youngee_b_api/consts"
+	"youngee_b_api/model/http_model"
+	"youngee_b_api/service"
+	"youngee_b_api/util"
+)
+
+func WrapAcceptScriptHandler(ctx *gin.Context) {
+	handler := newAcceptScriptHandler(ctx)
+	baseRun(handler)
+}
+
+func newAcceptScriptHandler(ctx *gin.Context) *AcceptScriptHandler {
+	return &AcceptScriptHandler{
+		req:  http_model.NewAcceptScriptRequest(),
+		resp: http_model.NewAcceptScriptResponse(),
+		ctx:  ctx,
+	}
+}
+
+type AcceptScriptHandler struct {
+	req  *http_model.AcceptScriptRequest
+	resp *http_model.CommonResponse
+	ctx  *gin.Context
+}
+
+func (h *AcceptScriptHandler) getRequest() interface{} {
+	return h.req
+}
+func (h *AcceptScriptHandler) getContext() *gin.Context {
+	return h.ctx
+}
+func (h *AcceptScriptHandler) getResponse() interface{} {
+	return h.resp
+}
+
+func (h *AcceptScriptHandler) run() {
+	data := http_model.AcceptScriptRequest{}
+	data = *h.req
+	res, err := service.Script.AcceptScript(h.ctx, data)
+	if err != nil {
+		logrus.Errorf("[ReviseOpinionHandler] 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
+	h.resp.Data = data
+}
+
+/***
+func (h *AcceptScriptHandler) run() {
+	data := http_model.AcceptScriptRequest{}
+	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("[AcceptScriptHandler] 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("[AcceptScriptHandler] 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 *AcceptScriptHandler) checkParam() error {
+	return nil
+}

handler/revise_opinion.go

@@ -2,14 +2,18 @@ package handler
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
+	"youngee_b_api/consts"
 	"youngee_b_api/model/http_model"
+	"youngee_b_api/service"
+	"youngee_b_api/util"
 )
 
-//
-//func WrapReviseOptionHandler(ctx *gin.Context) {
-//	handler := newReviseOptionHandler(ctx)
-//	baseRun(handler)
-//}
+func WrapReviseOptionHandler(ctx *gin.Context) {
+	handler := newReviseOptionHandler(ctx)
+	baseRun(handler)
+}
 
 func newReviseOptionHandler(ctx *gin.Context) *ReviseOptionHandler {
 	return &ReviseOptionHandler{
@@ -35,6 +39,21 @@ func (h *ReviseOptionHandler) getResponse() interface{} {
 	return h.resp
 }
 
+func (h *ReviseOptionHandler) run() {
+	data := http_model.ReviseOptionRequest{}
+	data = *h.req
+	res, err := service.Script.ReviseOption(h.ctx, data)
+	if err != nil {
+		logrus.Errorf("[ReviseOpinionHandler] 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
+	h.resp.Data = data
+}
+
 /***
 func (h *ReviseOptionHandler) run() {
 	data := http_model.ReviseOptionRequest{}
@@ -64,7 +83,7 @@ func (h *ReviseOptionHandler) run() {
 	}
 
 }
+***/
 func (h *ReviseOptionHandler) checkParam() error {
 	return nil
 }
-***/

model/http_model/accept_script.go

@@ -0,0 +1,19 @@
+package http_model
+
+type AcceptScriptRequest struct {
+	StrategyID int64 `json:"strategy_id"` //招募策略id
+	TaskID     int64 `json:"task_id"`     //任务-id
+}
+
+type AcceptScriptData struct {
+	TaskID int64 `json:"task_id"` // 脚本ID
+}
+
+func NewAcceptScriptRequest() *AcceptScriptRequest {
+	return new(AcceptScriptRequest)
+}
+func NewAcceptScriptResponse() *CommonResponse {
+	resp := new(CommonResponse)
+	resp.Data = new(AcceptScriptData)
+	return resp
+}

model/http_model/revise_option.go

@@ -1,14 +1,13 @@
 package http_model
 
 type ReviseOptionRequest struct {
-	StrategyID  int64  `json:"strategy_id"`  //招募策略id
-	ScriptID    int64  `json:"logistics_id"` // 脚本-id
-	CompanyName string `json:"company_name"` // 实物商品-物流公司名称
-	IsRefuse    int64  `json:"is_refuse"`    //是否打回修改
+	StrategyID    int64  `json:"strategy_id"`    //招募策略id
+	TaskID        int64  `json:"task_id"`        //任务-id
+	ReviseOpinion string `json:"revise_opinion"` //脚本内容
 }
 
 type ReviseOptionData struct {
-	ScriptID int64 `json:"logistics_id"` // 脚本ID
+	TaskID int64 `json:"task_id"` // 脚本ID
 }
 
 func NewReviseOptionRequest() *ReviseOptionRequest {

route/init.go

@@ -59,8 +59,10 @@ func InitRoute(r *gin.Engine) {
 		m.POST("/project/tasklogisticslist", handler.WrapTaskLogisticsListHandler) //物流信息查询
 		m.POST("/project/createlogistics", handler.WrapCreateLogisticsHandler)     //创建物流信息
 		m.POST("/project/signforreceipt", handler.WrapSignForReceiptHandler)
-		m.POST("/project/taskscriptlist", handler.WrapTaskScriptListHandler)
-		//m.POST("/project/reviseopinion", handler.WrapReviseOptionHandler) //审核意见提交
+		m.POST("/project/taskscriptlist", handler.WrapTaskScriptListHandler) //查询脚本列表
+		m.POST("/project/reviseopinion", handler.WrapReviseOptionHandler)    //审核意见提交
+		m.POST("/project/acceptscript", handler.WrapAcceptScriptHandler)     //同意脚本
+		m.POST("/project/", handler.WrapAcceptScriptHandler)                 //同意脚本
 		//m.POST("/project/tasksketchlist", handler.WrapTaskSketchListHandler)
 	}
 }

service/logistics.go

@@ -18,7 +18,7 @@ var Logistics *logistics
 type logistics struct {
 }
 
-// 在物流信息表插入记录
+// Create 在物流信息表插入记录
 func (*logistics) Create(ctx context.Context, newLogistics http_model.CreateLogisticsRequest) (*http_model.CreateLogisticsData, error) {
 	ThingsType := newLogistics.ThingsType
 	StrategyID := newLogistics.StrategyID

service/project_pay.go

@@ -50,13 +50,13 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 		}
 	} else {
 		if project.ContentType == 1 {
-			err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 11)
+			err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 11) //修改为待传初稿
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 				return nil, err
 			}
 		} else {
-			err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 8)
+			err = db.UpdateTaskStage(ctx, conv.MustInt64(projectPay.ProjectID), 2, 8) //修改为待传脚本
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 				return nil, err

service/script.go

@@ -0,0 +1,53 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"github.com/issue9/conv"
+	"youngee_b_api/db"
+	"youngee_b_api/model/gorm_model"
+	"youngee_b_api/model/http_model"
+
+	"github.com/sirupsen/logrus"
+)
+
+var Script *script
+
+type script struct {
+}
+
+// ReviseOption 在上传脚本表上提交修改意见
+func (*script) ReviseOption(ctx context.Context, request http_model.ReviseOptionRequest) (*http_model.ReviseOptionData, error) {
+	Script := gorm_model.YounggeeScriptInfo{
+		TaskID:        conv.MustInt(request.TaskID),
+		ReviseOpinion: request.ReviseOpinion,
+	}
+	err := db.ReviseOption(ctx, Script.TaskID, Script.ReviseOpinion)
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Script service] call CreateScript error,err:%+v", err)
+		return nil, err
+	}
+
+	res := &http_model.ReviseOptionData{
+		TaskID: int64(Script.TaskID),
+	}
+	return res, nil
+}
+
+// AcceptScript
+func (*script) AcceptScript(ctx context.Context, request http_model.AcceptScriptRequest) (*http_model.AcceptScriptData, error) {
+
+	TaskID := conv.MustInt(request.TaskID)
+
+	fmt.Printf("acc request %+v", TaskID)
+	err := db.AcceptScript(ctx, TaskID)
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[Script service] call CreateScript error,err:%+v", err)
+		return nil, err
+	}
+
+	res := &http_model.AcceptScriptData{
+		TaskID: int64(TaskID),
+	}
+	return res, nil
+}