Merge branch 'develop' of baishaojie/tmrgo1 into master

http/handle/api/ops.go

@@ -1097,7 +1097,7 @@ func GetRJSBData(c *gin.Context) {
 	returntype := fsion.Get("returntype").ValueDefaultStr("map")
 	month := fsion.Get("month").ValueDefaultStr("map")
 	logging.Info("GetUpkeepPlan ", c.Keys, sqlnamestr, month)
-	// pagecount = 1
+	pagecount = 1
 	tx := restful.Engine.NewSession()
 	err := tx.Begin()
 	defer func() {

http/handle/api/scheduled.go

@@ -191,8 +191,8 @@ func CronScheduled(ctx context.Context) {
 	} else if setting.ServerSetting.SyncStatus == 8 {
 		InitMqttClient()
 	}
+
 	// manualUdData(pastureinfo)
-	// ymy.YmyCron(pastureinfo.Werks, pastureinfo.Pastureid)
 	// //圣牧自动同步前天有进行中的任务
 	// manualUdData(pastureinfo)
 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)

http/handle/ymy/ymy.go

@@ -286,7 +286,7 @@ func YmyUtirPush(pastureId, farmId, date string) error {
 		now = time.Now().AddDate(0, 0, -1).Format("2006-01-02")
 	}
 
-	dataList, err := tx.SQL(`select  MD5(CONCAT(d.pid, d.mydate)) loadId , date_format(d1.date,'%Y-%m-%d')  dropDate,date_format(d1.date,'%Y-%m-%d')  loadDate,d.times loadShift,d.id  tmrNo,ft.tcode recipeId,ft.ccname recipeName,if(d1.feedcode = -1 ,d1.feedcode,f.feedcode) ingId,if(d1.feedcode = -1 ,d1.feedcode,f.feedcode) feedCode ,ifnull(f.fname,ftd.fname)  ingName,
+	dataList, err := tx.SQL(`select  MD5(CONCAT(d.pid, d.mydate)) loadId , date_format(d1.date,'%Y-%m-%d')  dropDate,date_format(d1.date,'%Y-%m-%d')  loadDate,d.times loadShift,d.id  tmrNo,ft.tcode recipeId,ft.ccname recipeName,'' ingId,'' feedCode ,ifnull(f.fname,ftd.fname)  ingName,
 	ifnull(ifnull(fc.fcname,(select fcname from feedclass fc1 join feed f1 on f1.fclassid = fc1.id where f1.id =ftd.fid )),'饲料') ingType,
 	ifnull(f.dry * d1.actualweightminus,0)  dmPct,d1.sort mixNo,ifnull(d1.feedallowratio,0) allowableError , if(f.fname is not null, ifnull(d1.lweight,''),	ifnull(ftd.fweight / (select sum(fweight)  from ftdetaildate  where  date =  d1.date and ftid = d1.fid ) *  d1.lweight,"") )  expWeight,
 	

http/routers/app_api.go

@@ -293,7 +293,6 @@ func AppAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 
 			apiV3.POST("/plan/dry", api.GetPlanDry)
 			apiV3.GET("/bar/list", api.GetBar)
-
 		}
 
 		apiV4 := s.Group("/customreport") // restful  接口 tablename 是 表名字

module/group.go

@@ -356,7 +356,7 @@ func FeedTemplateList(req *models.FeedListRequest) ([]*models.FeedTemplate, int6
 		return nil, 0, err
 	}
 
-	if err = newSession.Table(new(models.FeedTemplate).TableName()).Limit(int(req.PageSize), int(req.Page-1)*int(req.PageSize)).Find(&res); err != nil {
+	if err = newSession.Table(new(models.FeedTemplate).TableName()).Limit(int(req.Page-1)*int(req.PageSize), int(req.PageSize)).Find(&res); err != nil {
 		return nil, 0, err
 	}
 
@@ -376,7 +376,7 @@ func FeedList(req *models.FeedListRequest) ([]*models.Feed, int64, error) {
 		return nil, 0, err
 	}
 
-	if err = newSession.Table(new(models.Feed).TableName()).Limit(int(req.PageSize), int(req.Page-1)*int(req.PageSize)).Find(&res); err != nil {
+	if err = newSession.Table(new(models.Feed).TableName()).Limit(int(req.Page-1)*int(req.PageSize), int(req.PageSize)).Find(&res); err != nil {
 		return nil, 0, err
 	}
 	return res, total, nil
@@ -395,7 +395,7 @@ func FeedTemplateDetailList(req *models.FeedListRequest) ([]*models.FeedTemplate
 		return nil, 0, err
 	}
 
-	if err = newSession.Table(new(models.FeedTemplateDetail).TableName()).Limit(int(req.PageSize), int(req.Page-1)*int(req.PageSize)).Find(&res); err != nil {
+	if err = newSession.Table(new(models.FeedTemplateDetail).TableName()).Limit(int(req.Page-1)*int(req.PageSize), int(req.PageSize)).Find(&res); err != nil {
 		return nil, 0, err
 	}
 	return res, total, nil