调整包名

.gitignore

@@ -7,12 +7,12 @@
 /binlog/*.log
 /*.pdf
 /static/20200723162432.xlsx
-/hongze_admin.tar.gz
-/hongze_admin
+/hz_crm_api.tar.gz
+/hz_crm_api
 /static/searchKeywordCount.xlsx
 .DS_Store
 /doc/
 *DS_Store
 /static/images/*.svg
-hongze_admin.exe
-hongze_admin.exe~
+hz_crm_api.exe
+hz_crm_api.exe~

README.en.md

@@ -1,36 +0,0 @@
-# hongze_crm
-
-#### Description
-弘则研究管理后台
-
-#### Software Architecture
-Software architecture description
-
-#### Instation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +0,0 @@
-# hongze_crm
-
-#### 介绍
-弘则研究管理后台
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

cache/admin_operate_record_cache.go

@@ -2,8 +2,8 @@ package cache
 
 import (
 	"fmt"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/utils"
 )
 
 func AdminOperateRecord(adminId int, realName, uuid, uri, params, ip, userAgent, header string) bool {

cache/crm_config_cache.go

@@ -2,8 +2,8 @@ package cache
 
 import (
 	"fmt"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )
@@ -15,22 +15,21 @@ func GetIntervalFromCrmConfig(key string) int {
 	var err error
 	if sIntervals == nil {
 		//redis没查到，去数据库查
-		interval,err = company.GetConfigValueByCode(key)
+		interval, err = company.GetConfigValueByCode(key)
 		if err != nil {
 			fmt.Println("GetConfigValueByCode Err:" + err.Error())
 		}
 		//插入redis
-		if !utils.Rc.SetNX(key, interval, 2*time.Hour){
+		if !utils.Rc.SetNX(key, interval, 2*time.Hour) {
 			fmt.Println("setNX Err")
 		}
 		return interval
 	} else {
-		intervals := fmt.Sprintf("%s",sIntervals)
-		interval,err = strconv.Atoi(intervals)
+		intervals := fmt.Sprintf("%s", sIntervals)
+		interval, err = strconv.Atoi(intervals)
 		if err != nil {
 			fmt.Println("strconv err:", err.Error())
 		}
 		return interval
 	}
 }
-

cache/logs_cache.go

@@ -2,12 +2,12 @@ package cache
 
 import (
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 
-//record more information
+// record more information
 func RecordNewLogs(adminId int, request, response string, realName, operateIp, model string) bool {
 	log := &models.OperateLogs{AdminId: adminId, SysUserRealName: realName, OperateTime: time.Now(), Request: request, Response: response, OperateIp: operateIp, Model: model}
 	if utils.Re == nil {

cache/yb_config_cache.go

@@ -2,14 +2,14 @@ package cache
 
 import (
 	"fmt"
-	"hongze/hongze_admin/models/yb"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models/yb"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )
 
 func GetYbConfigIntValueByCode(key string) (num int, err error) {
-	redisKey := utils.CACHE_ADMIN_YB_CONFIG+key
+	redisKey := utils.CACHE_ADMIN_YB_CONFIG + key
 	max := utils.Rc.Get(redisKey)
 	var item *yb.Config
 	if max == nil {
@@ -22,12 +22,12 @@ func GetYbConfigIntValueByCode(key string) (num int, err error) {
 			return
 		}
 		//插入redis
-		if !utils.Rc.SetNX(redisKey, num, 2*time.Hour){
+		if !utils.Rc.SetNX(redisKey, num, 2*time.Hour) {
 			fmt.Println("setNX Err")
 		}
 		return
-	}else {
-		num, err = strconv.Atoi(fmt.Sprintf("%s",max))
+	} else {
+		num, err = strconv.Atoi(fmt.Sprintf("%s", max))
 		return
 	}
-}
+}

controllers/advisory/article.go

@@ -3,11 +3,11 @@ package advisory
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/advisory"
-	"hongze/hongze_admin/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/advisory"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )
@@ -16,7 +16,7 @@ type AdminBaseArticleController struct {
 	controllers.BaseCommonController
 }
 
-//管理端——资讯文章模块
+// 管理端——资讯文章模块
 type AdminArticleController struct {
 	controllers.BaseAuthController
 }
@@ -251,7 +251,7 @@ func (this *AdminArticleController) FirstPreservation() {
 // @Param   LinkName   query   string  true       "链接名称"
 // @Param   LinkAddress   query   string  true       "链接地址"
 // @Param   ArticleId   query   string  true       "文章ID"
-//@Success 200 修改成功
+// @Success 200 修改成功
 // @router /edit [post]
 func (this *AdminArticleController) Edit() {
 	br := new(models.BaseResponse).Init()
@@ -472,8 +472,6 @@ func (this *AdminArticleController) Unpublish() {
 	br.Msg = "取消成功"
 }
 
-
-
 // @Title 资讯接口
 // @Description 列表
 // @Param   PageSize   query   int  true       "每页数据条数"
@@ -561,7 +559,6 @@ func (this *AdminArticleController) List() {
 	br.Data = resp
 }
 
-
 // @Title 资讯接口 文章详情
 // @Description 通过Code获取文章详情
 // @Param   Code   query   string  true       "文章code"
@@ -597,7 +594,6 @@ func (this *AdminArticleController) ArticleCode() {
 	br.Data = userArticleInfo
 }
 
-
 // @Title 资讯接口 获取网站PV，Uv
 // @Description 获取网站PV，Uv
 // @Success  Ret=200 {object} advisory.PvAndUvResp
@@ -615,7 +611,7 @@ func (this *AdminArticleController) GetPVAndUv() {
 		br.Ret = 408
 		return
 	}
-	resp,err := advisory.GetPVAndUv()
+	resp, err := advisory.GetPVAndUv()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

controllers/advisory/user.go

@@ -1,19 +1,16 @@
 package advisory
 
 import (
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/advisory"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/advisory"
 )
 
-
-//每日资讯
+// 每日资讯
 type AdminUserController struct {
 	controllers.BaseAuthController
 }
 
-
-
 // @Title 获取关注的所有分类
 // @Description 获取关注的所有分类接口
 // @Success Ret=200 {object} models.MyChartPermissionResp

controllers/ai/ai.go

@@ -3,11 +3,11 @@ package ai
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/aimod"
-	"hongze/hongze_admin/services/aiser"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/aimod"
+	"hongze/hz_crm_api/services/aiser"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/banner.go

@@ -3,9 +3,9 @@ package controllers
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path"
 	"time"

controllers/base_auth.go

@@ -3,10 +3,10 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/cache"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
+	"hongze/hz_crm_api/cache"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -15,8 +15,8 @@ import (
 
 	"github.com/beego/beego/v2/server/web"
 
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/utils"
 
 	"github.com/rdlucklib/rdluck_tools/log"
 )

controllers/base_common.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
-	"hongze/hongze_admin/cache"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/cache"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/utils"
 	"net/http"
 	"net/url"
 )

controllers/business_trip/business_apply.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/business_trip"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/business_trip"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/business_trip/business_approve.go

@@ -3,12 +3,12 @@ package business_trip
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/business_trip"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/business_trip"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/business_trip/business_calendar.go

@@ -2,9 +2,9 @@ package business_trip
 
 import (
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/business_trip"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/business_trip"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/classify.go

@@ -3,10 +3,10 @@ package controllers
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/yb"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/yb"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 

controllers/cloud_disk.go

@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path"
 	"strconv"

controllers/commodity_trade_base_index.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -2266,17 +2266,17 @@ type EicDataV2 struct {
 	Name               string      `json:"name" description:"指标名称"`
 	Code               string      `json:"code" description:"指标编码"`
 	GasDayStart        string      `json:"gasDayStart" description:"指标日期"`
-	GasInStorage       float64      `json:"gasInStorage" description:"储存容量"`
+	GasInStorage       float64     `json:"gasInStorage" description:"储存容量"`
 	Consumption        string      `json:"consumption" description:"消耗"`
 	ConsumptionFull    string      `json:"consumptionFull" description:"消耗百分比"`
-	Injection          float64      `json:"injection" description:"注入量"`
-	Withdrawal         float64      `json:"withdrawal" description:"减少量"`
-	WorkingGasVolume   float64      `json:"workingGasVolume" description:"工作气体量"`
-	InjectionCapacity  float64      `json:"injectionCapacity" description:"注入速度"`
-	WithdrawalCapacity float64      `json:"withdrawalCapacity" description:"减少速度"`
+	Injection          float64     `json:"injection" description:"注入量"`
+	Withdrawal         float64     `json:"withdrawal" description:"减少量"`
+	WorkingGasVolume   float64     `json:"workingGasVolume" description:"工作气体量"`
+	InjectionCapacity  float64     `json:"injectionCapacity" description:"注入速度"`
+	WithdrawalCapacity float64     `json:"withdrawalCapacity" description:"减少速度"`
 	Status             string      `json:"status" description:"状态"`
-	Trend              float64      `json:"trend" description:"较前日对比"`
-	Full               float64      `json:"full" description:"储存容量百分比"`
+	Trend              float64     `json:"trend" description:"较前日对比"`
+	Full               float64     `json:"full" description:"储存容量百分比"`
 	Info               string      `json:"info" description:"信息"`
 	Children           []EicDataV2 `json:"children"`
 }
@@ -2495,7 +2495,7 @@ func (this *TradeCommonController) EicDataListV2() {
 	i := 0
 	var data []data_manage.BaseFromTradeEicIndexV2
 	for _, ssoItem := range ssoItems {
-		if ssoItem.Parent == name{
+		if ssoItem.Parent == name {
 			data = append(data, ssoItem)
 			for _, facItem := range facItems {
 				if facItem.Parent == ssoItem.Name {
@@ -2510,4 +2510,4 @@ func (this *TradeCommonController) EicDataListV2() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = data
-}
+}

controllers/company_apply.go

@@ -3,13 +3,13 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/contract"
-	"hongze/hongze_admin/models/contract/response"
-	"hongze/hongze_admin/services"
-	contractService "hongze/hongze_admin/services/contract"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/contract"
+	"hongze/hz_crm_api/models/contract/response"
+	"hongze/hz_crm_api/services"
+	contractService "hongze/hz_crm_api/services/contract"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/company_apply_v2.go

@@ -3,13 +3,13 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/company_apply"
-	contractService "hongze/hongze_admin/services/contract"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/company_apply"
+	contractService "hongze/hz_crm_api/services/contract"
+	"hongze/hz_crm_api/utils"
 	"sort"
 	"strconv"
 	"strings"
@@ -1087,9 +1087,9 @@ func (this *CompanyApplyController) ApplyBySystemContract() {
 		}
 		upgradeMap := make(map[int]int)
 		if utils.RunMode == "release" {
-			upgradeMap = map[int]int{22:39, 21:38, 20:37, 19:36}
+			upgradeMap = map[int]int{22: 39, 21: 38, 20: 37, 19: 36}
 		} else {
-			upgradeMap = map[int]int{22:37, 21:36, 20:35, 19:34}
+			upgradeMap = map[int]int{22: 37, 21: 36, 20: 35, 19: 34}
 		}
 
 		for _, chartPermissionId := range permissionArr {

controllers/company_approval.go

@@ -3,13 +3,13 @@ package controllers
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/contract"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/company_apply"
-	contractService "hongze/hongze_admin/services/contract"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/contract"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/company_apply"
+	contractService "hongze/hz_crm_api/services/contract"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/company_approval_message.go

@@ -2,9 +2,9 @@ package controllers
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/utils"
 	"strings"
 	"time"
 )

controllers/company_industry.go

@@ -1,12 +1,12 @@
 package controllers
 
 import (
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/utils"
 )
 
-//行业管理
+// 行业管理
 type CompanyIndustryController struct {
 	BaseAuthController
 }

controllers/company_operate.go

@@ -0,0 +1,216 @@
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/company_report_permission_log"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Tips: company控制器近万行代码了, GoLand打开都卡...分点函数到这个控制器来=_=!
+
+// Close
+// @Title 关闭客户
+// @Description 关闭客户
+// @Param	request	body company.CloseCompanyReq true "type json string"
+// @Success Ret=200 操作成功
+// @router /close [post]
+func (this *CompanyController) Close() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req company.CloseCompanyReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + e.Error()
+		return
+	}
+	if req.CompanyId <= 0 {
+		br.Msg = "参数异常！"
+		br.ErrMsg = "CompanyId:" + strconv.Itoa(req.CompanyId)
+		return
+	}
+	req.Remark = strings.TrimSpace(req.Remark)
+	if req.Remark == "" {
+		br.Msg = "请填写关闭理由"
+		return
+	}
+
+	// 权限暂时只给FICC管理员和超管
+	authArr := []string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN}
+	if !utils.InArrayByStr(authArr, sysUser.RoleTypeCode) {
+		br.Msg = "无权操作"
+		br.ErrMsg = "无权操作, RoleTypeCode: " + sysUser.RoleTypeCode
+		return
+	}
+
+	productId := utils.COMPANY_PRODUCT_FICC_ID
+	productName := utils.COMPANY_PRODUCT_FICC_NAME
+	product, e := company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
+	if e != nil {
+		br.Msg = "客户信息异常"
+		br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
+		return
+	}
+	if product.Status != utils.COMPANY_STATUS_TRY_OUT {
+		br.Msg = fmt.Sprintf("客户状态为: %s, 不可关闭", product.Status)
+		br.ErrMsg = fmt.Sprintf("客户%s状态为: %s, 不可关闭", product.CompanyName, product.Status)
+		return
+	}
+
+	// 客户权限
+	permissions, e := company.GetCompanyReportPermission(req.CompanyId, productId)
+	if e != nil {
+		br.Msg = "客户权限异常"
+		br.ErrMsg = "获取客户权限失败, Err: " + e.Error()
+		return
+	}
+
+	// 关闭客户
+	if e = company.CloseCompany(req.CompanyId, productId, req.Remark); e != nil {
+		br.Msg = "关闭失败"
+		br.ErrMsg = "关闭客户失败, Err: " + e.Error()
+		return
+	}
+
+	// 操作记录
+	go func() {
+		var err error
+		defer func() {
+			if err != nil {
+				alarm_msg.SendAlarmMsg("关闭客户-新增操作记录失败, Err: "+err.Error(), 3)
+			}
+		}()
+
+		remark := "关闭客户"
+		operation := utils.COMPANY_STATUS_CLOSE_FLAG
+		e = services.AddCompanyOperationRecord(req.CompanyId, product.SellerId, sysUser.AdminId, productId, sysUser.AdminId, product.CompanyName,
+			productName, sysUser.RealName, remark, operation, req.Remark, sysUser.RealName, "", utils.COMPANY_STATUS_CLOSE)
+		if e != nil {
+			err = fmt.Errorf("AddCompanyOperationRecord %s", e.Error())
+			return
+		}
+
+		// 权限关闭日志
+		logs := make([]*company_report_permission_log.CompanyReportPermissionLog, 0)
+		for _, p := range permissions {
+			l := &company_report_permission_log.CompanyReportPermissionLog{
+				CompanyReportPermissionId: p.CompanyReportPermissionId,
+				CompanyId:                 p.CompanyId,
+				ProductId:                 productId,
+				ProductName:               p.ProductName,
+				SysUserId:                 sysUser.AdminId,
+				SysUserName:               sysUser.RealName,
+				Remark:                    remark,
+				Operation:                 operation,
+				Status:                    p.Status,
+				CreateTime:                time.Now(),
+			}
+			logs = append(logs, l)
+		}
+		e = company_report_permission_log.MultiCreateCompanyReportPermissionLog(logs)
+		if e != nil {
+			err = fmt.Errorf("MultiCreateCompanyReportPermissionLog %s", e.Error())
+			return
+		}
+	}()
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// Close2Loss
+// @Title 关闭转流失
+// @Description 关闭转流失
+// @Param	request	body company.Close2LossReq true "type json string"
+// @Success Ret=200 操作成功
+// @router /close2loss [post]
+func (this *CompanyController) Close2Loss() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req company.Close2LossReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + e.Error()
+		return
+	}
+	if req.CompanyId <= 0 {
+		br.Msg = "参数异常！"
+		br.ErrMsg = "CompanyId:" + strconv.Itoa(req.CompanyId)
+		return
+	}
+
+	// 权限暂时只给FICC管理员和超管
+	authArr := []string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN}
+	if !utils.InArrayByStr(authArr, sysUser.RoleTypeCode) {
+		br.Msg = "无权操作"
+		br.ErrMsg = "无权操作, RoleTypeCode: " + sysUser.RoleTypeCode
+		return
+	}
+
+	productId := utils.COMPANY_PRODUCT_FICC_ID
+	productName := utils.COMPANY_PRODUCT_FICC_NAME
+	product, e := company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
+	if e != nil {
+		br.Msg = "客户信息异常"
+		br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
+		return
+	}
+	if product.Status != utils.COMPANY_STATUS_CLOSE {
+		br.Msg = fmt.Sprintf("客户状态为: %s, 不可转流失", product.Status)
+		br.ErrMsg = fmt.Sprintf("客户%s状态为: %s, 不可转流失", product.CompanyName, product.Status)
+		return
+	}
+
+	// 转流失
+	if e = company.Close2Loss(req.CompanyId, productId); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "关闭转流失失败, Err: " + e.Error()
+		return
+	}
+
+	// 操作记录
+	go func() {
+		remark := "关闭转流失"
+		operation := utils.COMPANY_STATUS_LOSE_FLAG
+		_ = services.AddCompanyOperationRecord(req.CompanyId, product.SellerId, sysUser.AdminId, productId, sysUser.AdminId, product.CompanyName,
+			productName, sysUser.RealName, remark, operation, remark, sysUser.RealName, "", utils.COMPANY_STATUS_LOSE)
+	}()
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

controllers/company_permission.go

@@ -3,10 +3,10 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/company_process.go

@@ -1,11 +1,11 @@
 package controllers
 
 import (
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
 )
 
-//流程管理
+// 流程管理
 type CompanyProcessController struct {
 	BaseAuthController
 }
@@ -45,8 +45,8 @@ func (this *CompanyProcessController) ProcessList() {
 		for key, item := range list {
 			if item.Operation == "approve" {
 				list[key].Remark = item.ApproveContent
-			} else if item.Operation == "edit_renewal_reason" || item.Operation == "add_try_out_reason" ||item.Operation == "add_renewal_reason"{
-					showButton = false
+			} else if item.Operation == "edit_renewal_reason" || item.Operation == "add_try_out_reason" || item.Operation == "add_renewal_reason" {
+				showButton = false
 			}
 		}
 	}

controllers/company_receive.go

@@ -3,11 +3,11 @@ package controllers
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"
@@ -23,7 +23,7 @@ type CompanyReceiveController struct {
 // @Description 获取组长/组员下销售不包括研究员等（根据部门、分组）接口
 // @Success 200 {object} company.ReceiveGroupSellersResp
 // @router /receive/seller/group [get]
-func (this *CompanyReceiveController) SellerList()  {
+func (this *CompanyReceiveController) SellerList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -41,7 +41,7 @@ func (this *CompanyReceiveController) SellerList()  {
 	condition := " and enabled=1 "
 	var pars []interface{}
 
-	roleCodeTypeStr :=""
+	roleCodeTypeStr := ""
 	switch productId {
 	case 0:
 		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_FICC_SELLER + `","` + utils.ROLE_TYPE_CODE_FICC_GROUP + `","` + utils.ROLE_TYPE_CODE_FICC_TEAM + `","` + utils.ROLE_TYPE_CODE_FICC_ADMIN + `","` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
@@ -51,7 +51,7 @@ func (this *CompanyReceiveController) SellerList()  {
 		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
 	}
 	if roleCodeTypeStr != "" {
-		condition += " and role_type_code in ("+roleCodeTypeStr+")"
+		condition += " and role_type_code in (" + roleCodeTypeStr + ")"
 	}
 	//先查询出所有的销售，再根据当前用户权限进行区分
 
@@ -63,7 +63,7 @@ func (this *CompanyReceiveController) SellerList()  {
 		return
 	}
 	fullGroupMap := make(map[int]*system.SysFullGroup)
-	for _, v := range fullGroups{
+	for _, v := range fullGroups {
 		fullGroupMap[v.GroupId] = v
 	}
 	var listGroup []company.ReceiveGroupSellers
@@ -72,7 +72,7 @@ func (this *CompanyReceiveController) SellerList()  {
 	groupListMap := make(map[int][]company.ReceiveGroupSellers)
 	teamListMap := make(map[int][]company.ReceiveGroupSellers)
 	departmentHasMap := make(map[int]bool)
-	groupHasMap  := make(map[int]bool)
+	groupHasMap := make(map[int]bool)
 	teamHasMap := make(map[int]bool)
 
 	sellerList, err := system.GetSysUserItemsOrderByCreated(condition, pars)
@@ -83,20 +83,20 @@ func (this *CompanyReceiveController) SellerList()  {
 	}
 	for _, v := range sellerList {
 		tmp := company.ReceiveGroupSellers{
-			AdminId: strconv.Itoa(v.AdminId),
+			AdminId:  strconv.Itoa(v.AdminId),
 			RealName: v.RealName,
 		}
 		if v.GroupId > 0 {
 			if groupInfo, ok := fullGroupMap[v.GroupId]; ok {
 				if groupInfo.ParentId > 0 {
 					teamListMap[v.GroupId] = append(teamListMap[v.GroupId], tmp)
-				}else{
+				} else {
 					groupListMap[groupInfo.GroupId] = append(groupListMap[groupInfo.GroupId], tmp)
 				}
-			}else {
+			} else {
 				departmentListMap[v.DepartmentId] = append(departmentListMap[v.DepartmentId], tmp)
 			}
-		}else if v.DepartmentId > 0{
+		} else if v.DepartmentId > 0 {
 			departmentListMap[v.DepartmentId] = append(departmentListMap[v.DepartmentId], tmp)
 		}
 	}
@@ -104,11 +104,11 @@ func (this *CompanyReceiveController) SellerList()  {
 		var team1 company.ReceiveGroupSellers
 		//处理小组
 		if groupInfo.ParentId > 0 {
-			if _, ok2 :=teamHasMap[groupInfo.GroupId]; !ok2 {
+			if _, ok2 := teamHasMap[groupInfo.GroupId]; !ok2 {
 				if len(teamListMap[groupInfo.GroupId]) > 0 {
 					team1 = company.ReceiveGroupSellers{
-						AdminId: "team_"+strconv.Itoa(groupInfo.GroupId),
-						RealName: groupInfo.GroupName,
+						AdminId:      "team_" + strconv.Itoa(groupInfo.GroupId),
+						RealName:     groupInfo.GroupName,
 						ChildrenList: teamListMap[groupInfo.GroupId],
 					}
 					teamHasMap[groupInfo.GroupId] = true
@@ -121,11 +121,11 @@ func (this *CompanyReceiveController) SellerList()  {
 		var group1 company.ReceiveGroupSellers
 		//处理大组
 		if groupInfo.ParentId == 0 {
-			if _, ok2 :=groupHasMap[groupInfo.GroupId]; !ok2 {
+			if _, ok2 := groupHasMap[groupInfo.GroupId]; !ok2 {
 				if len(groupListMap[groupInfo.GroupId]) > 0 {
 					group1 = company.ReceiveGroupSellers{
-						AdminId: "group_"+strconv.Itoa(groupInfo.GroupId),
-						RealName: groupInfo.GroupName,
+						AdminId:      "group_" + strconv.Itoa(groupInfo.GroupId),
+						RealName:     groupInfo.GroupName,
 						ChildrenList: groupListMap[groupInfo.GroupId],
 					}
 					groupHasMap[groupInfo.GroupId] = true
@@ -143,9 +143,9 @@ func (this *CompanyReceiveController) SellerList()  {
 		return
 	}
 	departmentMap := make(map[int]*system.SysDepartmentList)
-	for _, v := range departmentList{
+	for _, v := range departmentList {
 		departmentMap[v.DepartmentId] = v
-    }
+	}
 	for _, groupInfo := range departmentList {
 		var department1 company.ReceiveGroupSellers
 		//处理部门
@@ -168,7 +168,7 @@ func (this *CompanyReceiveController) SellerList()  {
 		br.Data = company.ReceiveGroupSellersResp{
 			List: listDepartment,
 		}
-	}else{
+	} else {
 		br.Data = company.ReceiveGroupSellersResp{
 			List: listGroup,
 		}
@@ -181,7 +181,7 @@ func (this *CompanyReceiveController) SellerList()  {
 // @Description 获取组长/组员下销售不包括研究员等（根据部门、分组）接口
 // @Success 200 {object} models.ReceiveSellerListResp
 // @router /receive/seller [get]
-func (this *CompanyReceiveController) List()  {
+func (this *CompanyReceiveController) List() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -209,15 +209,15 @@ func (this *CompanyReceiveController) List()  {
 
 	adminIds := this.GetString("AdminIds")
 	if adminIds != "" {
-		condition += " and admin_id in ("+adminIds+")"
+		condition += " and admin_id in (" + adminIds + ")"
 	}
 	realName := this.GetString("KeyWord")
 	if realName != "" {
-		condition += " and real_name like '%"+realName+"%'"
+		condition += " and real_name like '%" + realName + "%'"
 	}
 
 	productId := services.GetProductId(sysUser.RoleTypeCode)
-	roleCodeTypeStr :=""
+	roleCodeTypeStr := ""
 	switch productId {
 	case 0:
 		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_FICC_SELLER + `","` + utils.ROLE_TYPE_CODE_FICC_GROUP + `","` + utils.ROLE_TYPE_CODE_FICC_TEAM + `","` + utils.ROLE_TYPE_CODE_FICC_ADMIN + `","` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
@@ -227,7 +227,7 @@ func (this *CompanyReceiveController) List()  {
 		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
 	}
 	if roleCodeTypeStr != "" {
-		condition += " and role_type_code in ("+roleCodeTypeStr+")"
+		condition += " and role_type_code in (" + roleCodeTypeStr + ")"
 	}
 
 	//查询所有部门
@@ -238,7 +238,7 @@ func (this *CompanyReceiveController) List()  {
 		return
 	}
 	departmentNameMap := make(map[int]string)
-	for _, v := range departmentList{
+	for _, v := range departmentList {
 		departmentNameMap[v.DepartmentId] = v.DepartmentName
 	}
 
@@ -250,11 +250,11 @@ func (this *CompanyReceiveController) List()  {
 		return
 	}
 	departmentGroupNameMap := make(map[int]string)
-	for _, g := range fullGroups{
+	for _, g := range fullGroups {
 		if g.ParentGroupName != "" {
-			departmentGroupNameMap[g.GroupId] = g.DepartmentName+"/"+g.ParentGroupName+"/"+g.GroupName
-		}else{
-			departmentGroupNameMap[g.GroupId] = g.DepartmentName+"/"+g.GroupName
+			departmentGroupNameMap[g.GroupId] = g.DepartmentName + "/" + g.ParentGroupName + "/" + g.GroupName
+		} else {
+			departmentGroupNameMap[g.GroupId] = g.DepartmentName + "/" + g.GroupName
 		}
 	}
 	var list []*company.ReceiveSellerItemResp
@@ -267,7 +267,7 @@ func (this *CompanyReceiveController) List()  {
 	}
 	permissionAminIds := ""
 	for _, v := range sellerList {
-		permissionAminIds += ","+strconv.Itoa(v.AdminId)
+		permissionAminIds += "," + strconv.Itoa(v.AdminId)
 	}
 	var adminPermissions []*company.SellerCompanyPermission
 	permissionEnabledMap := make(map[int]int)
@@ -287,10 +287,10 @@ func (this *CompanyReceiveController) List()  {
 
 	for _, v := range sellerList {
 		tmp := &company.ReceiveSellerItemResp{
-			AdminId: v.AdminId,
+			AdminId:  v.AdminId,
 			RealName: v.RealName,
 		}
-		tmp.Enabled = 1  //默认是有权限的
+		tmp.Enabled = 1 //默认是有权限的
 		if p, ok := permissionEnabledMap[v.AdminId]; ok {
 			tmp.Enabled = p
 		}
@@ -299,7 +299,7 @@ func (this *CompanyReceiveController) List()  {
 			if name, ok := departmentGroupNameMap[v.GroupId]; ok {
 				tmp.DepartmentGroup = name
 			}
-		}else{
+		} else {
 			if name, ok := departmentNameMap[v.DepartmentId]; ok {
 				tmp.DepartmentGroup = name
 			}
@@ -318,7 +318,7 @@ func (this *CompanyReceiveController) List()  {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = company.ReceiveSellerListResp{
-		List: list,
+		List:   list,
 		Paging: page,
 	}
 	return
@@ -330,7 +330,7 @@ func (this *CompanyReceiveController) List()  {
 // @Param	request	body models.ChangeReceivePermissionReq true "type json string"
 // @Success 200 操作成功
 // @router /receive/permission/change [post]
-func (this *CompanyReceiveController) ChangePermission()  {
+func (this *CompanyReceiveController) ChangePermission() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -361,10 +361,10 @@ func (this *CompanyReceiveController) ChangePermission()  {
 	}
 	sellerInfo, err := system.GetSysAdminById(req.AdminId)
 	if err != nil {
-		if  err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
 			br.Msg = "销售不存在"
 			return
-		}else{
+		} else {
 			br.Msg = "查询销售出错！"
 			br.ErrMsg = "查询销售出错，Err:" + err.Error()
 			return
@@ -388,27 +388,27 @@ func (this *CompanyReceiveController) ChangePermission()  {
 			br.Success = true
 			br.Msg = "操作成功"
 			return
-		}else{
+		} else {
 			err = company.UpdateSellerCompanyPermissionEnabledById(sellerPermission.Id, req.Enabled)
-			if err !=nil {
+			if err != nil {
 				br.Msg = "更新权限状态失败！"
 				br.ErrMsg = "更新权限状态失败，Err:" + err.Error()
 				return
 			}
 		}
-	}else{
+	} else {
 		if req.Enabled == 1 {
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "操作成功"
 			return
-		}else{
+		} else {
 			// 禁用权限
 			sellerPermission = &company.SellerCompanyPermission{
-				AdminId: req.AdminId,
-				Enabled: req.Enabled,
-				CreateTime: now,
-				ModifyTime: now,
+				AdminId:        req.AdminId,
+				Enabled:        req.Enabled,
+				CreateTime:     now,
+				ModifyTime:     now,
 				PermissionType: 1,
 			}
 			err = company.AddSellerCompanyPermission(sellerPermission)
@@ -426,4 +426,4 @@ func (this *CompanyReceiveController) ChangePermission()  {
 	br.Success = true
 	br.Msg = "操作成功"
 	return
-}
+}

controllers/company_seller.go

@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 )
@@ -2363,3 +2363,140 @@ func (this *CompanySellerController) ShareSellerList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// RoadshowFiccList
+// @Title 路演FICC销售列表
+// @Description 路演FICC销售列表
+// @Success 200 {object} system.RoadshowGroupResp
+// @router /seller/roadshow_ficc/list [get]
+func (this *CompanySellerController) RoadshowFiccList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	resp := new(system.RoadshowGroupResp)
+	productId := services.GetProductId(sysUser.RoleTypeCode)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+
+	// 分组
+	departmentId := 2
+	groups, e := system.GetGroupByDepartmentId(departmentId)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取FICC分组失败, Err: " + e.Error()
+		return
+	}
+	teamGroupId := make(map[int]int, 0) // 小组ID对应的大组ID
+	var list []system.RoadshowGroups
+	for _, g := range groups {
+		if g.ParentId > 0 {
+			teamGroupId[g.GroupId] = g.ParentId
+			continue
+		}
+
+		// 大组
+		list = append(list, system.RoadshowGroups{
+			GroupId:   g.GroupId,
+			GroupName: g.GroupName,
+		})
+	}
+
+	// 销售
+	roleArr := []string{
+		utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_DEPARTMENT, utils.ROLE_TYPE_CODE_FICC_GROUP,
+		utils.ROLE_TYPE_CODE_FICC_TEAM, utils.ROLE_TYPE_CODE_FICC_SELLER,
+	}
+	cond := fmt.Sprintf(` AND role_type_code IN (%s)`, utils.GetOrmInReplace(len(roleArr)))
+	pars := make([]interface{}, 0)
+	pars = append(pars, roleArr)
+	sellers, e := system.GetSysUserItemsOrderByCreated(cond, pars)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取FICC销售失败, Err: " + e.Error()
+		return
+	}
+
+	groupIdChild := make(map[int][]system.RoadshowGroupSellers) // 大组ID对应的销售
+	for _, s := range sellers {
+		var seller system.RoadshowGroupSellers
+		seller.AdminId = s.AdminId
+		seller.AdminName = s.RealName
+
+		gid := teamGroupId[s.GroupId]
+		if gid > 0 {
+			// 小组
+			seller.GroupId = gid
+			seller.TeamId = s.GroupId
+		} else {
+			// 大组
+			seller.GroupId = s.GroupId
+		}
+		groupIdChild[seller.GroupId] = append(groupIdChild[seller.GroupId], seller)
+	}
+
+	// 根据当前角色过滤可选项
+
+	for _, v := range list {
+		// 如果是销售、组长、主管, 那么过滤掉自己大组外的其他组
+		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER {
+			if sysUser.GroupId != v.GroupId && teamGroupId[sysUser.GroupId] != v.GroupId {
+				continue
+			}
+		}
+		child := groupIdChild[v.GroupId]
+
+		// 如果是小组长, 那么只能看到自己小组的信息
+		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM {
+			var team []system.RoadshowGroupSellers
+			for _, c := range child {
+				if c.TeamId == sysUser.GroupId {
+					team = append(team, c)
+				}
+			}
+			v.Child = team
+			resp.List = append(resp.List, v)
+			continue
+		}
+
+		// 如果是普通销售, 那么只能看到分组中的自己
+		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER {
+			var self []system.RoadshowGroupSellers
+			for _, c := range child {
+				if c.AdminId == sysUser.AdminId {
+					self = append(self, c)
+					break
+				}
+			}
+			v.Child = self
+			resp.List = append(resp.List, v)
+			continue
+		}
+
+		// 非以上两种情况, 可见该大组所有销售
+		v.Child = child
+		resp.List = append(resp.List, v)
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

controllers/company_service_record.go

@@ -3,9 +3,9 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/utils"
 	"strings"
 	"time"
 )

controllers/company_share.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/company_todo.go

@@ -2,10 +2,10 @@ package controllers
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company_todo"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company_todo"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 
@@ -66,7 +66,6 @@ func (this *CompanyTodoController) Add() {
 		}
 	}
 
-
 	// 新增任务
 	errMsg, err := services.AddCompanyTodo(req.CompanyId, productId, description, endTime, this.SysUser)
 	if err != nil {
@@ -161,7 +160,7 @@ func (this *CompanyTodoController) List() {
 	var list []*company_todo.CompanyTodoListItem
 	for _, v := range todos {
 		temp := &company_todo.CompanyTodoListItem{
-		    CompanyTodo: v,
+			CompanyTodo: v,
 		}
 		temp.EndTimeStr = temp.EndTime.Format(utils.FormatDate)
 		if temp.EndTimeStr == "0001-01-01" {

controllers/company_user.go

@@ -6,17 +6,17 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/advisory"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/company_user"
-	"hongze/hongze_admin/models/company_user/request"
-	"hongze/hongze_admin/models/company_user/response"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/models/yb"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/elastic"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/advisory"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/company_user"
+	"hongze/hz_crm_api/models/company_user/request"
+	"hongze/hz_crm_api/models/company_user/response"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/models/yb"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/elastic"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path"
 	"path/filepath"

controllers/contract/contract.go

@@ -6,16 +6,16 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/shopspring/decimal"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/contract"
-	"hongze/hongze_admin/models/contract/request"
-	"hongze/hongze_admin/models/contract/response"
-	"hongze/hongze_admin/services"
-	contractService "hongze/hongze_admin/services/contract"
-	"hongze/hongze_admin/services/seal"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/contract"
+	"hongze/hz_crm_api/models/contract/request"
+	"hongze/hz_crm_api/models/contract/response"
+	"hongze/hz_crm_api/services"
+	contractService "hongze/hz_crm_api/services/contract"
+	"hongze/hz_crm_api/services/seal"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path"
 	"path/filepath"
@@ -104,7 +104,7 @@ func (this *ContractController) GetServiceTemplateList() {
 			}
 			for _, v := range upgradeList {
 				upgradeMap[v.ChartPermissionId-100000] = v
-				fmt.Println("v.ChartPermissionId-10000:",v.ChartPermissionId-100000)
+				fmt.Println("v.ChartPermissionId-10000:", v.ChartPermissionId-100000)
 			}
 			for _, v := range tmpList {
 				newTempList = append(newTempList, v)
@@ -2989,4 +2989,4 @@ func (this *ContractController) DetailMerge() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = contractInfo
-}
+}

controllers/contract/contract_approval.go

@@ -6,15 +6,15 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/shopspring/decimal"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/contract"
-	"hongze/hongze_admin/models/contract/request"
-	"hongze/hongze_admin/models/contract/response"
-	"hongze/hongze_admin/services"
-	contractService "hongze/hongze_admin/services/contract"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/contract"
+	"hongze/hz_crm_api/models/contract/request"
+	"hongze/hz_crm_api/models/contract/response"
+	"hongze/hz_crm_api/services"
+	contractService "hongze/hz_crm_api/services/contract"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -22,7 +22,7 @@ import (
 	"time"
 )
 
-//审批流管理
+// 审批流管理
 type ContractApprovalController struct {
 	controllers.BaseAuthController
 }

controllers/cygx/activity.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/cygx/activity_loss.go

@@ -1,11 +1,11 @@
 package cygx
 
 import (
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"strings"
 )
 

controllers/cygx/activity_meet.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/alarm_msg"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/alarm_msg"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/activity_signup.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"html/template"
 	"os"
 	"path/filepath"

controllers/cygx/activity_special.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/activity_special_trip.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/activity_video.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -15,7 +15,7 @@ import (
 	"time"
 )
 
-//活动
+// 活动
 type ActivityVideoCoAntroller struct {
 	controllers.BaseAuthController
 }

controllers/cygx/advice.go

@@ -1,11 +1,11 @@
 package cygx
 
 import (
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"strings"
 )
 

controllers/cygx/apply_record.go

@@ -3,10 +3,10 @@ package cygx
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 )
 
 // 权益小程序

controllers/cygx/banner.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"time"

controllers/cygx/cygx_activity_type.go

@@ -1,10 +1,10 @@
 package cygx
 
 import (
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"strings"
 )
 

controllers/cygx/industrial_analyst.go

@@ -2,14 +2,14 @@ package cygx
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
 	"strconv"
 	"time"
 )
 
-//分析师管理
+// 分析师管理
 type IndustrialAnalystController struct {
 	controllers.BaseAuthController
 }

controllers/cygx/industrial_management.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/industrial_subject.go

@@ -2,16 +2,16 @@ package cygx
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"
 )
 
-//标的管理
+// 标的管理
 type IndustrialSubjectController struct {
 	controllers.BaseAuthController
 }
@@ -627,4 +627,4 @@ func (this *IndustrialSubjectController) CountDetail() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
-}
+}

controllers/cygx/industry_map.go

@@ -2,14 +2,14 @@ package cygx
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
 	"time"
 )
 
-//权益小程序
+// 权益小程序
 type IndustryMapController struct {
 	controllers.BaseAuthController
 }

controllers/cygx/interview_apply.go

@@ -2,15 +2,15 @@ package cygx
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"strings"
 )
 
-//访谈申请
+// 访谈申请
 type InterviewApplyController struct {
 	controllers.BaseAuthController
 }
@@ -106,7 +106,6 @@ func (this *InterviewApplyController) List() {
 	resp.List = list
 	resp.Paging = page
 
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/cygx/micro_roadshow.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strings"

controllers/cygx/minutes_summary.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"regexp"
 	"strconv"
 	"strings"

controllers/cygx/morning_meeting_review.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/cygx/product_interior.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/report_article.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/report_selection.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/research_summary.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"regexp"
 	"strconv"
 	"strings"

controllers/cygx/roadshow_essence.go

@@ -3,12 +3,12 @@ package cygx
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/cygx/search_keyword.go

@@ -2,20 +2,20 @@ package cygx
 
 import (
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
 )
 
-//报告管理
+// 报告管理
 type SearchKeywordController struct {
 	controllers.BaseAuthController
 }

controllers/cygx/summary_manage.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/tactics_time_line.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/models/system"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/system"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"

controllers/cygx/user.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/company"
-	"hongze/hongze_admin/models/cygx"
-	"hongze/hongze_admin/services"
-	cygxService "hongze/hongze_admin/services/cygx"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"sort"

controllers/data_manage/baiinfo_data.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strings"
@@ -1018,11 +1018,10 @@ func (this *EdbInfoController) ExportBaiinfoList() {
 				if *frequency == "" {
 					newFrequency := "无频度"
 					sheet, err = xlsxFile.AddSheet(newFrequency)
-				}else {
+				} else {
 					sheet, err = xlsxFile.AddSheet(*frequency)
 				}
 
-
 				if err != nil {
 					br.Msg = "新增Sheet失败"
 					br.ErrMsg = "新增Sheet失败,Err:" + err.Error()

controllers/data_manage/base_from_changes_visitors_covid.go

@@ -1,12 +1,12 @@
 package data_manage
 
 import (
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
 )
 
-//谷歌出行数据
+// 谷歌出行数据
 type BaseFromChangesVisitorsCovidController struct {
 	controllers.BaseAuthController
 }

controllers/data_manage/chart_classify.go

@@ -3,12 +3,12 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/data_manage/chart_common.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
-	"hongze/hongze_admin/controllers/data_manage/correlation"
-	"hongze/hongze_admin/controllers/data_manage/future_good"
-	"hongze/hongze_admin/controllers/data_manage/line_equation"
-	"hongze/hongze_admin/controllers/data_manage/line_feature"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers/data_manage/correlation"
+	"hongze/hz_crm_api/controllers/data_manage/future_good"
+	"hongze/hz_crm_api/controllers/data_manage/line_equation"
+	"hongze/hz_crm_api/controllers/data_manage/line_feature"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/utils"
 )
 
 // CommonChartInfoDetailFromUniqueCode

controllers/data_manage/chart_edb_config.go

@@ -2,13 +2,13 @@ package data_manage
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/models/data_manage/response"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/models/data_manage/response"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 )
 
 // EdbNoPermissionList

controllers/data_manage/chart_info.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"os/exec"
 	"sort"

controllers/data_manage/com_trade.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 

controllers/data_manage/correlation/correlation_chart_classify.go

@@ -2,12 +2,12 @@ package correlation
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/data_manage/correlation/correlation_chart_info.go

@@ -4,14 +4,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/future_good/request"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	correlationServ "hongze/hongze_admin/services/data/correlation"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/future_good/request"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	correlationServ "hongze/hz_crm_api/services/data/correlation"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/data_manage/edb_classify.go

@@ -2,12 +2,12 @@ package data_manage
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 )
 
 // EdbClassifyController 数据管理-分类模块

controllers/data_manage/edb_info.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/services/elastic"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/services/elastic"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"sync"

controllers/data_manage/edb_info_calculate.go

@@ -3,11 +3,11 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"net/url"
 	"strconv"
 	"strings"

controllers/data_manage/edb_info_updates.go

@@ -3,10 +3,10 @@ package data_manage
 import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 

controllers/data_manage/eia_steo.go

@@ -3,9 +3,9 @@ package data_manage
 import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"time"
@@ -119,8 +119,8 @@ func (this *EdbInfoController) EiaSteoData() {
 		product := data_manage.EiaSteoIndexListResp{
 			BaseFromEiaSteoIndexId:    v.BaseFromEiaSteoIndexId,
 			BaseFromEiaSteoClassifyId: v.BaseFromEiaSteoClassifyId,
-			IndexCode:                  v.IndexCode,
-			IndexName:                  indexName,
+			IndexCode:                 v.IndexCode,
+			IndexName:                 indexName,
 			//IndexNameOriginal:          v.IndexNameOriginal,
 			Unit:       v.Unit,
 			Frequency:  v.Frequency,

controllers/data_manage/excel_classify.go

@@ -2,12 +2,12 @@ package data_manage
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/models/data_manage/response"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/models/data_manage/response"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/data_manage/excel_info.go

@@ -5,16 +5,16 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/yidane/formula"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/models/data_manage/response"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/services/excel"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/models/data_manage/response"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/services/excel"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"strconv"
 	"strings"

controllers/data_manage/future_good/future_good_chart_classify.go

@@ -3,12 +3,12 @@ package future_good
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/data_manage/future_good/future_good_chart_info.go

@@ -4,16 +4,16 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/future_good"
-	"hongze/hongze_admin/models/data_manage/future_good/request"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services"
-	"hongze/hongze_admin/services/data"
-	future_goodServ "hongze/hongze_admin/services/data/future_good"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/future_good"
+	"hongze/hz_crm_api/models/data_manage/future_good/request"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/services/data"
+	future_goodServ "hongze/hz_crm_api/services/data/future_good"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"os/exec"
 	"sort"

controllers/data_manage/future_good/future_good_edb_info.go

@@ -2,10 +2,10 @@ package future_good
 
 import (
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	future_good2 "hongze/hongze_admin/models/data_manage/future_good"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	future_good2 "hongze/hz_crm_api/models/data_manage/future_good"
+	"hongze/hz_crm_api/utils"
 )
 
 // FutureGoodEdbInfoController 期货数据

controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -3,15 +3,15 @@ package future_good
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/future_good"
-	"hongze/hongze_admin/models/data_manage/future_good/request"
-	"hongze/hongze_admin/models/data_manage/future_good/response"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	future_goodServ "hongze/hongze_admin/services/data/future_good"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/future_good"
+	"hongze/hz_crm_api/models/data_manage/future_good/request"
+	"hongze/hz_crm_api/models/data_manage/future_good/response"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	future_goodServ "hongze/hz_crm_api/services/data/future_good"
+	"hongze/hz_crm_api/utils"
 	"sort"
 	"strconv"
 	"strings"

controllers/data_manage/gl_data.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"time"
@@ -474,7 +474,6 @@ func (this *EdbInfoController) ExportGlList() {
 		}
 	}
 
-
 	err = xlsxFile.Save(downLoadnFilePath)
 	if err != nil {
 		//有指标无数据时先导出一遍空表

controllers/data_manage/line_equation/line_chart_classify.go

@@ -2,12 +2,12 @@ package line_equation
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/data_manage/line_equation/line_chart_info.go

@@ -4,15 +4,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/line_equation/request"
-	"hongze/hongze_admin/models/data_manage/line_equation/response"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/services/data/line_equation"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/line_equation/request"
+	"hongze/hz_crm_api/models/data_manage/line_equation/response"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/services/data/line_equation"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/data_manage/line_feature/chart_info.go

@@ -5,15 +5,15 @@ import (
 	"errors"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/line_feature/request"
-	"hongze/hongze_admin/models/data_manage/line_feature/response"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	lineFeatureServ "hongze/hongze_admin/services/data/line_feature"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/line_feature/request"
+	"hongze/hz_crm_api/models/data_manage/line_feature/response"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	lineFeatureServ "hongze/hz_crm_api/services/data/line_feature"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/data_manage/line_feature/classify.go

@@ -2,12 +2,12 @@ package line_feature
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )

controllers/data_manage/lz_data.go

@@ -3,10 +3,10 @@ package data_manage
 import (
 	"fmt"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_source"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_source"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -402,7 +402,7 @@ func (this *EdbInfoController) ExportLzList() {
 		lzCode := this.GetString("LzCode") //指标唯一编码
 		unit := this.GetString("UnitName")
 		modifyTime := this.GetString("ModifyTime")
-		frequency,_ := this.GetInt("Frequency")
+		frequency, _ := this.GetInt("Frequency")
 
 		sheet, err := xlsxFile.AddSheet("指标")
 		if err != nil {

controllers/data_manage/manual.go

@@ -3,12 +3,12 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/data_manage/multiple_graph_config.go

@@ -3,14 +3,14 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/models/data_manage/response"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	correlationServ "hongze/hongze_admin/services/data/correlation"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/models/data_manage/response"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	correlationServ "hongze/hz_crm_api/services/data/correlation"
+	"hongze/hz_crm_api/utils"
 	"math"
 	"strconv"
 	"strings"

controllers/data_manage/my_chart.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/data_manage/mysteel_chemical_data.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/models/data_manage/response"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/models/data_manage/response"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"sort"

controllers/data_manage/national_statistics.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"time"

controllers/data_manage/predict_edb_classify.go

@@ -2,12 +2,12 @@ package data_manage
 
 import (
 	"encoding/json"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/system"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 )
 
 // PredictEdbClassifyController 数据管理-预测指标分类模块

controllers/data_manage/predict_edb_info.go

@@ -3,14 +3,14 @@ package data_manage
 import (
 	"encoding/json"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_admin/controllers"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/models/data_manage/response"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/services/elastic"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/models/data_manage/response"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/services/elastic"
+	"hongze/hz_crm_api/utils"
 	"sort"
 	"strconv"
 	"strings"

controllers/data_manage/predict_edb_info_calculate.go

@@ -3,10 +3,10 @@ package data_manage
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"strings"
 	"time"
 )

controllers/data_manage/sci_data.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strings"
@@ -539,7 +539,7 @@ func (this *EdbInfoController) EditSci() {
 
 	resp := data_manage.EditSciIndexInfoResp{
 		BaseFromSciIndexId: sciIndexInfo.BaseFromSciIndexId,
-		IndexCode: sciIndexInfo.IndexCode,
+		IndexCode:          sciIndexInfo.IndexCode,
 	}
 	br.Data = resp
 	br.Ret = 200

controllers/data_manage/smm_data.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_admin/models"
-	"hongze/hongze_admin/models/data_manage"
-	"hongze/hongze_admin/models/data_manage/request"
-	"hongze/hongze_admin/services/alarm_msg"
-	"hongze/hongze_admin/services/data"
-	"hongze/hongze_admin/utils"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/data_manage"
+	"hongze/hz_crm_api/models/data_manage/request"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/services/data"
+	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
 	"strings"
@@ -539,7 +539,7 @@ func (this *EdbInfoController) EditSmm() {
 
 	resp := data_manage.EditSmmIndexInfoResp{
 		BaseFromSmmIndexId: smmIndexInfo.BaseFromSmmIndexId,
-		IndexCode: smmIndexInfo.IndexCode,
+		IndexCode:          smmIndexInfo.IndexCode,
 	}
 	br.Data = resp
 	br.Ret = 200