|
@@ -11,7 +11,7 @@ import (
|
|
|
|
|
|
func ReportKnowledgeResourceAdd(title string, fileUrl string, adminId int, adminRealName string) (msg string, err error) {
|
|
|
classifyObj := new(models.KnowledgeClassify)
|
|
|
- classifyObj, err = classifyObj.GetClassifyByNameAndType("日常报告", models.KnowledgeResourceTypeReport, 0)
|
|
|
+ childClassifyId, err := classifyObj.GetChildClassifyIdByNamePath("市场研究报告", "内部报告", "日常报告")
|
|
|
if err != nil {
|
|
|
if utils.IsErrNoRow(err) {
|
|
|
msg = "分类不存在,请检查知识资源-报告库中是否存在-市场研究报告/内部报告/日常报告分类"
|
|
@@ -23,7 +23,7 @@ func ReportKnowledgeResourceAdd(title string, fileUrl string, adminId int, admin
|
|
|
|
|
|
obj := new(models.KnowledgeResource)
|
|
|
obj.ResourceType = models.KnowledgeResourceTypeReport
|
|
|
- obj.ClassifyId = classifyObj.ClassifyId
|
|
|
+ obj.ClassifyId = childClassifyId
|
|
|
obj.Title = title
|
|
|
obj.CreateTime = time.Now()
|
|
|
obj.ModifyTime = time.Now()
|
|
@@ -69,7 +69,7 @@ func ReportKnowledgeResourceClassifyCheckAndSave(reportClassifyId int) (classify
|
|
|
knowledgeClassifyObj := new(models.KnowledgeClassify)
|
|
|
var parentId int
|
|
|
for i, classify := range classifyList {
|
|
|
- knowledgeClassifyObj, err = knowledgeClassifyObj.GetClassifyByNameAndType(classify.ClassifyName, models.KnowledgeResourceTypeReport, parentId)
|
|
|
+ knowledgeClassifyObj, err = knowledgeClassifyObj.GetClassifyByNameTypeAndParentId(classify.ClassifyName, models.KnowledgeResourceTypeOpinion, parentId)
|
|
|
if err != nil {
|
|
|
if !utils.IsErrNoRow(err) {
|
|
|
return
|
|
@@ -83,7 +83,7 @@ func ReportKnowledgeResourceClassifyCheckAndSave(reportClassifyId int) (classify
|
|
|
ModifyTime: time.Now(),
|
|
|
Enabled: 1,
|
|
|
Level: classifyList[j].Level,
|
|
|
- ResourceType: models.KnowledgeResourceTypeReport,
|
|
|
+ ResourceType: models.KnowledgeResourceTypeOpinion,
|
|
|
}
|
|
|
err = tmp.Create()
|
|
|
if err != nil {
|
|
@@ -144,34 +144,34 @@ func ViewPointSave(outId, adminId int, adminRealName, title, content, sourceFrom
|
|
|
msg = "观点保存失败"
|
|
|
return
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- // 更新知识资源库的状态
|
|
|
- var updateCols []string
|
|
|
- if knowledgeResource.Title != title {
|
|
|
- knowledgeResource.Title = title
|
|
|
- updateCols = append(updateCols, "title")
|
|
|
- }
|
|
|
- if knowledgeResource.Content != content {
|
|
|
- knowledgeResource.Content = content
|
|
|
- updateCols = append(updateCols, "content")
|
|
|
- }
|
|
|
- if !knowledgeResource.StartTime.Equal(*startTime) {
|
|
|
- knowledgeResource.StartTime = startTime
|
|
|
- updateCols = append(updateCols, "start_time")
|
|
|
- }
|
|
|
- if knowledgeResource.SourceFrom != sourceFrom {
|
|
|
- knowledgeResource.SourceFrom = sourceFrom
|
|
|
- updateCols = append(updateCols, "source_from")
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ // 更新知识资源库的状态
|
|
|
+ var updateCols []string
|
|
|
+ if knowledgeResource.Title != title {
|
|
|
+ knowledgeResource.Title = title
|
|
|
+ updateCols = append(updateCols, "title")
|
|
|
+ }
|
|
|
+ if knowledgeResource.Content != content {
|
|
|
+ knowledgeResource.Content = content
|
|
|
+ updateCols = append(updateCols, "content")
|
|
|
+ }
|
|
|
+ if !knowledgeResource.StartTime.Equal(*startTime) {
|
|
|
+ knowledgeResource.StartTime = startTime
|
|
|
+ updateCols = append(updateCols, "start_time")
|
|
|
+ }
|
|
|
+ if knowledgeResource.SourceFrom != sourceFrom {
|
|
|
+ knowledgeResource.SourceFrom = sourceFrom
|
|
|
+ updateCols = append(updateCols, "source_from")
|
|
|
+ }
|
|
|
|
|
|
- if len(updateCols) > 0 {
|
|
|
- knowledgeResource.ModifyTime = time.Now()
|
|
|
- updateCols = append(updateCols, "modify_time")
|
|
|
- err = knowledgeResource.Update(updateCols)
|
|
|
- if err != nil {
|
|
|
- msg = "观点保存失败"
|
|
|
- return
|
|
|
+ if len(updateCols) > 0 {
|
|
|
+ knowledgeResource.ModifyTime = time.Now()
|
|
|
+ updateCols = append(updateCols, "modify_time")
|
|
|
+ err = knowledgeResource.Update(updateCols)
|
|
|
+ if err != nil {
|
|
|
+ msg = "观点保存失败"
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return
|
|
@@ -179,7 +179,7 @@ func ViewPointSave(outId, adminId int, adminRealName, title, content, sourceFrom
|
|
|
|
|
|
func ViewPointKnowledgeResourceClassifyCheckAndSave(classifyName string, resourceType int) (classifyId int, err error) {
|
|
|
obj := new(models.KnowledgeClassify)
|
|
|
- obj, err = obj.GetClassifyByNameAndType(classifyName, resourceType, 0)
|
|
|
+ obj, err = obj.GetClassifyByNameTypeAndParentId(classifyName, resourceType, 0)
|
|
|
if err != nil {
|
|
|
if !utils.IsErrNoRow(err) {
|
|
|
return
|