Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

migration/v0001_feedtemplet.sql

@@ -3,7 +3,14 @@ ALTER TABLE `feedtemplet`
     ADD COLUMN `group_data_id` bigint(11) unsigned NOT NULL DEFAULT '0' COMMENT '集团端数据ID',
     ADD COLUMN `group_version` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '集团端版本号';
 
-ALTER TABLE ftdetail ADD COLUMN `is_show` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否显示 0 无效 1 显示 2 隐藏';
+ALTER TABLE `ftdetail`
+    ADD COLUMN `is_modify` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否可修改 0 无效 1 是 2 否',
+    ADD COLUMN `is_show` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否显示 0 无效 1 显示 2 隐藏';
+ALTER TABLE cowclass ADD COLUMN group_id int(11) unsigned NOT NULL DEFAULT '0' COMMENT '集团端id';
+ALTER TABLE feedclass ADD COLUMN group_id int(11) unsigned NOT NULL DEFAULT '0' COMMENT '集团端id';
+ALTER TABLE USER ADD COLUMN `imei` VARCHAR(255) DEFAULT NULL;
+update feedtemplet set group_version = version;
+
 
 ## SELECT * FROM `apisql` where sqlname = 'getFTdetailList'
 SELECT
@@ -23,13 +30,6 @@ WHERE ftdetail.pastureid = ?   AND ( ftid=?) AND is_show = 1
   AND ( feedgroup LIKE CONCAT('%',?,'%')  OR ? = '')
 ORDER BY ftdetail.sort,ftdetail.id;
 
-
-
-update feedtemplet set group_version = version;
-
-ALTER TABLE `ftdetail`
-    ADD COLUMN `is_modify` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否可修改 0 无效 1 是 2 否';
-
 ## SELECT * FROM apisql WHERE sqlname = 'getFTList' AND ENABLE >0
 ## 需要更新的语句如下
 SELECT * FROM ( SELECT
@@ -53,12 +53,7 @@ WHERE pastureid = ?
   AND (fttype LIKE CONCAT("%",?,"%") OR ?='')
 ) f
 WHERE (f.enable = ? OR ? = '' ) AND (isadjust = ? OR ? = '') AND (source = IF( ? = 0 ,"自定义",IF (? = 1,"集团下发未调整",IF(? = 2,"集团下发有调整",IF(? = 3 ,"导入","")))) OR ? = '')
-ORDER BY  f.sort ASC;
-
-
-ALTER TABLE cowclass ADD COLUMN group_id int(11) unsigned NOT NULL DEFAULT '0' COMMENT '集团端id';
-ALTER TABLE feedclass ADD COLUMN group_id int(11) unsigned NOT NULL DEFAULT '0' COMMENT '集团端id';
-ALTER TABLE USER ADD COLUMN `imei` VARCHAR(255) DEFAULT NULL;
+ORDER BY  f.id DESC;
 
 ##  SELECT * FROM apisql WHERE sqlname  ='updatesysopt'
 ## 需要更新的语句如下sqlstr

module/group.go

@@ -260,6 +260,12 @@ func CattleCategoryDistribute(req *models.CowClass) error {
 			return err
 		}
 	} else {
+		lastData := &models.CowClass{}
+		if err = restful.Engine.Table(new(models.CowClass).TableName()).OrderBy("id desc").GetFirst(lastData).Error; err != nil {
+			req.Id = 1
+		} else {
+			req.Id = lastData.Id + 1
+		}
 		if _, err = restful.Engine.Table(new(models.CowClass).TableName()).Insert(req); err != nil {
 			return err
 		}
@@ -287,7 +293,16 @@ func ForageCategoryDistribute(req *models.FeedClass) error {
 			}); err != nil {
 			return err
 		}
+
 	} else {
+
+		lastData := &models.FeedClass{}
+		if err = restful.Engine.Table(new(models.FeedClass).TableName()).OrderBy("id desc").GetFirst(lastData).Error; err != nil {
+			req.Id = 1
+		} else {
+			req.Id = lastData.Id + 1
+		}
+
 		if _, err = restful.Engine.Table(new(models.FeedClass).TableName()).Insert(req); err != nil {
 			return err
 		}