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

转到一个项目

作者 yangfu
提交 fdf59e267c1655b524f3baaf36faa865b7e01700 1 个父辈 ea9839ba

分页修改

内嵌 并排对比
正在显示 11 个修改的文件 包含 25 行增加 和 12 行删除
@@ -11,7 +11,7 @@ type ListCooperationApplicationQuery struct { @@ -11,7 +11,7 @@ type ListCooperationApplicationQuery struct {
11 //操作人 11 //操作人
12 Operator domain.Operator `json:"-"` 12 Operator domain.Operator `json:"-"`
13 // 查询偏离量 13 // 查询偏离量
14 - PageNumber int `json:"pageIndex" valid:"Required"` 14 + PageNumber int `json:"pageNumber" valid:"Required"`
15 // 查询限制 15 // 查询限制
16 PageSize int `json:"pageSize" valid:"Required"` 16 PageSize int `json:"pageSize" valid:"Required"`
17 //审核状态 17 //审核状态
@@ -11,7 +11,7 @@ type GoodsStatisticsCommand struct { @@ -11,7 +11,7 @@ type GoodsStatisticsCommand struct {
11 //操作人 11 //操作人
12 Operator domain.Operator `json:"-"` 12 Operator domain.Operator `json:"-"`
13 // 查询偏离量 13 // 查询偏离量
14 - PageNumber int `json:"pageIndex"` 14 + PageNumber int `json:"pageNumber"`
15 // 查询限制 15 // 查询限制
16 PageSize int `json:"pageSize" valid:"Required"` 16 PageSize int `json:"pageSize" valid:"Required"`
17 // 排行榜类型，1月榜，2年榜 3总榜，默认展示年榜 17 // 排行榜类型，1月榜，2年榜 3总榜，默认展示年榜
@@ -73,7 +73,7 @@ func (srv CooperationApplicationsService) SearchCooperationApplications(applicat @@ -73,7 +73,7 @@ func (srv CooperationApplicationsService) SearchCooperationApplications(applicat
73 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 73 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
74 applicationQuery.Operator) 74 applicationQuery.Operator)
75 resultApplications, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{ 75 resultApplications, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
76 - PageNumber: applicationQuery.PageNumber, 76 + PageNumber: applicationQuery.PageNumber + 1, //手机序号从0开始的
77 PageSize: applicationQuery.PageSize, 77 PageSize: applicationQuery.PageSize,
78 //CompanyId: int(applicationQuery.Operator.CompanyId), 78 //CompanyId: int(applicationQuery.Operator.CompanyId),
79 OrgId: applicationQuery.Operator.OrgId, 79 OrgId: applicationQuery.Operator.OrgId,
@@ -156,7 +156,7 @@ func (srv CooperationApplicationsService) PersonSearchCooperationApplications(ap @@ -156,7 +156,7 @@ func (srv CooperationApplicationsService) PersonSearchCooperationApplications(ap
156 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 156 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
157 applicationQuery.Operator) 157 applicationQuery.Operator)
158 resultApplications, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{ 158 resultApplications, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
159 - PageNumber: applicationQuery.PageNumber, 159 + PageNumber: applicationQuery.PageNumber + 1,
160 PageSize: applicationQuery.PageSize, 160 PageSize: applicationQuery.PageSize,
161 CompanyId: int(applicationQuery.Operator.CompanyId), 161 CompanyId: int(applicationQuery.Operator.CompanyId),
162 CooperationApplicationStatus: applicationQuery.Status, 162 CooperationApplicationStatus: applicationQuery.Status,
@@ -90,7 +90,7 @@ func (srv CooperationProjectService) SearchCooperationProject(projectQuery *comm @@ -90,7 +90,7 @@ func (srv CooperationProjectService) SearchCooperationProject(projectQuery *comm
90 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 90 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
91 projectQuery.Operator) 91 projectQuery.Operator)
92 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ 92 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
93 - PageNumber: projectQuery.PageNumber, 93 + PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
94 PageSize: projectQuery.PageSize, 94 PageSize: projectQuery.PageSize,
95 Status: int(projectQuery.Status), 95 Status: int(projectQuery.Status),
96 OrgId: projectQuery.Operator.OrgId, 96 OrgId: projectQuery.Operator.OrgId,
@@ -107,7 +107,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -107,7 +107,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
107 projectQuery.Operator) 107 projectQuery.Operator)
108 //orgidStr := strconv.Itoa(projectQuery.OrgId) 108 //orgidStr := strconv.Itoa(projectQuery.OrgId)
109 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ 109 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
110 - PageNumber: projectQuery.PageNumber, 110 + PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
111 PageSize: projectQuery.PageSize, 111 PageSize: projectQuery.PageSize,
112 OrgId: projectQuery.OrgId, 112 OrgId: projectQuery.OrgId,
113 //UserBaseId: projectQuery.Operator.UserBaseId, 113 //UserBaseId: projectQuery.Operator.UserBaseId,
@@ -17,7 +17,7 @@ func (srv CompanyCreditAccountService) CreditAccountSearch(cmd *command.CreditAc @@ -17,7 +17,7 @@ func (srv CompanyCreditAccountService) CreditAccountSearch(cmd *command.CreditAc
17 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 17 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
18 cmd.Operator) 18 cmd.Operator)
19 resultMenu, err := gateway.CreditAccountsSearch(allied_creation_cooperation.ReqCreditAccountsSearch{ 19 resultMenu, err := gateway.CreditAccountsSearch(allied_creation_cooperation.ReqCreditAccountsSearch{
20 - PageNumber: cmd.PageNumber, 20 + PageNumber: cmd.PageNumber + 1, //手机序号从0开始的
21 PageSize: cmd.PageSize, 21 PageSize: cmd.PageSize,
22 PaymentStatus: cmd.PaymentStatus, 22 PaymentStatus: cmd.PaymentStatus,
23 OrgId: cmd.Operator.OrgId, 23 OrgId: cmd.Operator.OrgId,
@@ -83,7 +83,7 @@ func (srv CompanyCreditAccountService) CreditAccountPaySearch(cmd *command.Credi @@ -83,7 +83,7 @@ func (srv CompanyCreditAccountService) CreditAccountPaySearch(cmd *command.Credi
83 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 83 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
84 cmd.Operator) 84 cmd.Operator)
85 resultMenu, err := gateway.CreditAccountsSearch(allied_creation_cooperation.ReqCreditAccountsSearch{ 85 resultMenu, err := gateway.CreditAccountsSearch(allied_creation_cooperation.ReqCreditAccountsSearch{
86 - PageNumber: cmd.PageNumber, 86 + PageNumber: cmd.PageNumber + 1, //手机序号从0开始的
87 PageSize: cmd.PageSize, 87 PageSize: cmd.PageSize,
88 PaymentStatus: 2, 88 PaymentStatus: 2,
89 //TODO:时间段过滤 89 //TODO:时间段过滤
@@ -16,7 +16,7 @@ func (srv PersonCreditAccountService) CreditAccountPaySearch(cmd *command.Credit @@ -16,7 +16,7 @@ func (srv PersonCreditAccountService) CreditAccountPaySearch(cmd *command.Credit
16 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 16 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
17 cmd.Operator) 17 cmd.Operator)
18 resultMenu, err := gateway.CreditAccountsSearch(allied_creation_cooperation.ReqCreditAccountsSearch{ 18 resultMenu, err := gateway.CreditAccountsSearch(allied_creation_cooperation.ReqCreditAccountsSearch{
19 - PageNumber: cmd.PageNumber, 19 + PageNumber: cmd.PageNumber + 1, //手机序号从0开始的
20 PageSize: cmd.PageSize, 20 PageSize: cmd.PageSize,
21 PaymentStatus: 2, 21 PaymentStatus: 2,
22 UserBaseId: cmd.Operator.UserBaseId, 22 UserBaseId: cmd.Operator.UserBaseId,
@@ -15,7 +15,7 @@ func (srv UndertakerFeedbackService) SearchFeedback(cmd *command.SearchFeedbackC @@ -15,7 +15,7 @@ func (srv UndertakerFeedbackService) SearchFeedback(cmd *command.SearchFeedbackC
15 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 15 gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
16 cmd.Operator) 16 cmd.Operator)
17 resultMenu, err := gateway.ContractUndertakerFeedbackSearch(allied_creation_cooperation.ReqContractUndertakerFeedbackSearch{ 17 resultMenu, err := gateway.ContractUndertakerFeedbackSearch(allied_creation_cooperation.ReqContractUndertakerFeedbackSearch{
18 - PageNumber: cmd.PageNumber, 18 + PageNumber: cmd.PageNumber + 1, //手机序号从0开始的
19 PageSize: cmd.PageSize, 19 PageSize: cmd.PageSize,
20 MatchWord: cmd.MatchWord, 20 MatchWord: cmd.MatchWord,
21 CompanyId: cmd.Operator.CompanyId, 21 CompanyId: cmd.Operator.CompanyId,
@@ -9,6 +9,7 @@ type RoleItem struct { @@ -9,6 +9,7 @@ type RoleItem struct {
9 OrgName string `json:"orgName"` 9 OrgName string `json:"orgName"`
10 RoleType int `json:"roleType"` 10 RoleType int `json:"roleType"`
11 Ext Ext `json:"ext"` 11 Ext Ext `json:"ext"`
  12 + AuthFlag int `json:"authFlag"` // 1:可操作（编辑，修改等）
12 } 13 }
13 14
14 type Ext struct { 15 type Ext struct {
@@ -99,7 +99,7 @@ func (rolesService *RolesService) RoleList(roleListQuery *query.RoleListQuery) ( @@ -99,7 +99,7 @@ func (rolesService *RolesService) RoleList(roleListQuery *query.RoleListQuery) (
99 } 99 }
100 result := []dto.RoleItem{} 100 result := []dto.RoleItem{}
101 for _, v := range roleList.Roles { 101 for _, v := range roleList.Roles {
102 - result = append(result, dto.RoleItem{ 102 + item := dto.RoleItem{
103 RoleId: strconv.Itoa(int(v.RoleID)), 103 RoleId: strconv.Itoa(int(v.RoleID)),
104 OrgId: strconv.Itoa(int(v.OrgID)), 104 OrgId: strconv.Itoa(int(v.OrgID)),
105 RoleName: v.RoleName, 105 RoleName: v.RoleName,
@@ -107,7 +107,11 @@ func (rolesService *RolesService) RoleList(roleListQuery *query.RoleListQuery) ( @@ -107,7 +107,11 @@ func (rolesService *RolesService) RoleList(roleListQuery *query.RoleListQuery) (
107 OrgName: v.Ext.OrgName, 107 OrgName: v.Ext.OrgName,
108 RoleType: v.RoleType, 108 RoleType: v.RoleType,
109 Ext: v.Ext, 109 Ext: v.Ext,
110 - }) 110 + }
  111 + if int64(v.OrgID) == roleListQuery.Operator.OrgId {
  112 + item.AuthFlag = 1
  113 + }
  114 + result = append(result, item)
111 } 115 }
112 var cnt int64 = roleList.Count 116 var cnt int64 = roleList.Count
113 return cnt, result, nil 117 return cnt, result, nil
@@ -9,6 +9,7 @@ type CompanyUserItem struct { @@ -9,6 +9,7 @@ type CompanyUserItem struct {
9 UserId string `json:"userId"` 9 UserId string `json:"userId"`
10 UserName string `json:"userName"` 10 UserName string `json:"userName"`
11 UserType int `json:"userType"` 11 UserType int `json:"userType"`
  12 + AuthFlag int `json:"authFlag"` // 1:可操作（编辑，修改等）
12 } 13 }
13 14
14 //CompanyUserInfo 用户数据详情 15 //CompanyUserInfo 用户数据详情
@@ -84,4 +85,5 @@ type CooperationUserItem struct { @@ -84,4 +85,5 @@ type CooperationUserItem struct {
84 UserName string `json:"userName"` 85 UserName string `json:"userName"`
85 OrgName string `json:"orgName"` 86 OrgName string `json:"orgName"`
86 OrgId string `json:"orgId"` 87 OrgId string `json:"orgId"`
  88 + AuthFlag int `json:"authFlag"` // 1:可操作（编辑，修改等）
87 } 89 }
@@ -210,6 +210,9 @@ func (usersService *UsersService) CompanyUserList(companyUserListQuery *query.Co @@ -210,6 +210,9 @@ func (usersService *UsersService) CompanyUserList(companyUserListQuery *query.Co
210 UserName: v.UserInfo.UserName, 210 UserName: v.UserInfo.UserName,
211 UserType: v.UserType, 211 UserType: v.UserType,
212 } 212 }
  213 + if v.Org.OrgId == int(companyUserListQuery.Operator.OrgId) {
  214 + item.AuthFlag = 1
  215 + }
213 listData = append(listData, item) 216 listData = append(listData, item)
214 } 217 }
215 return cnt, listData, nil 218 return cnt, listData, nil
@@ -399,6 +402,9 @@ func (usersService *UsersService) CooperationUserList(cooperationUserListQuery * @@ -399,6 +402,9 @@ func (usersService *UsersService) CooperationUserList(cooperationUserListQuery *
399 OrgName: v.Org.OrgName, 402 OrgName: v.Org.OrgName,
400 OrgId: strconv.Itoa(v.Org.OrgId), 403 OrgId: strconv.Itoa(v.Org.OrgId),
401 } 404 }
  405 + if v.Org.OrgId == int(cooperationUserListQuery.Operator.OrgId) {
  406 + item.AuthFlag = 1
  407 + }
402 if !v.CooperationInfo.CooperationDeadline.IsZero() && v.CooperationInfo.CooperationDeadline.After(time.Unix(1136044800, 0)) { 408 if !v.CooperationInfo.CooperationDeadline.IsZero() && v.CooperationInfo.CooperationDeadline.After(time.Unix(1136044800, 0)) {
403 item.CooperationDeadline = v.CooperationInfo.CooperationDeadline.Format("2006-01-02") 409 item.CooperationDeadline = v.CooperationInfo.CooperationDeadline.Format("2006-01-02")
404 } 410 }