mmm-go / oppmg · 提交

转到一个项目

作者 tangxvhui
提交 948c8e9bce9bc852d2332263084357eca765a346 1 个父辈 ebb3c714

完善“筛选结果”的功能 权限，以及bug 修复

内嵌 并排对比
正在显示 4 个修改的文件 包含 83 行增加 和 101 行删除
... ... @@ -120,7 +120,7 @@ type ChanceSelfCheckData struct {
func (m *Chance) GetSelfCheckData() []ChanceSelfCheckData {
var data []ChanceSelfCheckData
if m.CheckResultStatus == CheckResultStatusPass {
if m.CheckResultStatus > CheckResultStatusWait {
json.Unmarshal([]byte(m.CheckResult), &data)
} else {
json.Unmarshal([]byte(m.SelfChecks), &data)
... ...
package audit
import (
"encoding/json"
"fmt"
"oppmg/common/log"
"oppmg/models"
... ... @@ -244,15 +243,7 @@ func ChanceCheckResultPass(chanceId int64, companyId int64) error {
return protocol.NewErrWithMessage("1")
}
chanceData.CheckResultStatus = models.CheckResultStatusPass
checkResultData, err := models.GetChanceCheckResultByChancce(chanceId)
if err != nil {
log.Error("未找到相应的筛选结果")
}
collectCheckData := collectChanceCheckResultData(checkResultData)
if jsonBt, err := json.Marshal(collectCheckData); err == nil {
chanceData.CheckResult = string(jsonBt)
}
err = models.UpdateChanceById(chanceData, []string{"CheckResultStatus", "CheckResult"})
err = models.UpdateChanceById(chanceData, []string{"CheckResultStatus"})
if err != nil {
log.Error("更新chance数据失败，err；%s", err)
}
... ... @@ -274,15 +265,7 @@ func ChanceCheckResultNoPass(chanceId int64, companyId int64) error {
return protocol.NewErrWithMessage("1")
}
chanceData.CheckResultStatus = models.CheckResultStatusNOPass
checkResultData, err := models.GetChanceCheckResultByChancce(chanceId)
if err != nil {
log.Error("未找到相应的筛选结果")
}
collectCheckData := collectChanceCheckResultData(checkResultData)
if jsonBt, err := json.Marshal(collectCheckData); err == nil {
chanceData.CheckResult = string(jsonBt)
}
err = models.UpdateChanceById(chanceData, []string{"CheckResultStatus", "CheckResult"})
err = models.UpdateChanceById(chanceData, []string{"CheckResultStatus"})
if err != nil {
log.Error("更新chance数据失败，err；%s", err)
}
... ...
... ... @@ -21,6 +21,7 @@ const (
M_SYSTEM_ANNOUNCEMENT string = "SYSTEM_ANNOUNCEMENT" //公告管理
M_SYSTEM_ACHIEVEMENT string = "SYSTEM_ACHIEVEMENT" //成果管理
M_SYSTEM_RANK string = "SYSTEM_RANK" //排行榜配置管理
M_SYSTEM_CHECK_RESULT string = "SYSTEM_CHECK_RESULT" //机会筛选结果
)
type PermissionOptionObject interface {
... ... @@ -37,81 +38,84 @@ type PermissionBase struct {
}
var RouterPermission = map[string]PermissionBase{
"/v1/department/list": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/department/add": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/department/edit": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/department/delete": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/company/current/edit": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
"/v1/company/current/info": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
"/v1/position/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/position/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/position/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/position/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/rbac/role/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role_group/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role_group/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role_group/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/menu": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/menu/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/menu/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/menu/opportunity": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/menu/opportunity/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/user/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/allow_forbid": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/info": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/bulletin/add": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/list": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/get": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/update": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/operate": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/feedbacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/exportFeedBacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/template/add": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/sortCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/get": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/update": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/delete": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/editVisible": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/editEnable": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/editSort": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/operateCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/deleteCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/config/score": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},
"/v1/config/score/get": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},
"/v1/audit/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},
"/v1/audit/info": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},
"/v1/audit/allow_forbid": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "close_chance"},
"/v1/rank/type/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/forbid_allow": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/config_show": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/config_set": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/season/add": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/season/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/season/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/add": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/forbid_allow": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/info": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/sort": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/move": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/item/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/item/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/achievement/list": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/add": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/edit": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/info": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/delete": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/forbid_allow": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/remain/score": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/department/list": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/department/add": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/department/edit": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/department/delete": PermissionBase{CodeName: M_ENTERPRISE_ORGANIZATION, ActionName: "default"},
"/v1/company/current/edit": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
"/v1/company/current/info": PermissionBase{CodeName: M_ENTERPRISE_PROFILE, ActionName: "default"},
"/v1/position/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/position/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/position/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/position/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_POST, ActionName: "default"},
"/v1/rbac/role/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role_group/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role_group/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role_group/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/menu": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/menu/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/role/menu/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/menu/opportunity": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/rbac/menu/opportunity/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE_ROLE, ActionName: "default"},
"/v1/user/list": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/add": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/edit": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/delete": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/allow_forbid": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/user/info": PermissionBase{CodeName: M_ENTERPRISE_EMPLOYEE, ActionName: "default"},
"/v1/bulletin/add": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/list": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/get": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/update": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/operate": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/feedbacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/bulletin/exportFeedBacks": PermissionBase{CodeName: M_SYSTEM_ANNOUNCEMENT, ActionName: "default"},
"/v1/template/add": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/sortCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/get": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/update": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/delete": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/editVisible": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/editEnable": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/editSort": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/operateCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/template/deleteCategory": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY_TEMPLATE, ActionName: "default"},
"/v1/config/score": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},
"/v1/config/score/get": PermissionBase{CodeName: M_SYSTEM_RATING, ActionName: "default"},
"/v1/audit/list": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},
"/v1/audit/info": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "check"},
"/v1/audit/allow_forbid": PermissionBase{CodeName: M_SYSTEM_OPPORTUNITY, ActionName: "close_chance"},
"/v1/rank/type/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/forbid_allow": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/config_show": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/type/config_set": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/season/add": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/season/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/season/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/add": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/forbid_allow": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/info": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/sort": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/range/move": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/item/list": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/rank/item/edit": PermissionBase{CodeName: M_SYSTEM_RANK, ActionName: "default"},
"/v1/achievement/list": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/add": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/edit": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/info": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/delete": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/forbid_allow": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/achievement/remain/score": PermissionBase{CodeName: M_SYSTEM_ACHIEVEMENT, ActionName: "default"},
"/v1/audit/check_result/list": PermissionBase{CodeName: M_SYSTEM_CHECK_RESULT, ActionName: "default"},
"/v1/audit/check_result/info": PermissionBase{CodeName: M_SYSTEM_CHECK_RESULT, ActionName: "default"},
"/v1/audit/check_result/pass_or_no": PermissionBase{CodeName: M_SYSTEM_CHECK_RESULT, ActionName: "default"},
}
type CodeToObject func() PermissionOptionObject
... ...
... ... @@ -139,12 +139,7 @@ func (p *OptionOpportunity) GetValidFunc(k string) bool {
"close_chance": p.ValidCloseChance,
"edit_public_status": p.ValidEditPublicStatus,
}
/*
EditSorce int `json:"edit_sorce"`
EditPublicStatus int `json:"edit_public_status"`
CloseChance int `json:"close_chance"`
EditChance int `json:"edit_chance"`
*/
if fn, ok := m[k]; ok {
b := fn()
return b
... ...