master
wubin 5 years ago
parent a3b49f8d4f
commit 74d28bb6c6

@ -148,7 +148,7 @@ func ExportAreaManagerInfoExcel(c *gin.Context) {
// @Param page query int true "第几页"
// @Param limit query int true "一页显示多少条"
// @Param areaCode query string true "地区码"
// @Param orgType query int true "单位类型 2学校 7教辅单位 -1全部"
// @Param orgType query int true "单位类型 1:教育局 2学校 7教辅单位 -1全部"
// @Success 200 {object} Model.Res
// @Router /base/loginperson/PageBureauManagerInfo [get]
// @X-EmptyLimit ["page","limit","areaCode","orgType"]
@ -166,7 +166,7 @@ func PageBureauManagerInfo(c *gin.Context) {
limit := CommonUtil.ConvertStringToInt32(c.Query("limit"))
//地区码
areaCode := c.Query("areaCode")
//单位类型 2学校 7教辅单位 -1全部
//单位类型 1:教育局 2学校 7教辅单位 -1全部
orgType := CommonUtil.ConvertStringToInt32(c.Query("orgType"))
//操作人
actionPersonId, err := c.Cookie("person_id")
@ -201,7 +201,7 @@ func PageBureauManagerInfo(c *gin.Context) {
// @Accept application/x-www-form-urlencoded
// @Produce json
// @Param areaCode query string true "地区码"
// @Param orgType query int true "单位类型 2学校 7教辅单位 -1全部"
// @Param orgType query int true "单位类型 1:教育局 2学校 7教辅单位 -1全部"
// @Success 200 {object} Model.Res
// @Router /base/loginperson/ExportBureauManagerInfoExcel [get]
// @X-EmptyLimit ["areaCode","orgType"]

@ -15,7 +15,7 @@ func ExportAreaManagerInfoExcel(areaCode string, actionPersonId string, actionIp
}
func PageBureauManagerInfo(page int32, limit int32, areaCode string, orgType int32, actionPersonId string, actionIpAddress string) (*SysLoginpersonProto.Reply, error) {
orgTypeArr := []int32{2, 7}
orgTypeArr := []int32{1, 2, 7}
if orgType != -1 {
orgTypeArr = []int32{orgType}
}
@ -23,7 +23,7 @@ func PageBureauManagerInfo(page int32, limit int32, areaCode string, orgType int
return Reply, err
}
func ExportBureauManagerInfoExcel(areaCode string, orgType int32, actionPersonId string, actionIpAddress string) (*SysLoginpersonProto.Reply, error) {
orgTypeArr := []int32{2, 7}
orgTypeArr := []int32{1, 2, 7}
if orgType != -1 {
orgTypeArr = []int32{orgType}
}

@ -13,7 +13,6 @@ require (
github.com/bndr/gotabulate v1.1.2 // indirect
github.com/elastic/go-elasticsearch/v6 v6.8.10 // indirect
github.com/elastic/go-elasticsearch/v7 v7.8.0
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/garyburd/redigo v1.6.0
github.com/gin-gonic/gin v1.6.3
@ -23,7 +22,6 @@ require (
github.com/go-sql-driver/mysql v1.5.0
github.com/go-xorm/cmd/xorm v0.0.0-20190426080617-f87981e709a1 // indirect
github.com/golang/protobuf v1.4.2
github.com/golang/snappy v0.0.1 // indirect
github.com/imdario/mergo v0.3.9
github.com/olivere/elastic/v7 v7.0.17
github.com/pkg/errors v0.9.1
@ -31,7 +29,6 @@ require (
github.com/sirupsen/logrus v1.6.0
github.com/swaggo/gin-swagger v1.2.0
github.com/swaggo/swag v1.5.1
github.com/syndtr/goleveldb v1.0.0 // indirect
github.com/tealeg/xlsx v1.0.5 // indirect
github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect
github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31

Loading…
Cancel
Save