allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 6bb7aeed6ea3432ec5b827a02569a6b5a635498f 1 个父辈 9089cb29

导入修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 59 行增加 和 57 行删除
@@ -131,6 +131,7 @@ func extQuires(operator domain.Operator) []*allied_creation_cooperation.SearchCo @@ -131,6 +131,7 @@ func extQuires(operator domain.Operator) []*allied_creation_cooperation.SearchCo
131 Limit: 100, 131 Limit: 100,
132 Offset: 0, 132 Offset: 0,
133 UserBaseId: operator.UserBaseId, 133 UserBaseId: operator.UserBaseId,
  134 + EnableStatus: domain.UserStatusEnable,
134 }) 135 })
135 if err != nil { 136 if err != nil {
136 return extQueries 137 return extQueries
@@ -139,7 +140,7 @@ func extQuires(operator domain.Operator) []*allied_creation_cooperation.SearchCo @@ -139,7 +140,7 @@ func extQuires(operator domain.Operator) []*allied_creation_cooperation.SearchCo
139 u := users.Users[i] 140 u := users.Users[i]
140 q := &allied_creation_cooperation.SearchCooperationProjectExtQuery{ 141 q := &allied_creation_cooperation.SearchCooperationProjectExtQuery{
141 ExtCompanyId: int64(u.Company.CompanyId), 142 ExtCompanyId: int64(u.Company.CompanyId),
142 - ExtOrgId: int64(u.Org.OrgId), 143 + //ExtOrgId: int64(u.Org.OrgId),
143 //ExtOrgIds: int64(u.UserOrg), 144 //ExtOrgIds: int64(u.UserOrg),
144 ExtUserId: int64(u.UserId), 145 ExtUserId: int64(u.UserId),
145 ExtUserBaseId: int64(u.UserBaseId), 146 ExtUserBaseId: int64(u.UserBaseId),
@@ -119,58 +119,60 @@ func (srv ExcelDataService) ImportCompanyUser2(importDataCommand *command.Import @@ -119,58 +119,60 @@ func (srv ExcelDataService) ImportCompanyUser2(importDataCommand *command.Import
119 119
120 // ImportCooperationUser 导入共创用户信息 120 // ImportCooperationUser 导入共创用户信息
121 func (srv ExcelDataService) ImportCooperationUser(importDataCommand *command.ImportDataCommand) (interface{}, error) { 121 func (srv ExcelDataService) ImportCooperationUser(importDataCommand *command.ImportDataCommand) (interface{}, error) {
122 - //initPassword, _, err := domainService.GetInitPassword(importDataCommand.Operator)  
123 - //if err != nil {  
124 - // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())  
125 - //}  
126 - //excelImport := excel.NewExcelImport()  
127 - //excelImport.RowBegin = 2 //第二行开始读取  
128 - //excelImport.DataFields = []excel.DataField{  
129 - // {EnName: "UserCode", CnName: "*用户编号"},  
130 - // {EnName: "UserName", CnName: "*用户姓名"},  
131 - // {EnName: "CooperationCompany", CnName: "*合伙公司"},  
132 - // {EnName: "CooperationDeadline", CnName: "*合伙到期"},  
133 - // {EnName: "Phone", CnName: "*手机号"},  
134 - // {EnName: "Email", CnName: "邮箱"},  
135 - //}  
136 - //excelData, err := excelImport.OpenExcelFromIoReader(importDataCommand.Reader)  
137 - //if err != nil {  
138 - // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())  
139 - //}  
140 - //users := make([]allied_creation_user.BatchAddUserItem, 0)  
141 - //var fail int  
142 - //for _, v := range excelData {  
143 - // item := allied_creation_user.BatchAddUserItem{  
144 - // CompanyID: importDataCommand.Operator.CompanyId,  
145 - // UserType: domain.UserTypeCooperation,  
146 - // UserCode: v["UserCode"],  
147 - // OrganizationID: int(importDataCommand.Operator.OrgId),  
148 - // UserInfo: allied_creation_user.BatchAddUserItemUserInfo{  
149 - // UserName: v["UserName"],  
150 - // Phone: v["Phone"],  
151 - // Email: v["Email"],  
152 - // },  
153 - // CooperationInfo: allied_creation_user.BatchAddUserItemCooperationInfo{  
154 - // CooperationCompany: v["CooperationCompany"],  
155 - // },  
156 - // }  
157 - // item.CooperationInfo.CooperationDeadline, err = time.Parse("2006-01-02", v["CooperationDeadline"])  
158 - // if err != nil {  
159 - // fail++  
160 - // continue  
161 - // }  
162 - // users = append(users, item)  
163 - //}  
164 - //userGateway := allied_creation_user.NewHttplibAlliedCreationUser(importDataCommand.Operator)  
165 - //result, err := userGateway.UserBatchAdd(allied_creation_user.ReqBatchAddUser{  
166 - // Users: users,  
167 - // Password: initPassword,  
168 - //})  
169 - //if err != nil {  
170 - // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())  
171 - //}  
172 - //return result, nil  
173 - return nil, nil 122 + initPassword, _, err := domainService.GetInitPassword(importDataCommand.Operator)
  123 + if err != nil {
  124 + return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
  125 + }
  126 + userGateway := allied_creation_user.NewHttplibAlliedCreationUser(importDataCommand.Operator)
  127 + orgResult, err := userGateway.OrgGet(allied_creation_user.ReqOrgGet{
  128 + OrgId: int(importDataCommand.Operator.OrgId),
  129 + })
  130 + if err != nil {
  131 + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
  132 + }
  133 + excelImport := excel.NewExcelImport()
  134 + excelImport.RowBegin = 3 //第二行开始读取
  135 + excelImport.DataFields = []excel.DataField{
  136 + {EnName: "userCode", CnName: "*用户编码"},
  137 + {EnName: "userName", CnName: "*用户姓名"},
  138 + {EnName: "cooperationCompany", CnName: "*合伙公司"},
  139 + {EnName: "cooperationDeadline", CnName: "*合伙到期"},
  140 + {EnName: "enableStatus", CnName: "*用户状态"},
  141 + {EnName: "phone", CnName: "*手机号"},
  142 + {EnName: "email", CnName: "邮箱"},
  143 + }
  144 + excelData, err := excelImport.OpenExcelFromIoReader(importDataCommand.Reader)
  145 + if err != nil {
  146 + return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
  147 + }
  148 + users := make([]allied_creation_user.BatchAddUserItem, 0)
  149 + for _, v := range excelData {
  150 + if srv.fieldValueAllEmpty(v) {
  151 + continue
  152 + }
  153 + item := allied_creation_user.BatchAddUserItem{
  154 + CompanyId: importDataCommand.Operator.CompanyId,
  155 + UserType: domain.UserTypeCooperation,
  156 + UserCode: v["userCode"],
  157 + Org: orgResult.OrgCode,
  158 + UserName: strings.TrimSpace(v["userName"]),
  159 + Phone: strings.TrimSpace(v["phone"]),
  160 + Email: strings.TrimSpace(v["email"]),
  161 + EnableStatus: strings.TrimSpace(v["enableStatus"]),
  162 + CooperationCompany: v["cooperationCompany"],
  163 + CooperationDeadline: v["cooperationDeadline"],
  164 + }
  165 + users = append(users, item)
  166 + }
  167 +
  168 + result, err := userGateway.UserBatchAdd(allied_creation_user.ReqBatchAddUser{
  169 + Users: users,
  170 + Password: initPassword,
  171 + })
  172 + if err != nil {
  173 + return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
  174 + }
  175 + return srv.importResultWithHeader(excelImport.DataFields, result.FailRows, len(users)), nil
174 } 176 }
175 177
176 // ImportCompanyUser 导入公司用户信息 178 // ImportCompanyUser 导入公司用户信息
@@ -299,9 +301,8 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import @@ -299,9 +301,8 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import
299 domain.ImportCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807485_EaxECeRz23WpzrMZmbwdEPRJ3Pdxpx5X.xlsx", 301 domain.ImportCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807485_EaxECeRz23WpzrMZmbwdEPRJ3Pdxpx5X.xlsx",
300 domain.ImportOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807490_r2XWhGmbWWmpbeePBkZ3EJQFKcZEMpEm.xlsx", 302 domain.ImportOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807490_r2XWhGmbWWmpbeePBkZ3EJQFKcZEMpEm.xlsx",
301 domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210917/object/1631843469_DykNwexeYYtzxzbwsER5RrzCS7QRwGmd.xlsx", 303 domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210917/object/1631843469_DykNwexeYYtzxzbwsER5RrzCS7QRwGmd.xlsx",
302 - // 模板待更新  
303 - domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",  
304 - domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx", 304 + domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210918/object/1631932960_fen6RZS7ZesyDPMzXactKKCenhRMkfRb.xlsx",
  305 + domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210918/object/1631933214_MbTxsQtnEEMprHADFR6MedfZBkxYWBYA.xlsx",
305 } 306 }
306 var url string 307 var url string
307 var ok bool 308 var ok bool
@@ -397,7 +397,7 @@ type ( @@ -397,7 +397,7 @@ type (
397 // 共创公司 cooperationCompany 397 // 共创公司 cooperationCompany
398 CooperationCompany string `json:"cooperationCompany"` 398 CooperationCompany string `json:"cooperationCompany"`
399 // 共创到期时间 （yyyy-MM-dd） cooperationDeadline 399 // 共创到期时间 （yyyy-MM-dd） cooperationDeadline
400 - CooperationDeadline time.Time `json:"cooperationDeadline"` 400 + CooperationDeadline string `json:"cooperationDeadline"`
401 // 失败理由 401 // 失败理由
402 FailReason string `json:"failReason"` 402 FailReason string `json:"failReason"`
403 } 403 }