..

db/operate.go

@@ -3,8 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/sirupsen/logrus"
 	"log"
 	"reflect"
 	"time"
@@ -12,6 +10,9 @@ import (
 	"youngee_m_api/model/gorm_model"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/sirupsen/logrus"
 )
 
 func CreatePricingStrategy(ctx context.Context, req *http_model.AddPricingRequest) (string, string, error) {
@@ -304,7 +305,7 @@ func GetSignInOfflineTask(projectForm int32) error {
 		signedTaskId = append(signedTaskId, logisticInfo.TaskID)
 		if logisticInfo.SignedTime.IsZero() {
 			db6 := GetReadDB(context.Background())
-			db6.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).Updates(&gorm_model.YoungeeTaskLogistics{SignedTime: time.Now()})
+			db6.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).Updates(&gorm_model.YoungeeTaskLogistics{SignedTime: time.Now(), Status: 1})
 			fmt.Println("已更新签收时间")
 		}
 	}
@@ -383,33 +384,22 @@ func GetAutoReviewTask(contentType int32) error {
 			log.Println("DB GetAutoReviewTask error in script :", err)
 			return err
 		}
-		//fmt.Println("scriptInfos:", scriptInfos)
-		var scriptTaskIds []int
 		for _, scriptInfo := range scriptInfos {
-			scriptTaskIds = append(scriptTaskIds, scriptInfo.TaskID)
-			scriptReviewNeedMod := gorm_model.YounggeeScriptInfo{}
-			db5 := GetReadDB(context.Background())
-			db5.Model(gorm_model.YounggeeScriptInfo{}).Where("script_id = ?", scriptInfo.ScriptID).Find(&scriptReviewNeedMod)
-			if scriptInfo.AgreeAt.IsZero() && scriptInfo.IsSubmit == 1 {
-				if scriptReviewNeedMod.IsReview != 1 {
-					db7 := GetReadDB(context.Background())
-					db7.Model(gorm_model.YounggeeScriptInfo{}).Where("script_id = ?", scriptInfo.ScriptID).Updates(&gorm_model.YounggeeScriptInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
-					fmt.Println("已更新脚本同意时间 及脚本审核状态")
+			if scriptInfo.IsReview == 0 && scriptInfo.IsSubmit == 1 {
+				db7 := GetReadDB(context.Background())
+				db7.Model(gorm_model.YounggeeScriptInfo{}).Where("script_id = ?", scriptInfo.ScriptID).Updates(&gorm_model.YounggeeScriptInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
+				fmt.Println("已更新脚本同意时间 及脚本审核状态")
+
+				taskStatusNeedMod := gorm_model.YoungeeTaskInfo{}
+				db6 := GetReadDB(context.Background())
+				db6.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", scriptInfo.TaskID).Find(&taskStatusNeedMod)
+				if (taskStatusNeedMod.ScriptStatus == 2 || taskStatusNeedMod.ScriptStatus == 4) && taskStatusNeedMod.TaskStage == 8 {
+					db8 := GetReadDB(context.Background())
+					db8.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", scriptInfo.TaskID).Updates(&gorm_model.YoungeeTaskInfo{ScriptStatus: 5, TaskStage: 9})
+					fmt.Println("已更新任务阶段为待传初稿 及脚本上传状态为已通过")
 				}
 			}
 		}
-		//fmt.Println("scriptTaskIds:", scriptTaskIds)
-		for _, scriptTaskId := range scriptTaskIds {
-			//fmt.Println("scriptTaskId", scriptTaskId)
-			taskStatusNeedMod := gorm_model.YoungeeTaskInfo{}
-			db6 := GetReadDB(context.Background())
-			db6.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", scriptTaskId).Find(&taskStatusNeedMod)
-			if (taskStatusNeedMod.ScriptStatus == 2 || taskStatusNeedMod.ScriptStatus == 4) && taskStatusNeedMod.TaskStage == 7 {
-				db8 := GetReadDB(context.Background())
-				db8.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", scriptTaskId).Updates(&gorm_model.YoungeeTaskInfo{ScriptStatus: 5, TaskStage: 9})
-				fmt.Println("已更新任务阶段为待传初稿 及脚本上传状态为已通过")
-			}
-		}
 		return nil
 	} else {
 		err := db.Model(gorm_model.ProjectInfo{}).Where("project_type = ? ", 1).Find(&projectInfos).Error
@@ -445,7 +435,7 @@ func GetAutoReviewTask(contentType int32) error {
 				if scriptInfos.AutoAgreeAt.IsZero() && scriptInfos.IsSubmit == 1 {
 					db3 := GetReadDB(context.Background())
 					db3.Model(gorm_model.YounggeeSketchInfo{}).Where("task_id = ?", scriptInfos.TaskID).Updates(&gorm_model.YounggeeSketchInfo{AutoAgreeAt: scriptInfos.SubmitAt.Add(dd)})
-					fmt.Println("已添加脚本自动审核时间")
+					fmt.Println("已添加初稿自动审核时间")
 				}
 			}
 		}
@@ -460,31 +450,21 @@ func GetAutoReviewTask(contentType int32) error {
 			log.Println("DB GetAutoReviewTask error in sketch:", err)
 			return err
 		}
-		var sketchTaskIds []int
-		for _, scriptInfo := range sketchInfos {
-			sketchTaskIds = append(sketchTaskIds, scriptInfo.TaskID)
-			sketchNeedMod := gorm_model.YounggeeSketchInfo{}
-			db4 := GetReadDB(context.Background())
-			db4.Model(gorm_model.YounggeeSketchInfo{}).Where("sketch_id = ?", scriptInfo.SketchID).Find(&sketchNeedMod)
-			if scriptInfo.AgreeAt.IsZero() && scriptInfo.IsSubmit == 1 {
-				if sketchNeedMod.IsReview != 1 {
-					db6 := GetReadDB(context.Background())
-					db6.Model(gorm_model.YounggeeSketchInfo{}).Where("sketch_id = ?", scriptInfo.SketchID).Updates(&gorm_model.YounggeeSketchInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
-					fmt.Println("已更新初稿审核同意时间")
+		for _, sketchInfo := range sketchInfos {
+			if sketchInfo.IsReview != 1 && sketchInfo.IsSubmit == 1 {
+				db6 := GetReadDB(context.Background())
+				db6.Model(gorm_model.YounggeeSketchInfo{}).Where("sketch_id = ?", sketchInfo.SketchID).Updates(&gorm_model.YounggeeSketchInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
+				fmt.Println("已更新初稿审核同意时间")
+				sketchNeedMod := gorm_model.YoungeeTaskInfo{}
+				db5 := GetReadDB(context.Background())
+				db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", sketchInfo.TaskID).Find(&sketchNeedMod)
+				if (sketchNeedMod.SketchStatus == 2 || sketchNeedMod.SketchStatus == 4) && sketchNeedMod.TaskStage == 10 {
+					db7 := GetReadDB(context.Background())
+					db7.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", sketchInfo.TaskID).Updates(&gorm_model.YoungeeTaskInfo{SketchStatus: 5, TaskStage: 11})
+					fmt.Println("已更新任务阶段为待传链接 及初稿上传状态为已通过")
 				}
 			}
 		}
-		for _, sketchTaskId := range sketchTaskIds {
-			//fmt.Println("taskID", sketchTaskId)
-			sketchNeedMod := gorm_model.YoungeeTaskInfo{}
-			db5 := GetReadDB(context.Background())
-			db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", sketchTaskId).Find(&sketchNeedMod)
-			if (sketchNeedMod.SketchStatus == 2 || sketchNeedMod.SketchStatus == 4) && sketchNeedMod.TaskStage == 9 {
-				db7 := GetReadDB(context.Background())
-				db7.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", sketchTaskId).Updates(&gorm_model.YoungeeTaskInfo{SketchStatus: 5, TaskStage: 11})
-				fmt.Println("已更新任务阶段为待传链接 及初稿上传状态为已通过")
-			}
-		}
 		return nil
 	}
 }
@@ -536,31 +516,21 @@ func GetAutoPostReviewTask() error {
 		log.Println("DB GetAutoPostReviewTask error in sketch:", err)
 		return err
 	}
-	var linkTaskIds []int
 	for _, linkInfo := range linkInfos {
-		linkTaskIds = append(linkTaskIds, linkInfo.TaskID)
-		linkNeedMod := gorm_model.YounggeeLinkInfo{}
-		db4 := GetReadDB(context.Background())
-		db4.Model(gorm_model.YounggeeLinkInfo{}).Where("link_id = ?", linkInfo.LinkID).Find(&linkNeedMod)
-		if linkInfo.AgreeAt.IsZero() && linkInfo.IsSubmit == 1 {
-			if linkNeedMod.IsReview != 1 {
-				db6 := GetReadDB(context.Background())
-				db6.Model(gorm_model.YounggeeLinkInfo{}).Where("link_id = ?", linkInfo.LinkID).Updates(&gorm_model.YounggeeLinkInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
-				fmt.Println("已更新链接审核同意时间")
+		if linkInfo.IsReview != 1 && linkInfo.IsSubmit == 1 {
+			db6 := GetReadDB(context.Background())
+			db6.Model(gorm_model.YounggeeLinkInfo{}).Where("link_id = ?", linkInfo.LinkID).Updates(&gorm_model.YounggeeLinkInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
+			fmt.Println("已更新链接审核同意时间")
+			linkNeedMod := gorm_model.YoungeeTaskInfo{}
+			db5 := GetReadDB(context.Background())
+			db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", linkInfo.TaskID).Find(&linkNeedMod)
+			if (linkNeedMod.LinkStatus == 2 || linkNeedMod.LinkStatus == 4) && linkNeedMod.TaskStage == 12 {
+				db7 := GetReadDB(context.Background())
+				db7.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", linkInfo.TaskID).Updates(&gorm_model.YoungeeTaskInfo{LinkStatus: 5, TaskStage: 13})
+				fmt.Println("已更新任务阶段为待传数据 及 链接上传状态为已通过")
 			}
 		}
 	}
-	for _, linkTaskId := range linkTaskIds {
-		//fmt.Println("taskID", linkTaskId)
-		linkNeedMod := gorm_model.YoungeeTaskInfo{}
-		db5 := GetReadDB(context.Background())
-		db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", linkTaskId).Find(&linkNeedMod)
-		if (linkNeedMod.LinkStatus == 2 || linkNeedMod.LinkStatus == 4) && linkNeedMod.TaskStage == 11 {
-			db7 := GetReadDB(context.Background())
-			db7.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", linkTaskId).Updates(&gorm_model.YoungeeTaskInfo{LinkStatus: 5, TaskStage: 13})
-			fmt.Println("已更新任务阶段为待传数据 及 链接上传状态为已通过")
-		}
-	}
 	return nil
 }
 
@@ -582,7 +552,7 @@ func GetAutoCaseCloseTask() error {
 	var taskId []int
 	db1 := GetReadDB(context.Background())
 	for _, projectId := range projectIds {
-		// 获取 autoTaskId 及其对应的限制时间、
+		// 获取 autoTaskId 及其对应的限制时间
 		autoTaskId := projectIdToAutoTaskIdMap[projectId]
 		dbStart := GetReadDB(context.Background())
 		var CaseClose int32
@@ -611,30 +581,22 @@ func GetAutoCaseCloseTask() error {
 		log.Println("DB GetAutoCaseCloseTask error in sketch:", err)
 		return err
 	}
-	var dataTaskIds []int
 	for _, dataInfo := range dataInfos {
-		dataTaskIds = append(dataTaskIds, dataInfo.TaskID)
-		dataNeedMod := gorm_model.YounggeeDataInfo{}
-		db4 := GetReadDB(context.Background())
-		db4.Model(gorm_model.YounggeeDataInfo{}).Where("data_id = ?", dataInfo.DataID).Find(&dataNeedMod)
-		if dataInfo.AgreeAt.IsZero() && dataInfo.IsSubmit == 1 {
-			if dataNeedMod.IsReview != 1 {
-				db6 := GetReadDB(context.Background())
-				db6.Model(gorm_model.YounggeeDataInfo{}).Where("data_id = ?", dataInfo.DataID).Updates(&gorm_model.YounggeeDataInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
-				fmt.Println("已更新数据审核同意时间")
+		if dataInfo.IsReview != 1 && dataInfo.IsSubmit == 1 {
+			db6 := GetReadDB(context.Background())
+			db6.Model(gorm_model.YounggeeDataInfo{}).Where("data_id = ?", dataInfo.DataID).Updates(&gorm_model.YounggeeDataInfo{AgreeAt: time.Now(), IsReview: 1, IsOk: 1})
+			fmt.Println("已更新数据审核同意时间")
+
+			dataNeedMod := gorm_model.YoungeeTaskInfo{}
+			db5 := GetReadDB(context.Background())
+			db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", dataInfo.TaskID).Find(&dataNeedMod)
+			if (dataNeedMod.DataStatus == 2 || dataNeedMod.DataStatus == 4) && dataNeedMod.TaskStage == 14 {
+				db7 := GetReadDB(context.Background())
+				db7.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", dataInfo.TaskID).Updates(&gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15})
+				fmt.Println("已更新任务阶段为已结案 及 数据上传状态为已通过")
 			}
 		}
 	}
-	for _, dataTaskId := range dataTaskIds {
-		dataNeedMod := gorm_model.YoungeeTaskInfo{}
-		db5 := GetReadDB(context.Background())
-		db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", dataTaskId).Find(&dataNeedMod)
-		if (dataNeedMod.DataStatus == 2 || dataNeedMod.DataStatus == 4) && dataNeedMod.TaskStage == 13 {
-			db7 := GetReadDB(context.Background())
-			db7.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", dataTaskId).Updates(&gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15})
-			fmt.Println("已更新任务阶段为已结案 及 数据上传状态为已通过")
-		}
-	}
 	return nil
 }
 
@@ -684,7 +646,7 @@ func GetAutoInvalidTask() error {
 		if !projectNeedMod.AutoFailAt.IsZero() {
 			if projectNeedMod.AutoFailAt.Sub(time.Now()) <= 0 && projectNeedMod.ProjectStatus < 8 {
 				db4 := GetReadDB(context.Background())
-				err1 := db4.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(&gorm_model.ProjectInfo{ProjectStatus: 8}).Error
+				err1 := db4.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(&gorm_model.ProjectInfo{ProjectStatus: 8, FailReason: 1}).Error
 				if err1 != nil {
 					return err1
 				}

dockerfile

@@ -4,6 +4,9 @@ WORKDIR /go/src/app
 
 COPY . .
 
+#ÉèÖÃʱÇø
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
 ENV youngee_env pro
 
 RUN go env -w GO111MODULE=on

model/gorm_model/task_logistic.go

@@ -20,4 +20,5 @@ type YoungeeTaskLogistics struct {
 	AutoSignAt            time.Time `gorm:"column:auto_sign_at"`                            // 自动签收时间
 	AutoScriptBreakAt     time.Time `gorm:"column:auto_script_break_at"`                    // 脚本违约自动处理时间
 	AutoSketchBreakAt     time.Time `gorm:"column:auto_sketch_break_at"`                    // 初稿违约自动处理时间
-}
+	Status                int64       `gorm:"column:status;default:0"`                        // 签收状态，0为未签收，1为已签收
+}

service/auto_task.go

@@ -187,8 +187,8 @@ func AutoTask() error {
 	}
 	//定时任务
 	// spec := "*/10 * * * * ?" //cron表达式，每10秒一次
-	// spec := "0 */1 * * * ?" //cron表达式，每1分钟一次
-	spec := "0 */30 * * * ?" //cron表达式，每半小时执行一次
+	spec := "0 */2 * * * ?" //cron表达式，每1分钟一次
+	// spec := "0 */30 * * * ?" //cron表达式，每半小时执行一次
 	// spec := "0 0 * * * *" //每小时执行
 	// 添加定时任务,
 	_, err1 := crontab.AddFunc(spec, task1)