作者 tangxuhui

修正问题; 共创项目选项框 搜索数据错误

... ... @@ -180,9 +180,9 @@ func (srv CooperationApplicationsService) CooperationApplicationsOneclickApprova
auditCommand.Operator)
_, err := creationCooperationGateway.CooperationApplicationsOneclickApproval(
allied_creation_cooperation.ReqCooperationApplicationOneclickApproval{
CooperationApplicationDescription: auditCommand.CooperationApplicationVerifyDescription,
Action: auditCommand.CooperationApplicationStatus,
Code: "a1-2",
CooperationApplicationVerifyDescription: auditCommand.CooperationApplicationVerifyDescription,
Action: auditCommand.CooperationApplicationStatus,
Code: "a1-2",
})
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
... ...
... ... @@ -7,5 +7,5 @@ import (
type CooperationProjectSelectorQuery struct {
//操作人
Operator domain.Operator `json:"-"`
MatchCooperationProjectNumber string `json:"matchCooperationProjectNumber"` //匹配项目编号
MatchCooperationProjectNumber string `json:"matchCooperationProjectNumber"` //匹配项目编号 matchCooperationProjectNumber
}
... ...
... ... @@ -102,6 +102,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje
//项目名
CooperationProjectName: listCooperationProjectQuery.CooperationProjectName,
CompanyId: listCooperationProjectQuery.Operator.CompanyId,
OrgIds: listCooperationProjectQuery.Operator.OrgIds,
})
if err != nil {
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ... @@ -146,16 +147,11 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro
func (cooperationProjectService *CooperationProjectService) ListCooperationProjectSelector(listCooperationProjectQuery *query.CooperationProjectSelectorQuery) (int64, interface{}, error) {
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator)
orgIds := []string{}
for _, v := range listCooperationProjectQuery.Operator.OrgIds {
idStr := strconv.Itoa(int(v))
orgIds = append(orgIds, idStr)
}
result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
PageSize: 999,
CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber,
CompanyId: listCooperationProjectQuery.Operator.CompanyId,
OrgIds: orgIds,
OrgIds: listCooperationProjectQuery.Operator.OrgIds,
})
if err != nil {
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ...
... ... @@ -223,9 +223,9 @@ type (
//共创申请一键审核
type (
ReqCooperationApplicationOneclickApproval struct {
CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //审核描述
Action int `json:"action"` //审核动作,1同意,2拒绝
Code string `cname:"菜单编码" json:"code" valid:"Required"`
CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
Action int `json:"action"` //审核动作,1同意,2拒绝
Code string `cname:"菜单编码" json:"code" valid:"Required"`
}
DataCooperationApplicationOneclickApproval struct {
... ...
... ... @@ -157,10 +157,10 @@ type (
// 共创项目状态,1招标中,2结束 0 全部
Status int `json:"status"`
// 组织机构ID
OrgId int64 `cname:"组织机构ID" json:"orgId"`
OrgIds []string `json:"orgIds"`
CompanyId int64 `json:"companyId"`
CooperationProjectNumber string `json:"cooperationProjectNumber"`
OrgId int64 `cname:"组织机构ID" json:"orgId"`
OrgIds []int64 `json:"orgIds"`
CompanyId int64 `json:"companyId"`
CooperationProjectNumber string `json:"cooperationProjectNumber"`
//OffsetLimitFlag bool `json:"offsetLimitFlag"`
// 用户基础数据id
UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`
... ...