作者 tangxuhui

数据结构调整

package query
import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
type ListContractChangeLogQuery struct {
//操作人
Operator domain.Operator `json:"-"`
PageNumber int ` json:"pageNumber,omitempty"` // 页码
PageSize int `json:"pageSize,omitempty"` // 页面大小
}
... ...
package service
import (
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/contractChangeLog/query"
)
type ContractChangeLogService struct{}
func (srv ContractChangeLogService) ContractChangeLogSearch(queryParam *query.ListContractChangeLogQuery) (interface{}, error) {
//creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(queryParam.Operator)
// _, err := creationCooperationGateway.CooperationContractsSearchByUndertaker(
// allied_creation_cooperation.ContractChangeLogsSearch{})
return nil, nil
}
... ...
... ... @@ -9,25 +9,29 @@ import (
type CooperationApplicationItem struct {
CooperationProject struct {
CooperationProjectID int `json:"cooperationProjectId"` //共创项目
CooperationProjectID string `json:"cooperationProjectId"` //共创项目
CooperationProjectName string `json:"cooperationProjectName"` //共创名称
CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号
} `json:"cooperationProject"`
CooperationApplicationApplicant struct {
UserName string `json:"usersName"` //申请人名字
UserCode string `json:"usersCode"`
DepartmentName string `json:"departmentName"` //申请人部门
Phone string `json:"Phone"` //申请人电话
UserId int
UserInfo struct {
UserAvatar string
UserEmail string
UserName string
UserPhone string
UserAccount string
}
} `json:"cooperationApplicationApplicant"`
CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件
CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述
CooperationApplicationID int `json:"cooperationApplicationId"` //id
CooperationApplicationID string `json:"cooperationApplicationId"` //id
IsCanceled bool `json:"isCanceled"` //是否取消
CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间
CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //
Org struct {
OrgID int `json:"orgId"`
OrgID string `json:"orgId"`
OrgName string `json:"orgName"`
} `json:"org"` //组织
}
... ...
... ... @@ -53,7 +53,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
UserId: v.UserId,
ReferrerId: v.RerferrerId,
SalesmanId: v.SalesmanId,
Attachment: v.Attachment,
ContractAttachment: v.Attachment,
}
underTakers = append(underTakers, u)
}
... ... @@ -176,7 +176,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
UserId: v.UserId,
ReferrerId: v.RerferrerId,
SalesmanId: v.SalesmanId,
Attachment: v.Attachment,
ContractAttachment: v.Attachment,
}
underTakers = append(underTakers, u)
}
... ...
... ... @@ -155,7 +155,7 @@ type (
UserId int `json:"userId,string"` //承接人用户id
ReferrerId int `json:"referrerId,string"` //推荐人用户id
SalesmanId int `json:"salesmanId,string"` //关联业务员id
Attachment []domain.Attachment `json:"attachment"`
ContractAttachment []domain.Attachment `json:"contractAttachment"`
}
ReqCooperationContractAdd struct {
... ...
package allied_creation_cooperation
import "time"
//共创合约变更记录搜索
type (
ReqContractChangeLogsSearch struct {
PageNumber int ` json:"pageNumber,omitempty"` // 页码
PageSize int `json:"pageSize,omitempty"` // 页面大小
CompanyId int `json:"companyId"` //公司ID
OrgId int64 `json:"orgId"` // 组织机构ID
OrgIds []int64 `json:"orgIds"` // 关联的组织机构ID列表
UserId int64 ` json:"userId"` // 用户ID,
UserBaseId int64 `json:"userBaseId"` // 用户基础数据id
}
DataContractChangeLogsSearch struct {
Grid struct {
Total int
List []struct {
CooperationContractChangeLogId int64 `json:"cooperationContractChangeLogId,string"` // 共创合约变更日志
IncentivesRule string `json:"incentivesRule"` // 激励规则
IncentivesRuleDetail string `json:"incentivesRuleDetail"` // 激励规则明细
OperationType int32 `json:"operationType"` // 合约变更操作类型,1编辑、2暂停、3恢复
CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
Undertakers string `json:"undertakers"` // 承接人
Company struct {
CompanyId int64 `json:"companyId,string"` // 公司ID,通过集成REST上下文获取
CompanyLogo string `json:"companyLogo"` // 公司logo
CompanyName string `json:"companyName"` // 公司名称
} `json:"company"` // 公司
Org struct {
OrgId int64 `json:"orgId,string"` // 组织机构ID
OrgName string `json:"orgName"` // 组织名称
} `json:"org"` // 组织机构
Operator struct {
UserId int64 `json:"userId,string"` // 用户ID,
UserBaseId int64 `json:"userBaseId,string"` // 用户基本id
UserName string `json:"userName"` // 用户姓名
UserPhone string `json:"userPhone"` // 用户手机号
} `json:"operator"` // 操作人
OperatorTime time.Time `json:"operatorTime"` // 操作时间
UpdatedAt time.Time `json:"updatedAt"` // 更新时间
CreatedAt time.Time `json:"createdAt"` // 创建时间
}
}
}
)
... ...