作者 陈志颖

fix:修复合约查询数据

... ... @@ -18,6 +18,10 @@ type CooperationContractByUndertakerDto struct {
CooperationContractNumber string `json:"cooperationContractNumber"`
// 项目合约名称
CooperationContractName string `json:"cooperationContractName"`
// 项目合约状态
CooperationContractStatus int32 `json:"cooperationContractStatus"`
// 共创描述
CooperationContractDescription string `json:"cooperationContractDescription"`
// 合同附件
Attachment []*domain.Attachment `json:"attachment"`
// 发起人姓名
... ... @@ -37,6 +41,8 @@ func (dto *CooperationContractByUndertakerDto) LoadDto(contractByUndertaker *mod
dto.UndertakerPhone = contractByUndertaker.UndertakerPhone
dto.CooperationContractNumber = contractByUndertaker.CooperationContractNumber
dto.CooperationContractName = contractByUndertaker.CooperationContractName
dto.CooperationContractStatus = contractByUndertaker.ContractStatus
dto.CooperationContractDescription = contractByUndertaker.CooperationContractDescription
dto.Attachment = contractByUndertaker.ContractAttachment
dto.SponsorName = contractByUndertaker.CooperationContractSponsor.UserName
if contractByUndertaker.Department != nil {
... ...
... ... @@ -836,7 +836,7 @@ func (cooperationContractService *CooperationContractService) SearchCooperationC
if count, cooperationContractByUndertakers, err := cooperationContractDao.SearchCooperationContractByUndertaker(tool_funs.SimpleStructToMap(searchCooperationContractByUndertakerQuery)); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
} else {
cooperationContractByUndertakerDtos := []*dto.CooperationContractByUndertakerDto{}
cooperationContractByUndertakerDtos := make([]*dto.CooperationContractByUndertakerDto, 0)
for _, cooperationContractByUndertaker := range cooperationContractByUndertakers {
cooperationContractByUndertakerDto := &dto.CooperationContractByUndertakerDto{}
if err := cooperationContractByUndertakerDto.LoadDto(cooperationContractByUndertaker); err != nil {
... ...
... ... @@ -25,7 +25,7 @@ type CooperationContractByUndertaker struct {
Department *domain.Department `comment:"共创合约发起部门"`
// 组织机构
Org *domain.Org `comment:"组织机构"`
// 共创合约状态
// 共创合约状态 1正常,2关闭
ContractStatus int32 `comment:"共创合约状态"`
// 共创模式名称
CooperationModeName string `comment:"共创合约名称"`
... ...