williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-21 11:42:58 +08:00
parent dda20eb011
commit 1c027dd2d1
23 changed files with 125 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/enterprise/controller/technology/achievement.go
View File

@ -161,8 +161,8 @@ func (c *Achievement) Form(params *AchievementParams) error {
return errors.New("操作错误，成果信息不存在或已被删除")
} else if mTechnologyAchievement.UID != c.UID {
return errors.New("无权限操作")
} else if mTechnologyAchievement.Status != model2.TechnologyAchievementStatusForRefuse &&
mTechnologyAchievement.Status != model2.TechnologyAchievementStatusForDraft {
} else if mTechnologyAchievement.Status != model2.TechnologyStatusKindForRefuse &&
mTechnologyAchievement.Status != model2.TechnologyStatusKindForDraft {
return errors.New("操作错误，当前状态不允许修改")
}
}
@ -180,14 +180,14 @@ func (c *Achievement) Form(params *AchievementParams) error {
mTechnologyAchievement.Source = params.Source
if mTechnologyAchievement.ID > 0 {
mTechnologyAchievement.Status = model2.TechnologyAchievementStatusForExamining
mTechnologyAchievement.Status = model2.TechnologyStatusKindForExamining
return model2.Updates(mTechnologyAchievement.TechnologyAchievement, mTechnologyAchievement.TechnologyAchievement)
}
mTechnologyAchievement.TenantID = c.tenantID
mTechnologyAchievement.UID = c.UID
if params.IsSubmit > 0 {
mTechnologyAchievement.Status = model2.TechnologyAchievementStatusForExamining
mTechnologyAchievement.Status = model2.TechnologyStatusKindForExamining
}
return model2.Create(mTechnologyAchievement.TechnologyAchievement)
}

8
app/api/enterprise/controller/technology/demand.go
View File

@ -119,8 +119,8 @@ func (c *Demand) Form(params *DemandParams) error {
return errors.New("操作错误，需求信息不存在或已被删除")
} else if mTechnologyDemand.UID != c.UID {
return errors.New("无权限操作")
} else if mTechnologyDemand.Status != model2.TechnologyDemandStatusForRefuse &&
mTechnologyDemand.Status != model2.TechnologyDemandStatusForDraft {
} else if mTechnologyDemand.Status != model2.TechnologyStatusKindForRefuse &&
mTechnologyDemand.Status != model2.TechnologyStatusKindForDraft {
return errors.New("操作错误，当前状态不允许修改")
}
}
@ -145,14 +145,14 @@ func (c *Demand) Form(params *DemandParams) error {
},
})
if mTechnologyDemand.ID > 0 {
mTechnologyDemand.Status = model2.TechnologyDemandStatusForExamining
mTechnologyDemand.Status = model2.TechnologyStatusKindForExamining
return model2.Updates(mTechnologyDemand.TechnologyDemand, mTechnologyDemand.TechnologyDemand)
}
mTechnologyDemand.UID = c.UID
mTechnologyDemand.TenantID = c.tenantID
if params.IsSubmit > 0 {
mTechnologyDemand.Status = model2.TechnologyDemandStatusForExamining
mTechnologyDemand.Status = model2.TechnologyStatusKindForExamining
}
return model2.Create(mTechnologyDemand.TechnologyDemand)
}

14
app/api/enterprise/controller/technology/instance.go
View File

@ -78,8 +78,8 @@ func (c *Instance) Form(params *InstanceParams) error {
return errors.New("操作错误，技术信息不存在或已被删除")
} else if c.UID != mTechnologyInstance.UID {
return errors.New("操作错误，无权限操作")
} else if mTechnologyInstance.Status != model2.TechnologyInstanceStatusForDraft &&
mTechnologyInstance.Status != model2.TechnologyInstanceStatusForRefuse {
} else if mTechnologyInstance.Status != model2.TechnologyStatusKindForDraft &&
mTechnologyInstance.Status != model2.TechnologyStatusKindForRefuse {
return errors.New("操作错误，当前状态不允许修改")
}
}
@ -99,19 +99,19 @@ func (c *Instance) Form(params *InstanceParams) error {
mTechnologyInstance.Purpose = params.Purpose
mTechnologyInstance.Remark = params.Remark
if mTechnologyInstance.Status != model2.TechnologyInstanceStatusForDraft &&
mTechnologyInstance.Status != model2.TechnologyInstanceStatusForExamining {
if mTechnologyInstance.Status != model2.TechnologyStatusKindForDraft &&
mTechnologyInstance.Status != model2.TechnologyStatusKindForExamining {
return errors.New("操作错误，状态参数错误")
}
if params.ID > 0 {
mTechnologyInstance.Status = model2.TechnologyInstanceStatusForExamining
mTechnologyInstance.Status = model2.TechnologyStatusKindForExamining
return model2.Updates(mTechnologyInstance.TechnologyInstance, mTechnologyInstance.TechnologyInstance)
}
mTechnologyInstance.UID = c.UID
mTechnologyInstance.TenantID = c.tenantID
if params.IsSubmit > 0 {
mTechnologyInstance.Status = model2.TechnologyInstanceStatusForExamining
mTechnologyInstance.Status = model2.TechnologyStatusKindForExamining
}
return model2.Create(mTechnologyInstance.TechnologyInstance)
}
@ -128,7 +128,7 @@ func (c *Instance) Shelf(id uint64, status int) error {
return errors.New("信息不存在")
} else if c.UID != mTechnologyInstance.UID {
return errors.New("操作错误，无权限操作")
} else if mTechnologyInstance.Status != model2.TechnologyInstanceStatusForAgree {
} else if mTechnologyInstance.Status != model2.TechnologyStatusKindForAgree {
return errors.New("操作错误，当前状态不允许处理上下架")
} else if mTechnologyInstance.Shelf.ShelfStatus == model2.ShelfStatusKind(status) {
return errors.New("操作错误，状态异常")

8
app/api/enterprise/controller/technology/product.go
View File

@ -184,8 +184,8 @@ func (c *Product) Form(params *ProductParams) error {
return errors.New("操作错误，产品信息不存在或已被删除")
} else if mTechnologyProduct.UID != c.UID {
return errors.New("无权限操作")
} else if mTechnologyProduct.Status != model2.TechnologyProductStatusForRefuse &&
mTechnologyProduct.Status != model2.TechnologyProductStatusForDraft {
} else if mTechnologyProduct.Status != model2.TechnologyStatusKindForRefuse &&
mTechnologyProduct.Status != model2.TechnologyStatusKindForDraft {
return errors.New("操作错误，当前状态不允许修改")
}
}
@ -202,14 +202,14 @@ func (c *Product) Form(params *ProductParams) error {
mTechnologyProduct.Introduce = params.Introduce
if mTechnologyProduct.ID > 0 {
mTechnologyProduct.Status = model2.TechnologyProductStatusForExamining
mTechnologyProduct.Status = model2.TechnologyStatusKindForExamining
return model2.Updates(mTechnologyProduct.TechnologyProduct, mTechnologyProduct.TechnologyProduct)
}
mTechnologyProduct.TenantID = c.tenantID
mTechnologyProduct.UID = c.UID
if params.IsSubmit > 0 {
mTechnologyProduct.Status = model2.TechnologyProductStatusForExamining
mTechnologyProduct.Status = model2.TechnologyStatusKindForExamining
}
return model2.Create(mTechnologyProduct.TechnologyProduct)
}

4
app/api/enterprise/controller/technology/topic.go
View File

@ -102,8 +102,8 @@ func (c *Topic) Form(params *TopicParams) error {
return errors.New("操作错误，课题信息不存在")
} else if mTechnologyTopic.UID != c.UID {
return errors.New("无权限操作")
} else if mTechnologyTopic.Status != model2.TechnologyTopicStatusForDraft &&
mTechnologyTopic.Status != model2.TechnologyTopicStatusForRefuse {
} else if mTechnologyTopic.Status != model2.TechnologyStatusKindForDraft &&
mTechnologyTopic.Status != model2.TechnologyStatusKindForRefuse {
return errors.New("操作错误，当前状态不允许修改")
}
}

2
app/api/enterprise/model/technology_achievement.go
View File

@ -46,7 +46,7 @@ func (m *TechnologyAchievement) Achievements(page, pageSize int, count *int64, w
model.NewUserVisit().TableName(), model.UserCollectKindForTechnologyAchievement, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT object_id, COUNT(id) AS count FROM %s WHERE kind = %d AND is_deleted = %d GROUP BY object_id) AS c ON a.id = c.object_id",
model.NewUserCollect().TableName(), model.UserCollectKindForTechnologyAchievement, model.DeleteStatusForNot)).
Where("a.status = ?", model.TechnologyAchievementStatusForAgree).
Where("a.status = ?", model.TechnologyStatusKindForAgree).
Where("a.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {