切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
Your Name
3 years ago
提交
b4fb2eb5e7ed4e485d31955ad4cfb444baf89d80
2 个父辈
779c4fda
57fc7959
Merge branch 'dev' into test
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
16 行增加
和
16 行删除
pkg/port/beego/controllers/web_client/excel_data_controller.go
pkg/port/beego/controllers/web_client/system_setting_controller.go.go
pkg/port/beego/controllers/web_client/excel_data_controller.go
查看文件 @
b4fb2eb
...
...
@@ -44,7 +44,7 @@ func (controller *ExcelDataController) fieldValueAllEmpty(param map[string]strin
}
//导出公司用户
func
(
controller
ExcelDataController
)
ExportCompanyUser
()
{
func
(
controller
*
ExcelDataController
)
ExportCompanyUser
()
{
excelService
:=
service
.
NewExcelDataService
(
nil
)
companyUserListQuery
:=
&
query
.
CompanyUserListQuery
{}
err
:=
controller
.
Unmarshal
(
companyUserListQuery
)
...
...
@@ -71,7 +71,7 @@ func (controller ExcelDataController) ExportCompanyUser() {
}
//导出共创用户
func
(
controller
ExcelDataController
)
ExportCooperationUser
()
{
func
(
controller
*
ExcelDataController
)
ExportCooperationUser
()
{
excelService
:=
service
.
NewExcelDataService
(
nil
)
companyUserListQuery
:=
&
query
.
CompanyUserListQuery
{}
err
:=
controller
.
Unmarshal
(
companyUserListQuery
)
...
...
@@ -98,11 +98,11 @@ func (controller ExcelDataController) ExportCooperationUser() {
}
// ImportDividendsOrder TODO 导入分红订单
func
(
controller
ExcelDataController
)
ImportDividendsOrder
()
{
func
(
controller
*
ExcelDataController
)
ImportDividendsOrder
()
{
importDividendsOrder
(
controller
)
}
func
importDividendsOrder
(
controller
ExcelDataController
)
{
func
importDividendsOrder
(
controller
*
ExcelDataController
)
{
fileReader
,
err
:=
controller
.
GetExcelFile
()
if
err
!=
nil
{
...
...
@@ -161,11 +161,11 @@ func importDividendsOrder(controller ExcelDataController) {
}
// ImportDividendsReturnedOrder 导入分红退货单
func
(
controller
ExcelDataController
)
ImportDividendsReturnedOrder
()
{
func
(
controller
*
ExcelDataController
)
ImportDividendsReturnedOrder
()
{
importDividendsReturnedOrder
(
controller
)
}
func
importDividendsReturnedOrder
(
controller
ExcelDataController
)
{
func
importDividendsReturnedOrder
(
controller
*
ExcelDataController
)
{
fileReader
,
err
:=
controller
.
GetExcelFile
()
if
err
!=
nil
{
...
...
@@ -223,10 +223,10 @@ func importDividendsReturnedOrder(controller ExcelDataController) {
controller
.
Response
(
result
,
nil
)
}
func
(
controller
ExcelDataController
)
ImportCompanyUser
()
{
func
(
controller
*
ExcelDataController
)
ImportCompanyUser
()
{
importCompanyUser
(
controller
)
}
func
importCompanyUser
(
controller
ExcelDataController
)
{
func
importCompanyUser
(
controller
*
ExcelDataController
)
{
excelService
:=
service
.
NewExcelDataService
(
nil
)
r
,
err
:=
controller
.
GetExcelFile
()
if
err
!=
nil
{
...
...
@@ -240,10 +240,10 @@ func importCompanyUser(controller ExcelDataController) {
controller
.
Response
(
data
,
err
)
}
func
(
controller
ExcelDataController
)
ImportCooperationUser
()
{
func
(
controller
*
ExcelDataController
)
ImportCooperationUser
()
{
importCooperationUser
(
controller
)
}
func
importCooperationUser
(
controller
ExcelDataController
)
{
func
importCooperationUser
(
controller
*
ExcelDataController
)
{
excelService
:=
service
.
NewExcelDataService
(
nil
)
r
,
err
:=
controller
.
GetExcelFile
()
if
err
!=
nil
{
...
...
@@ -257,7 +257,7 @@ func importCooperationUser(controller ExcelDataController) {
controller
.
Response
(
data
,
err
)
}
func
(
controller
ExcelDataController
)
ImportOrganization
()
{
func
(
controller
*
ExcelDataController
)
ImportOrganization
()
{
excelService
:=
service
.
NewExcelDataService
(
nil
)
r
,
err
:=
controller
.
GetExcelFile
()
if
err
!=
nil
{
...
...
@@ -271,7 +271,7 @@ func (controller ExcelDataController) ImportOrganization() {
controller
.
Response
(
data
,
err
)
}
func
(
controller
ExcelDataController
)
FileImport
()
{
func
(
controller
*
ExcelDataController
)
FileImport
()
{
// excelService := service.NewExcelDataService(nil)
// r, err := controller.GetExcelFile()
// if err != nil {
...
...
@@ -301,7 +301,7 @@ func (controller ExcelDataController) FileImport() {
// controller.Response(data, err)
}
func
(
controller
ExcelDataController
)
FileImportTemplate
()
{
func
(
controller
*
ExcelDataController
)
FileImportTemplate
()
{
excelService
:=
service
.
NewExcelDataService
(
nil
)
cmd
:=
&
command
.
ImportDataCommand
{}
...
...
pkg/port/beego/controllers/web_client/system_setting_controller.go.go
查看文件 @
b4fb2eb
...
...
@@ -11,7 +11,7 @@ type SystemSettingController struct {
baseController
}
func
(
controller
SystemSettingController
)
SystemSettingSearch
()
{
func
(
controller
*
SystemSettingController
)
SystemSettingSearch
()
{
systemSettingService
:=
service
.
NewSystemSettingService
(
nil
)
settingListQuery
:=
&
query
.
SettingListQuery
{}
err
:=
controller
.
Unmarshal
(
settingListQuery
)
...
...
@@ -23,7 +23,7 @@ func (controller SystemSettingController) SystemSettingSearch() {
controller
.
Response
(
data
,
err
)
}
func
(
controller
SystemSettingController
)
SystemSettingGet
()
{
func
(
controller
*
SystemSettingController
)
SystemSettingGet
()
{
systemSettingService
:=
service
.
NewSystemSettingService
(
nil
)
q
:=
&
query
.
SettingGetQuery
{}
err
:=
controller
.
Unmarshal
(
q
)
...
...
@@ -36,7 +36,7 @@ func (controller SystemSettingController) SystemSettingGet() {
}
func
(
controller
SystemSettingController
)
SystemSettingUpdate
()
{
func
(
controller
*
SystemSettingController
)
SystemSettingUpdate
()
{
systemSettingService
:=
service
.
NewSystemSettingService
(
nil
)
q
:=
&
command
.
SettingUpdateCommand
{}
err
:=
controller
.
Unmarshal
(
q
)
...
...
请
注册
或
登录
后发表评论