Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

controllers/classify.go

@@ -355,7 +355,7 @@ func (this *ClassifyController) ParentClassify() {
 	parentMenus, e := models.GetClassifyMenuList(menuCond, menuPars)
 	if e != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取一级分类子目录列表失败"
+		br.ErrMsg = fmt.Sprintf("获取一级分类子目录列表失败, %v", e)
 		return
 	}
 	for i := range parentMenus {
@@ -494,7 +494,7 @@ func (this *ClassifyController) ListClassify() {
 	parentMenus, e := models.GetClassifyMenuList(menuCond, menuPars)
 	if e != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取一级分类子目录列表失败"
+		br.ErrMsg = fmt.Sprintf("获取一级分类子目录列表失败, %v", e)
 		return
 	}
 	for i := range parentMenus {

models/classify_menu.go

@@ -3,7 +3,6 @@ package models
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -47,7 +46,7 @@ func (item *ClassifyMenu) InsertMulti(items []*ClassifyMenu) (err error) {
 
 // GetClassifyMenuById 主键获取子目录
 //func GetClassifyMenuById(id int) (item *ClassifyMenu, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	sql := `SELECT * FROM classify_menu WHERE menu_id = ? LIMIT 1`
 //	err = o.Raw(sql, id).QueryRow(&item)
 //	return
@@ -55,11 +54,11 @@ func (item *ClassifyMenu) InsertMulti(items []*ClassifyMenu) (err error) {
 
 // GetClassifyMenuList 获取子目录列表
 func GetClassifyMenuList(condition string, pars []interface{}) (list []*ClassifyMenu, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM classify_menu WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY sort ASC, create_time ASC`
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -72,7 +71,7 @@ type ClassifyMenuSaveReq struct {
 
 // InsertAndUpdateClassifyMenu 新增/编辑/删除分类子目录
 //func InsertAndUpdateClassifyMenu(insertMenus []*ClassifyMenu, editMenus []*ClassifyMenu, deleteMenuIds []int) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
+//	o := global.DbMap[utils.DbNameReport]
 //	tx, err := o.Begin()
 //	if err != nil {
 //		return

models/document_manage_model/outside_report.go

@@ -4,6 +4,7 @@ package document_manage_model
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
@@ -114,9 +115,9 @@ func GetOutsideReportById(id int) (outsideReport *OutsideReport, err error) {
 }
 
 // UpdateOutsideReport 更新报告
-func UpdateOutsideReport(outsideReport *OutsideReport) (err error) {
+func UpdateOutsideReport(outsideReport *OutsideReport, cols []string) (err error) {
 	o := global.DbMap[utils.DbNameReport]
-	err = o.Updates(outsideReport).Error
+	err = o.Select(cols).Updates(outsideReport).Error
 	return
 }
 

services/classify.go

@@ -326,7 +326,7 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 				tempReport.ClassifyId = classify.Id
 				tempReport.ClassifyName = classifyName
 				// 修改报告
-				err := document_manage_model.UpdateOutsideReport(&tempReport)
+				err := document_manage_model.UpdateOutsideReport(&tempReport, []string{"ClassifyId", "ClassifyName"})
 				if err != nil {
 					return err, "修改外部报告分类失败", false
 				}

services/document_manage_service/document_manage_service.go

@@ -6,11 +6,12 @@ import (
 	"eta/eta_api/models/document_manage_model"
 	"eta/eta_api/utils"
 	"fmt"
+	"html"
+	"strconv"
+
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/google/uuid"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"html"
-	"strconv"
 )
 
 func DocumentClassifyList() ([]models.ClassifyVO, error) {
@@ -411,7 +412,7 @@ func DocumentUpdate(outsideReport *document_manage_model.OutsideReportBO) error
 	}
 	report.ModifyTime = utils.GetCurrentTime()
 	//report.ReportUpdateTime = utils.GetCurrentTime()
-	err = document_manage_model.UpdateOutsideReport(report)
+	err = document_manage_model.UpdateOutsideReport(report, []string{"Title", "Abstract", "ClassifyId", "ClassifyName", "Content", "ModifyTime"})
 	if err != nil {
 		return fmt.Errorf("更新报告失败, Err: %s", err.Error())
 	}