作者 陈志颖

fix:修复合约查询数据

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