Merge branch 'feature/eta_1.7.8' into debug

controller/fe_calendar/fe_calendar.go

@@ -65,16 +65,33 @@ func LastestPermissionMonth(c *gin.Context) {
 		response.Fail("请选择品种", c)
 		return
 	}
-
+	var month string
 	matterOb := new(fe_calendar_matter.FeCalendarMatter)
-	item, e := matterOb.GetLastestMonthItemByPermissionId(req.ChartPermissionId)
+
+	// 当月事项
+	currentMonth := time.Now().Format("2006-01")
+	cond := ` chart_permission_id = ? AND matter_month = ?`
+	pars := make([]interface{}, 0)
+	pars = append(pars, req.ChartPermissionId, currentMonth)
+	item, e := matterOb.GetItemByCondition(cond, pars)
 	if e != nil && e != utils.ErrNoRow {
-		response.FailMsg("获取失败", "获取事项失败, Err: "+e.Error(), c)
+		response.FailMsg("获取失败", "获取当月事项失败, Err: "+e.Error(), c)
 		return
 	}
-	var month string
-	if item != nil {
-		month = item.MatterMonth
+	if item != nil && item.FeCalendarMatterId > 0 {
+		month = currentMonth
+	}
+
+	// 无当月事项则查询最近的
+	if month == "" {
+		lastest, e := matterOb.GetLastestMonthItemByPermissionId(req.ChartPermissionId)
+		if e != nil && e != utils.ErrNoRow {
+			response.FailMsg("获取失败", "获取事项失败, Err: "+e.Error(), c)
+			return
+		}
+		if lastest != nil && lastest.FeCalendarMatterId > 0 {
+			month = lastest.MatterMonth
+		}
 	}
 	response.OkData("获取成功", month, c)
 }

models/tables/fe_calendar_matter/model.go

@@ -49,6 +49,11 @@ type FeCalendarMatterListItem struct {
 	Matters []*FeCalendarMatterItem `description:"日期事项" json:"matters"`
 }
 
+func (m *FeCalendarMatter) GetItemByCondition(cond string, pars []interface{}) (item *FeCalendarMatter, err error) {
+	err = global.MYSQL["data"].Where(cond, pars...).First(&item).Error
+	return
+}
+
 func (m *FeCalendarMatter) GetItemsByCondition(cond string, pars []interface{}, fieldArr []string, orderRule string) (items []*FeCalendarMatter, err error) {
 	order := fmt.Sprintf(`%s DESC`, FeCalendarMatterColumns.CreateTime)
 	if orderRule != "" {