Bladeren bron

no message

xingzai 2 jaren geleden
bovenliggende
commit
3a2635b6cd
4 gewijzigde bestanden met toevoegingen van 78 en 3 verwijderingen
  1. 23 0
      models/cygx_morning_meeting_gather.go
  2. 1 0
      models/db.go
  3. 40 3
      services/morning_meeting.go
  4. 14 0
      utils/common.go

+ 23 - 0
models/cygx_morning_meeting_gather.go

@@ -0,0 +1,23 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxMorningMeetingGather struct {
+	Id          int       `orm:"column(id);pk"`
+	MeetingIds  string    `description:"主表ID多个用 , 隔开"`
+	PublishTime string    `description:"发布日期"`
+	CreateTime  time.Time `description:"创建时间"`
+	ModifyTime  time.Time `description:"更新时间"`
+	Title       string    `description:"标题"`
+	Status      int       `description:"0:未发布,1:已发布"`
+}
+
+// 添加
+func AddCygxMorningMeetingGather(item *CygxMorningMeetingGather) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(item)
+	return
+}

+ 1 - 0
models/db.go

@@ -136,6 +136,7 @@ func init() {
 		new(CygxReportSelectionSubjectHistory),
 		new(CygxTacticsTimeLineHistory),
 		new(CygxProductInteriorHistory),
+		new(CygxMorningMeetingGather),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

+ 40 - 3
services/morning_meeting.go

@@ -2,12 +2,49 @@ package services
 
 import (
 	"fmt"
+	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
+	"strconv"
+	"strings"
 	"time"
 )
 
-func init() {
-	DayTime := time.Now().AddDate(0, 0, -46).Format(utils.FormatDate)
-	fmt.Println(DayTime)
+func init233() {
+	init12()
+}
+
+func init12() (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("定时生成晨会精华汇总失败,err:"+err.Error(), 2)
+		}
+	}()
+	hourstr := " 10:30:00 "
+	DayTime := time.Now().AddDate(0, 0, -46)
+	startSize := 0
+	pageSize := 100
+	var condition string
+	var pars []interface{}
+	startDate := DayTime.AddDate(0, 0, -1).Format(utils.FormatDate) + hourstr
+	endDate := DayTime.Format(utils.FormatDate) + hourstr
+	condition += ` 	AND publish_time  BETWEEN ?   AND  ? `
+	pars = append(pars, startDate, endDate)
+	list, err := models.GetCygxMorningMeetingReviewsList(condition, pars, startSize, pageSize)
+	if err != nil {
+		return
+	}
+	item := new(models.CygxMorningMeetingGather)
+	for _, v := range list {
+		item.MeetingIds += strconv.Itoa(v.Id) + ","
+	}
+	item.MeetingIds = strings.TrimRight(item.MeetingIds, ",")
+	item.Title = utils.GetTimeDateHourAndDay(DayTime) + "(" + utils.StrDateTimeToWeek(DayTime.Format(utils.FormatDateTime)) + ")" + "|晨会精华"
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.PublishTime = endDate
+	item.Status = 1
+	err = models.AddCygxMorningMeetingGather(item)
+	return
 
 }

+ 14 - 0
utils/common.go

@@ -727,6 +727,7 @@ func StrDateTimeToWeek(strTime string) string {
 		"Sunday":    "周日",
 	}
 	var ctime = StrTimeToTime(strTime).Format("2006-01-02")
+	fmt.Println(ctime)
 	startday, _ := time.Parse("2006-01-02", ctime)
 	staweek_int := startday.Weekday().String()
 	return WeekDayMap[staweek_int]
@@ -828,3 +829,16 @@ func StrDateToTime(strTime string) time.Time {
 	resultTime, _ := time.ParseInLocation(timeLayout, strTime, loc)
 	return resultTime
 }
+
+// 获取时间的月跟日
+func GetTimeDateHourAndDay(DayTime time.Time) (dataStr string) {
+	dataSlice := strings.Split(DayTime.Format(FormatDate), "-")
+	for k, v := range dataSlice {
+		if k == 0 {
+			continue
+		}
+		dataStr += v + "."
+	}
+	dataStr = strings.TrimRight(dataStr, ",")
+	return
+}