bug 修复

tangxvhui
controllers/achievement.go
models/achievement.go
routers/router.go
services/achievement/achievement.go
services/rbac/permission.go
--- a/controllers/achievement.go
查看文件 @38fa10a
+++ b/controllers/achievement.go
查看文件 @38fa10a
@@ -3,6 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"oppmg/common/log"
+	"oppmg/models"
 	"oppmg/protocol"
 	serveachievement "oppmg/services/achievement"
 )
@@ -95,3 +96,91 @@ func (c AchievementController) AchievementInfo() {
 	msg = protocol.NewReturnResponse(rspData, nil)
 	return
 }
+
+//EditAchievement 删除成果
+//@router /achievement/delete
+func (c AchievementController) DeleteAchievement() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		c.ResposeJson(msg)
+	}()
+	type Parameter struct {
+		Id int64 `json:"id"`
+	}
+	var param Parameter
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &param); err != nil {
+		log.Error("json 解析失败 err:%s", err)
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	companyid := c.GetCompanyId()
+	var (
+		err             error
+		achievementData *models.Achievement
+	)
+	achievementData, err = models.GetAchievementById(param.Id)
+	if err != nil {
+		log.Error("获取achievement数据失败：%s", err)
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	if achievementData.CompanyId != companyid {
+		log.Error("achievement数据公司不匹配")
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	achievementData.Status = models.ACHIEVEMENT_STATUS_DEL
+	err = models.UpdateAchievementById(achievementData, []string{"Status"})
+	if err != nil {
+		log.Error("更新achievement数据失败：%s", err)
+	}
+	msg = protocol.NewReturnResponse(nil, nil)
+	return
+}
+
+//EditAchievement 显示隐藏成果
+//@router /achievement/forbid_allow
+func (c AchievementController) ForbidAllowAchievement() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		c.ResposeJson(msg)
+	}()
+	type Parameter struct {
+		Id     int64 `json:"id"`
+		Status int8  `json:"status"` //[1:显示][2:隐藏]
+	}
+	var param Parameter
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &param); err != nil {
+		log.Error("json 解析失败 err:%s", err)
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	if param.Status != 1 && param.Status != 2 {
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	companyid := c.GetCompanyId()
+	var (
+		err             error
+		achievementData *models.Achievement
+	)
+	achievementData, err = models.GetAchievementById(param.Id)
+	if err != nil {
+		log.Error("获取achievement数据失败：%s", err)
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+	if achievementData.CompanyId != companyid {
+		log.Error("achievement数据公司不匹配")
+		msg = protocol.BadRequestParam("1")
+		return
+	}
+
+	achievementData.Status = param.Status
+	err = models.UpdateAchievementById(achievementData, []string{"Status"})
+	if err != nil {
+		log.Error("更新achievement数据失败：%s", err)
+	}
+	msg = protocol.NewReturnResponse(nil, nil)
+	return
+}
--- a/models/achievement.go
查看文件 @38fa10a
+++ b/models/achievement.go
查看文件 @38fa10a
@@ -35,6 +35,13 @@ func init() {
 	orm.RegisterModel(new(Achievement))
 }
+//机会状态 1:开启 2:关闭 0:删除
+const (
+	ACHIEVEMENT_STATUS_DEL int8 = 0 //删除
+	ACHIEVEMENT_STATUS_YES int8 = 1 //开启
+	ACHIEVEMENT_STATUS_NO  int8 = 2 //关闭
+)
+
 // AddAchievement insert a new Achievement into database and returns
 // last inserted Id on success.
 func AddAchievement(m *Achievement, om ...orm.Ormer) (id int64, err error) {
--- a/routers/router.go
查看文件 @38fa10a
+++ b/routers/router.go
查看文件 @38fa10a
@@ -131,6 +131,8 @@ func init() {
 			beego.NSRouter("/add", &controllers.AchievementController{}, "post:AddAchievement"),
 			beego.NSRouter("/edit", &controllers.AchievementController{}, "post:EditAchievement"),
 			beego.NSRouter("/info", &controllers.AchievementController{}, "post:AchievementInfo"),
+			beego.NSRouter("/delete", &controllers.AchievementController{}, "post:DeleteAchievement"),
+			beego.NSRouter("/forbid_allow", &controllers.AchievementController{}, "post:ForbidAllowAchievement"),
 		),
 	)
--- a/services/achievement/achievement.go
查看文件 @38fa10a
+++ b/services/achievement/achievement.go
查看文件 @38fa10a
@@ -72,6 +72,7 @@ func AddAchievement(addData *protocol.RequestAddAchievement, companyid int64) er
 		UserGraspScore:  addData.UserGraspScore,
 		CreateAt:        nowTime,
 		UpdateAt:        nowTime,
+		Status:          models.ACHIEVEMENT_STATUS_YES,
 	}
 	if imgData, err := json.Marshal(addData.Images); err == nil {
 		achievementData.Images = string(imgData)
--- a/services/rbac/permission.go
查看文件 @38fa10a
+++ b/services/rbac/permission.go
查看文件 @38fa10a
@@ -19,6 +19,8 @@ const (
 	M_SYSTEM_OPPORTUNITY_TEMPLATE string = "SYSTEM_OPPORTUNITY-TEMPLATE" //机会模板管理
 	M_SYSTEM_RATING               string = "SYSTEM_RATING"               //评分模式设置
 	M_SYSTEM_ANNOUNCEMENT         string = "SYSTEM_ANNOUNCEMENT"         //公告管理
+	M_SYSTEM_ACHIEVEMENT          string = "SYSTEM_ACHIEVEMENT"          //成果管理
+	M_SYSTEM_RANK                 string = "SYSTEM_RANK"                 //排行榜配置管理
 )
 type PermissionOptionObject interface {
@@ -102,6 +104,8 @@ var CodePermissionObject = map[string]CodeToObject{
 	M_SYSTEM_RATING:               NewPermissionOptionBase, //评分模式
 	M_SYSTEM_OPPORTUNITY:          NewOptionOpportunity,    //机会管理
 	M_SYSTEM_ANNOUNCEMENT:         NewPermissionOptionBase, //公告管理
+	M_SYSTEM_ACHIEVEMENT:          NewPermissionOptionBase, //成果管理
+	M_SYSTEM_RANK:                 NewPermissionOptionBase, //排行榜配置管理
 }
 func GetUserPermission(userCompanyid int64, code ...string) (map[string]PermissionOptionObject, error) {