Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

# Conflicts:
#	pkg/port/beego/controllers/web_client/excel_data_controller.go
添加 退货单导入

-package service
-
-import (
-	"fmt"
-
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/excelData/query"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
-)
-
-type ExcelDataService struct {
-}
-
-func NewExcelDataService(param map[string]interface{}) *ExcelDataService {
-	return &ExcelDataService{}
-}
-
-// 导出公司用户信息列表
-func (srv ExcelDataService) ExportCompanyUser(companyUserListQuery *query.CompanyUserListQuery) (ExportCompanyUserData, error) {
-	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(companyUserListQuery.Operator)
-	result, err := creationUserGateway.UserSearch(allied_creation_user.ReqUserSearch{
-		Limit:          10000,
-		CompanyId:      companyUserListQuery.Operator.CompanyId,
-		OrganizationId: 0,
-		DepartmentId:   0,
-		UserName:       companyUserListQuery.UserName,
-		DepName:        companyUserListQuery.DepartmentName,
-		Phone:          "",
-		UserType:       domain.UserTypeEmployee,
-		InOrgIds:       companyUserListQuery.Operator.OrgIds,
-	})
-	if err != nil {
-		return ExportCompanyUserData{}, fmt.Errorf("获取企业用户数据失败：%w", err)
-	}
-	return ExportCompanyUserData(result.Users), nil
-}
+package service
+
+import (
+	"fmt"
+
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/excelData/query"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
+)
+
+type ExcelDataService struct {
+}
+
+func NewExcelDataService(param map[string]interface{}) *ExcelDataService {
+	return &ExcelDataService{}
+}
+
+// 导出公司用户信息列表
+func (srv ExcelDataService) ExportCompanyUser(companyUserListQuery *query.CompanyUserListQuery) (ExportCompanyUserData, error) {
+	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(companyUserListQuery.Operator)
+	result, err := creationUserGateway.UserSearch(allied_creation_user.ReqUserSearch{
+		Limit:          10000,
+		CompanyId:      companyUserListQuery.Operator.CompanyId,
+		OrganizationId: 0,
+		DepartmentId:   0,
+		UserName:       companyUserListQuery.UserName,
+		DepName:        companyUserListQuery.DepartmentName,
+		Phone:          "",
+		UserType:       domain.UserTypeEmployee,
+		InOrgIds:       companyUserListQuery.Operator.OrgIds,
+	})
+	if err != nil {
+		return ExportCompanyUserData{}, fmt.Errorf("获取企业用户数据失败：%w", err)
+	}
+	return ExportCompanyUserData(result.Users), nil
+}
+
+// 导出共创用户信息列表
+func (srv ExcelDataService) ExportCooperationUser(companyUserListQuery *query.CompanyUserListQuery) (ExportCooperationUserData, error) {
+	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(companyUserListQuery.Operator)
+	result, err := creationUserGateway.UserSearch(allied_creation_user.ReqUserSearch{
+		Limit:          10000,
+		CompanyId:      companyUserListQuery.Operator.CompanyId,
+		OrganizationId: 0,
+		DepartmentId:   0,
+		UserName:       companyUserListQuery.UserName,
+		DepName:        companyUserListQuery.DepartmentName,
+		Phone:          "",
+		UserType:       domain.UserTypeCooperation,
+		InOrgIds:       companyUserListQuery.Operator.OrgIds,
+	})
+	if err != nil {
+		return ExportCooperationUserData{}, fmt.Errorf("获取企业用户数据失败：%w", err)
+	}
+	return ExportCooperationUserData(result.Users), nil
+}

-package service
-
-import (
-	"github.com/linmadan/egglib-go/utils/excel"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
-)
-
-//exportCompanyUserData 导出公司用户数据
-type ExportCompanyUserData []allied_creation_user.UserDetail
-
-var _ excel.ExcelMaker = (*ExportCompanyUserData)(nil)
-
-func (data ExportCompanyUserData) DataFieldList() []excel.DataField {
-	return []excel.DataField{
-		{EnName: "UserCode", CnName: "用户编码"},
-		{EnName: "UserName", CnName: "用户姓名"},
-		{EnName: "Phone", CnName: "手机号"},
-		{EnName: "DepartmentName", CnName: "所属部门"},
-		{EnName: "EnableStatus", CnName: "状态"},
-		{EnName: "OrgName", CnName: "组织机构"},
-	}
-}
-
-func (data ExportCompanyUserData) CellValue(index int, enName string) (value interface{}) {
-	if index > data.DataListLen() {
-		return ""
-	}
-	switch enName {
-	case "UserCode":
-		return data[index].UserCode
-	case "UserName":
-		return data[index].UserInfo.UserName
-	case "Phone":
-		return data[index].UserInfo.Phone
-	case "DepartmentName":
-		if data[index].Department != nil {
-			return data[index].Department.DepartmentName
-		} else {
-			return ""
-		}
-	case "EnableStatus":
-		status := data[index].EnableStatus
-		statusName := ""
-		// 状态(1:启用  2:禁用  3:注销)
-		switch status {
-		case 1:
-			statusName = "启用"
-		case 2:
-			statusName = "禁用"
-		case 3:
-			statusName = "注销"
-		}
-		return statusName
-	case "OrgName":
-		if data[index].Org != nil {
-			return data[index].Org.OrgName
-		} else {
-			return ""
-		}
-	}
-	return nil
-}
-
-func (data ExportCompanyUserData) DataListLen() int {
-	return len(data)
-}
-
-func (data ExportCompanyUserData) TableTitle() []string {
-	return nil
-}
+package service
+
+import (
+	"github.com/linmadan/egglib-go/utils/excel"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
+)
+
+//exportCompanyUserData 导出公司用户数据
+type ExportCompanyUserData []allied_creation_user.UserDetail
+
+var _ excel.ExcelMaker = (*ExportCompanyUserData)(nil)
+
+func (data ExportCompanyUserData) DataFieldList() []excel.DataField {
+	return []excel.DataField{
+		{EnName: "UserCode", CnName: "用户编码"},
+		{EnName: "UserName", CnName: "用户姓名"},
+		{EnName: "Phone", CnName: "手机号"},
+		{EnName: "DepartmentName", CnName: "所属部门"},
+		{EnName: "EnableStatus", CnName: "状态"},
+		{EnName: "OrgName", CnName: "组织机构"},
+	}
+}
+
+func (data ExportCompanyUserData) CellValue(index int, enName string) (value interface{}) {
+	if index > data.DataListLen() {
+		return ""
+	}
+	switch enName {
+	case "UserCode":
+		return data[index].UserCode
+	case "UserName":
+		return data[index].UserInfo.UserName
+	case "Phone":
+		return data[index].UserInfo.Phone
+	case "DepartmentName":
+		if data[index].Department != nil {
+			return data[index].Department.DepartmentName
+		} else {
+			return ""
+		}
+	case "EnableStatus":
+		status := data[index].EnableStatus
+		statusName := ""
+		// 状态(1:启用  2:禁用  3:注销)
+		switch status {
+		case 1:
+			statusName = "启用"
+		case 2:
+			statusName = "禁用"
+		case 3:
+			statusName = "注销"
+		}
+		return statusName
+	case "OrgName":
+		if data[index].Org != nil {
+			return data[index].Org.OrgName
+		} else {
+			return ""
+		}
+	}
+	return nil
+}
+
+func (data ExportCompanyUserData) DataListLen() int {
+	return len(data)
+}
+
+func (data ExportCompanyUserData) TableTitle() []string {
+	return nil
+}
+
+//exportCompanyUserData 导出共创用户数据
+type ExportCooperationUserData []allied_creation_user.UserDetail
+
+var _ excel.ExcelMaker = (*ExportCooperationUserData)(nil)
+
+func (data ExportCooperationUserData) DataFieldList() []excel.DataField {
+	return []excel.DataField{
+		{EnName: "UserCode", CnName: "用户编码"},
+		{EnName: "UserName", CnName: "用户姓名"},
+		{EnName: "CooperationCompany", CnName: "合作公司"},
+		{EnName: "CooperationDeadline", CnName: "合作到期"},
+		{EnName: "Phone", CnName: "手机号"},
+		{EnName: "Email", CnName: "邮箱"},
+	}
+}
+
+func (data ExportCooperationUserData) CellValue(index int, enName string) (value interface{}) {
+	if index > data.DataListLen() {
+		return ""
+	}
+	switch enName {
+	case "UserCode":
+		return data[index].UserCode
+	case "UserName":
+		return data[index].UserInfo.UserName
+	case "CooperationCompany":
+		return data[index].CooperationInfo.CooperationCompany
+	case "CooperationDeadline":
+		return data[index].CooperationInfo.CooperationDeadline.Format("2006-01-02")
+	case "Phone":
+		return data[index].UserInfo.Phone
+	case "Email":
+		return data[index].UserInfo.Email
+	}
+	return nil
+}
+
+func (data ExportCooperationUserData) DataListLen() int {
+	return len(data)
+}
+
+func (data ExportCooperationUserData) TableTitle() []string {
+	return nil
+}

@@ -55,6 +55,33 @@ func (controller ExcelDataController) ExportCompanyUser() {
 	controller.responseExcelByFile(controller.Ctx, excelTool, "导出公司用户")
 }
 
+//导出共创用户
+func (controller ExcelDataController) ExportCooperationUser() {
+	excelService := service.NewExcelDataService(nil)
+	companyUserListQuery := &query.CompanyUserListQuery{}
+	err := controller.Unmarshal(companyUserListQuery)
+	if err != nil {
+		log.Logger.Debug("json err:" + err.Error())
+		controller.Response(nil, err)
+		return
+	}
+	companyUserListQuery.Operator = controller.GetOperator()
+	data, err := excelService.ExportCooperationUser(companyUserListQuery)
+	if err != nil {
+		log.Logger.Debug("excelService.ExportCompanyUser err:" + err.Error())
+		controller.Response(nil, err)
+		return
+	}
+	excelTool := excel.NewExcelExport()
+	err = excelTool.ExportData(data, "")
+	if err != nil {
+		log.Logger.Debug("excelTool.ExportData err:" + err.Error())
+		controller.Response(nil, err)
+		return
+	}
+	controller.responseExcelByFile(controller.Ctx, excelTool, "导出共创用户")
+}
+
 func (controller ExcelDataController) ImportDividendsReturnedOrder() {
 	excelFile, fileHeader, err := controller.GetFile("file")
 	if err != nil {

-package routers
-
-import (
-	"github.com/beego/beego/v2/server/web"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego/controllers/web_client"
-)
-
-func init() {
-	web.Router("/v1/web/excel/export/company-user", &web_client.ExcelDataController{}, "Post:ExportCompanyUser")
-}
+package routers
+
+import (
+	"github.com/beego/beego/v2/server/web"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego/controllers/web_client"
+)
+
+func init() {
+	web.Router("/v1/web/excel/export/company-user", &web_client.ExcelDataController{}, "Post:ExportCompanyUser")
+	web.Router("/v1/web/excel/export/cooperation-user", &web_client.ExcelDataController{}, "Post:ExportCooperationUser")
+}