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
2021-12-27 11:48:44 +08:00
parent 4926c5b765
commit 45b2e85cfd
23 changed files with 92 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/api/website/controller/technology/achievement.go
View File

@ -9,8 +9,6 @@ import (
"SciencesServer/config"
"errors"
"fmt"
"gorm.io/gorm"
"time"
)
// Achievement 技术成果
@ -91,16 +89,19 @@ func (c *Achievement) Detail(id uint64) (*AchievementDetailInfo, error) {
} else if out.ID <= 0 {
return nil, errors.New("操作错误，成果信息不存在或已被删除")
}
var uid uint64 = 0
//var uid uint64 = 0
if c.Enterprise != nil {
uid = c.UID
//uid = c.UID
}
mTechnologyAchievementCollect := model.NewTechnologyAchievementCollect()
_ = model2.UpdatesWhere(mTechnologyAchievementCollect.TechnologyAchievementCollect, map[string]interface{}{
"count": gorm.Expr("count + ?", 1), "updated_at": time.Now(),
}, []*model2.ModelWhere{model2.NewWhere("uid", uid), model2.NewWhere("achievement_id", id)})
// TODO：缺少错误
//mUserCollect := model.NewUserCollect()
//
//_ = model2.UpdatesWhere(mUserCollect.UserCollect, map[string]interface{}{
// "count": gorm.Expr("count + ?", 1), "updated_at": time.Now(),
//}, []*model2.ModelWhere{model2.NewWhere("uid", uid),
// model2.NewWhere("kind", model2.UserCollectKindForTechnologyAchievement),
// model2.NewWhere("achievement_id", id)})
return &AchievementDetailInfo{
AchievementInfo: AchievementInfo{

14
app/api/website/model/manage_company.go
View File

@ -20,19 +20,19 @@ type ManageCompanyProduct struct {
// Product 产品信息
func (m *ManageCompany) Product(id, uid uint64, page, pageSize int, count *int64) ([]*ManageCompanyProduct, error) {
mTechnologyProductCollect := model.NewTechnologyProductCollect()
mNewUserCollect := model.NewUserCollect()
db := orm.GetDB().Table(model.NewUserCompany().TableName()+" u_c").
Select("p.id", "p.title", "p.image", "p.industry", "p.maturity", "p.lead_standard", "p.cooperation_mode",
"p.keyword", "v.count AS visit_count", "IFNULL(c_u.id, 0) AS is_collect", "c.count AS collect_count").
Joins(fmt.Sprintf("LEFT JOIN %s AS p ON u_c.uid = p.uid AND p.shelf_status = %d AND p.status = %d AND p.is_deleted = %d",
model.NewTechnologyProduct().TableName(), model.ShelfStatusForUp, model.TechnologyProductStatusForAgree, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT product_id, SUM(count) AS count FROM %s WHERE is_deleted = %d GROUP BY product_id) AS v ON p.id = v.product_id",
model.NewTechnologyProductVisit().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT product_id, COUNT(count) AS count FROM %s WHERE is_deleted = %d GROUP BY product_id) AS c ON p.id = c.product_id",
mTechnologyProductCollect.TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS c_u ON p.id = c_u.product_id AND c_u.uid = %d AND c_u.is_deleted = %d",
mTechnologyProductCollect.TableName(), uid, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT object_id, SUM(count) AS count FROM %s WHERE kind = %d AND is_deleted = %d GROUP BY object_id) AS v ON p.id = v.object_id",
model.NewUserVisit().TableName(), model.UserVisitKindForTechnologyProduct, 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 p.id = c.object_id",
model.NewUserCollect().TableName(), model.UserCollectKindForTechnologyProduct, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS c_u ON p.id = c_u.product_id AND c_u.uid = %d AND c_u.kind = %d AND c_u.is_deleted = %d",
mNewUserCollect.TableName(), uid, model.UserCollectKindForTechnologyProduct, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("")).
Where("u_c.company_id = ?", id).
Where("u_c.invalid_status = ?", model.InvalidStatusForNot).

16
app/api/website/model/technology_achievement.go
View File

@ -22,10 +22,10 @@ func (m *TechnologyAchievement) Achievement(page, pageSize int, count *int64, wh
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.title", "a.mode", "a.image", "a.charge_info", "a.industry", "a.customer", "a.maturity",
"a.cooperation_mode", "a.keyword", "v.count AS visit_count", "c.count AS collect_count").
Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, SUM(count) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS v ON a.id = v.achievement_id",
model.NewTechnologyAchievementVisit().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, COUNT(id) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS c ON a.id = c.achievement_id",
model.NewTechnologyAchievementCollect().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT object_id, SUM(count) AS count FROM %s WHERE kind = %d AND is_deleted = %d GROUP BY object_id) AS v ON a.id = v.object_id",
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.is_deleted = ?", model.DeleteStatusForNot)
@ -49,10 +49,10 @@ func (m *TechnologyAchievement) Achievement(page, pageSize int, count *int64, wh
func (m *TechnologyAchievement) Detail(id uint64) (*TechnologyAchievementInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*", "v.count AS visit_count", "c.count AS collect_count").
Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, SUM(count) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS v ON a.id = v.achievement_id",
model.NewTechnologyAchievementVisit().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, SUM(count) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS c ON a.id = c.achievement_id",
model.NewTechnologyAchievementCollect().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT object_id, SUM(count) AS count FROM %s WHERE kind = %d AND is_deleted = %d GROUP BY object_id) AS v ON a.id = v.object_id",
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.id = ?", id)
out := new(TechnologyAchievementInfo)

11
app/api/website/model/technology_achievement_collect.go
View File

@ -1,11 +0,0 @@
package model
import "SciencesServer/app/common/model"
type TechnologyAchievementCollect struct {
*model.TechnologyAchievementCollect
}
func NewTechnologyAchievementCollect() *TechnologyAchievementCollect {
return &TechnologyAchievementCollect{model.NewTechnologyAchievementCollect()}
}

11
app/api/website/model/user_collect.go Normal file
View File

@ -0,0 +1,11 @@
package model
import "SciencesServer/app/common/model"
type UserCollect struct {
*model.UserCollect
}
func NewUserCollect() *UserCollect {
return &UserCollect{model.NewUserCollect()}
}