添加获取工段详情接口

server/api/v1/examtestpage/grouphandle.go

@@ -2,6 +2,7 @@ package examtestpage
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/commonus"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
@@ -20,7 +21,8 @@ type GroupMap struct {
 	Name     string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"`                  //'组织名称',
 	Time     int64  `json:"time" gorm:"column:g_time;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"` //'编辑时间',
 	Parentid int64  `json:"parentid" gorm:"column:g_parentid;type:bigint(20) unsigned;default:0;not null;comment:父级栏目"`
-	Sate     int8   `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"` //'状态',
+	Sate     int8   `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"`           //'状态',
+	JinDieId int64  `json:"jindieid" gorm:"column:g_jindie_id;type:bigint(20) unsigned;default:0;not null;comment:金蝶ID"` //金蝶ID
 }
 
 type TableData struct {
@@ -63,8 +65,8 @@ func (g *GroupHandleApi) GroupList(c *gin.Context) {
 			groupTypeStruct.ID = v.Id
 			groupTypeStruct.Name = v.Name
 			groupTypeStruct.Address = true
-			groupTypeStruct.WxId = ""
+			groupTypeStruct.WxId = strconv.FormatInt(v.Id, 10)
-			groupTypeStruct.JdId = ""
+			groupTypeStruct.JdId = strconv.FormatInt(v.JinDieId, 10)
 			groupTypeStruct.Attributes = 1
 			groupTypeStruct.Sort = i + 1
 			groupTypeStruct.Date = commonus.TimeStampToDate(v.Time, 6)
@@ -92,7 +94,7 @@ func openGroupMap(data []testpage.BranchFactoryHasMany) []TableData {
 		if v.Set != 1 {
 			kk.Address = false
 		}
-		kk.WxId = ""
+		kk.WxId = strconv.FormatInt(v.WechatId, 10)
 		kk.JdId = ""
 		kk.Attributes = v.Attribute
 		kk.Sort = i + 1
@@ -121,6 +123,10 @@ func openGroupMap(data []testpage.BranchFactoryHasMany) []TableData {
 }
 
 //获取集团信息
+/*
+@id      集团ID
+*/
+
 func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) {
 	var id postGroupCanshu
 	_ = c.ShouldBindJSON(&id)                                                         //获取提交的参数
@@ -130,14 +136,40 @@ func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) {
 		response.Result(100, groupStruct, "获取失败", c)
 		return
 	}
-	fmt.Printf("====>%v\n", id.Id)
+	// fmt.Printf("====>%v\n", id.Id)
 	response.Result(200, groupStruct, "获取成功", c)
 }
 
-func (g *GroupHandleApi) GetGroupInfos(c *gin.Context) {
+/*获取子公司信息
-	var ids postGroupCanshu
+@id      子公司ID
-	_ = c.ShouldBindJSON(&ids)
+*/
-	// name := c.Query("id")
+func (g *GroupHandleApi) GetSubsidiaryInfo(c *gin.Context) {
-	fmt.Printf("====>%v\n", ids.Id)
+	var id postGroupCanshu
-	response.Ok(c)
+	_ = c.ShouldBindJSON(&id)                                                            //获取提交的参数
+	var subsidiaryStruct testpage.BranchFactory                                          //子公司表结构
+	err := global.GVA_DB_Master.Where("bf_id = ?", id.Id).First(&subsidiaryStruct).Error //获取子公司信息
+	if err != nil {
+		response.Result(100, subsidiaryStruct, "获取失败", c)
+		return
+	}
+	response.Result(200, subsidiaryStruct, "获取成功", c)
+}
+
+/*获取工段信息
+@id      工段ID
+*/
+func (g *GroupHandleApi) GetGroupPositionInfo(c *gin.Context) {
+	var id postGroupCanshu
+	_ = c.ShouldBindJSON(&id) //获取提交的参数
+	fmt.Printf("%v====>%T\n", id.Id, id)
+	if id.Id == 0 {
+		response.Result(101, id, "您的参数不正确！请检查您的提交！", c)
+	}
+	var workShopesStruct testpage.WorkShopsection                                        //工段表结构
+	err := global.GVA_DB_Master.Where("ws_id = ?", id.Id).First(&workShopesStruct).Error //获取工段信息
+	if err != nil {
+		response.Result(100, workShopesStruct, "获取失败", c)
+		return
+	}
+	response.Result(200, workShopesStruct, "获取成功", c)
 }

server/commonus/errormsg.go

@@ -0,0 +1,3 @@
+package commonus
+
+var ()

server/log/server_info.log

@@ -613,3 +613,51 @@
 [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 13:47:21.546	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
 [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 13:47:21.557	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
 [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 13:47:21.564	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.237	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.251	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.251	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.251	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.264	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.268	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.933	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.948	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.948	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.949	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.958	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.962	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.165	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.186	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.187	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.187	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.198	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.202	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.762	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.781	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.782	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.782	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.792	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.805	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.016	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.029	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.029	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.029	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.039	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.051	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.230	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.252	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.252	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.253	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.269	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.277	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.526	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.550	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.550	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.551	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.561	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.577	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.613	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62	register table success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.627	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31	use middleware logger
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.627	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34	use middleware cors
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.627	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36	register swagger handler
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.639	info	G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87	router register success
+[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.661	info	G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37	server run success on 	{"address": ":8888"}

server/model/testpage/grouptree.go

@@ -24,7 +24,7 @@ type BranchFactoryHasMany struct {
 	Time                  int64             `json:"time" gorm:"column:bf_time;type:bigint(20) unsigned;default:0;not null;comment:添加时间"`                    //'0',
 	Attribute             int8              `json:"attribute" gorm:"column:bf_attribute;type:tinyint(1) unsigned;default:1;not null;comment:属性（1：私有；2：共享）"` //'属性（1：私有；2：共享）',
 	Group                 int64             `json:"group" gorm:"column:bf_group;type:bigint(20) unsigned;default:0;not null;comment:集团公司"`                  //'集团公司',
-	WechatId              int               `json:"wechatid" gorm:"column:bf_wechat_id;type:int(4) unsigned;default:0;not null;comment:对照微信id"`             //'对照微信id',
+	WechatId              int64             `json:"wechatid" gorm:"column:bf_wechat_id;type:int(4) unsigned;default:0;not null;comment:对照微信id"`             //'对照微信id',
 	WorkshopSectionStruct []WorkShopsection `gorm:"foreignKey:ws_bf_id";references:"bf_id"`
 }
 

server/model/wechat/grouptree.go

@@ -2,13 +2,14 @@ package wechat
 
 type GroupForm struct {
 	Id       int64  `json:"id" gorm:"column:g_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"`
-	Name     string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"`                          //'组织名称',
+	Name     string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"`                           //'组织名称',
-	Parentid int64  `json:"parentid" gorm:"column:g_parentid;type:bigint(20) unsigned;default:0;not null;comment:父级栏目"` //'父级栏目',
+	Parentid int64  `json:"parentid" gorm:"column:g_parentid;type:bigint(20) unsigned;default:0;not null;comment:父级栏目"`  //'父级栏目',
-	Orderes  int64  `json:"orderes" gorm:"column:g_order;type:bigint(20) unsigned;default:0;not null;comment:企业微信排序"`   //'企业微信排序',
+	Orderes  int64  `json:"orderes" gorm:"column:g_order;type:bigint(20) unsigned;default:0;not null;comment:企业微信排序"`    //'企业微信排序',
-	Time     int64  `json:"time" gorm:"column:g_time;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"`         //'编辑时间',
+	Time     int64  `json:"time" gorm:"column:g_time;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"`          //'编辑时间',
-	Sate     int8   `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"`          //'状态',
+	Sate     int8   `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"`           //'状态',
-	Group    string `json:"group" gorm:"column:g_group;type:text;not null;comment:组织结构"`                                //'组织结构',
+	Group    string `json:"group" gorm:"column:g_group;type:text;not null;comment:组织结构"`                                 //'组织结构',
-	GroupSun string `json:"groupsun" gorm:"column:g_group_sun;type:text;not null;comment:组织结构"`                         //'子节点',
+	GroupSun string `json:"groupsun" gorm:"column:g_group_sun;type:text;not null;comment:组织结构"`                          //'子节点',
+	JinDieId int64  `json:"jindieid" gorm:"column:g_jindie_id;type:bigint(20) unsigned;default:0;not null;comment:金蝶ID"` //金蝶ID
 }
 
 func (GroupForm *GroupForm) TableName() string {

server/router/examtestpage/grouphandle.go

@@ -5,14 +5,16 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+//集团框架相关处理数据
 type GroupHandleRouter struct{}
 
 func (g *GroupHandleRouter) InitGroupRouter(Router *gin.RouterGroup) {
 	shiyanCodeRouter := Router.Group("group")
 	var authorityApi = v1.ApiGroupApp.GroupHandleApiGroup.GroupHandleApi
 	{
-		shiyanCodeRouter.GET("/grouplist", authorityApi.GroupList)          // 获取集团架构列表
+		shiyanCodeRouter.GET("/grouplist", authorityApi.GroupList)                        // 获取集团架构列表
-		shiyanCodeRouter.POST("/getgroupinfo", authorityApi.GetGroupInfo)   // 获取集团详细信息
+		shiyanCodeRouter.POST("/getgroupinfo", authorityApi.GetGroupInfo)                 // 获取集团详细信息
-		shiyanCodeRouter.POST("/getgroupinfos", authorityApi.GetGroupInfos) // 获取集团详细信息
+		shiyanCodeRouter.POST("/getsubsidiaryinfo", authorityApi.GetSubsidiaryInfo)       // 获取子公司详细信息
+		shiyanCodeRouter.POST("/getgrouppositioninfo", authorityApi.GetGroupPositionInfo) // 获取工段详细信息
 	}
 }