Merge remote-tracking branch 'origin/master' into master

backend/src/dashoo.cn/modi_webapi/app/api/course/course.go

@@ -1,28 +1,26 @@
 package course
 
 import (
+	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/model/course"
 	service "dashoo.cn/modi_webapi/app/service/course"
-	"github.com/gogf/gf/os/glog"
-
 	"dashoo.cn/modi_webapi/library/request"
-	"dashoo.cn/modi_webapi/library/response"
 	"fmt"
 	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/glog"
 )
 
 // 课程管理API管理对象
 type Controller struct {
 }
 
-
 //  获取课程管理列表
-func (c *Controller) GetAllCourse(r *ghttp.Request){
+func (c *Controller) GetAllCourse(r *ghttp.Request) {
 	page := request.GetPageInfo(r)
 	where := ""
 
 	if year := r.GetInt("Year"); year != 0 {
-		if where == ""{
+		if where == "" {
 			where = fmt.Sprintf(" Year = %v", year)
 		} else {
 			where += fmt.Sprintf(" AND Year = %v", year)
@@ -30,7 +28,7 @@ func (c *Controller) GetAllCourse(r *ghttp.Request){
 	}
 
 	if term := r.GetInt("Term"); term != 0 {
-		if where == ""{
+		if where == "" {
 			where = fmt.Sprintf(" Term LIKE '%%%v%%'", term)
 		} else {
 			where += fmt.Sprintf(" AND Term LIKE '%%%v%%'", term)
@@ -38,13 +36,13 @@ func (c *Controller) GetAllCourse(r *ghttp.Request){
 	}
 
 	var result []course.Entity
-	if err := course.GetAllCourse(page, where, &result); err != nil{
-		if err.Error() == "sql: no rows in result set"{
+	if err := course.GetAllCourse(page, where, &result); err != nil {
+		if err.Error() == "sql: no rows in result set" {
 			response.Json(r, 0, "")
 			return
 		}
 		response.Json(r, -1, err.Error())
-	}else {
+	} else {
 		count, err1 := course.FindCourseCount(where)
 		if err1 != nil {
 			response.Json(r, -1, err1.Error())
@@ -58,15 +56,16 @@ func (c *Controller) GetAllCourse(r *ghttp.Request){
 }
 
 // Delete 删除课程主表信息
-func (c *Controller) DeleteCourse(r *ghttp.Request){
+func (c *Controller) DeleteCourse(r *ghttp.Request) {
 	id := r.GetInt("id")
-	if _,err := course.Delete(fmt.Sprintf("Id=%v", id)); err != nil{
+	if _, err := course.Delete(fmt.Sprintf("Id=%v", id)); err != nil {
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	} else {
 		response.Json(r, 0, "该记录已删除！")
 	}
 }
+
 // 修改课程信息
 func (c *Controller) AddCourse(r *ghttp.Request) {
 	// tenant 租户模式
@@ -100,6 +99,7 @@ func (c *Controller) AddCourse(r *ghttp.Request) {
 	}
 
 }
+
 // GetDetailById 根据id信息详情
 func (c *Controller) GetDetailById(r *ghttp.Request) {
 	// tenant 租户模式

backend/src/dashoo.cn/modi_webapi/app/api/course/detail/detail.go

@@ -1,10 +1,10 @@
 package detail
 
 import (
+	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/model/course/detail"
 	detailService "dashoo.cn/modi_webapi/app/service/course/detail"
 	"dashoo.cn/modi_webapi/library/request"
-	"dashoo.cn/modi_webapi/library/response"
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/glog"
 )
@@ -71,14 +71,19 @@ func (c CourseDetailController) Save(r *ghttp.Request) {
 	if err != nil {
 		response.Json(r, -1, err.Error())
 	}
+	// 获取操作人
+	realName := r.GetParamVar("realname").String()
+
 	// 判断是新增还是删除，获取的id为空新增，不为空则更新
 	if entity.Id > 0 {
+		entity.UpdatedBy = realName
 		if detail, err := service.Update(entity); err != nil {
 			response.Json(r, 1, err.Error())
 		} else {
 			response.Json(r, 0, "更新成功", detail)
 		}
 	} else {
+		entity.CreatedBy = realName
 		if newId, err := service.Add(entity); err != nil {
 			response.Json(r, 1, err.Error())
 		} else {
@@ -112,14 +117,18 @@ func (c CourseDetailController) DeleteDetailById(r *ghttp.Request) {
 	tenant := r.Header.Get("Tenant")
 	// 详情id
 	Ids := r.GetInts("ids")
-	delReq := new(detail.DeleteReq)
-	delReq.Ids = Ids
+	delIdsReq := new(detail.DeleteIdsReq)
+	delUpdReq := new(detail.DeleteUpdReq)
+	delIdsReq.Id = Ids
+	// 获取操作人
+	realName := r.GetParamVar("realname").String()
+	delUpdReq.UpdatedBy = realName
 	// 初始化课程详情service
 	service, err := detailService.NewCourseDetailService(tenant)
 	if err != nil {
 		response.Json(r, -1, err.Error())
 	}
-	if err := service.DeleteById(delReq); err != nil {
+	if err := service.DeleteById(delIdsReq, delUpdReq); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
 		response.Json(r, 0, "删除成功")

backend/src/dashoo.cn/modi_webapi/app/model/course/detail/detail.go

@@ -42,9 +42,12 @@ type SearchEntity struct {
 }
 
 // 删除详情请求
-type DeleteReq struct {
-	Ids         []int       // 批量删除，id以逗号隔开
+type DeleteUpdReq struct {
 	IsDel       int         `orm:"isDel"`       // 是否删除 0未删除 1已删除
 	UpdatedBy   string      `orm:"UpdatedBy"`   // 更新人
 	UpdatedTime *gtime.Time `orm:"UpdatedTime"` // 更新时间
 }
+
+type DeleteIdsReq struct {
+	Id []int // 批量删除，id以逗号隔开
+}

backend/src/dashoo.cn/modi_webapi/app/service/course/detail/detail.go

@@ -40,7 +40,6 @@ func (s CourseDetailService) Update(param *detail.Entity) (*detail.Entity, error
 	}
 	// 设置更新时间
 	param.UpdatedTime = gtime.Now()
-	// todo 更新用户
 	if _, err = s.SafeModel.WherePri(param.Id).Update(param); err != nil {
 		return nil, err
 	}
@@ -97,12 +96,12 @@ func (s CourseDetailService) GetDetailById(id int) (res *detail.Entity, err erro
 }
 
 // 删除
-func (s CourseDetailService) DeleteById(param *detail.DeleteReq) error {
-	dIds := param.Ids
+func (s CourseDetailService) DeleteById(Ids *detail.DeleteIdsReq, param *detail.DeleteUpdReq) error {
 	//设置更新时间
 	param.UpdatedTime = gtime.Now()
-	// todo 更新用户
-	if _, err := s.SafeModel.WherePri(dIds).Update("isDel = 1"); err != nil {
+	// 修改删除状态
+	param.IsDel = 1
+	if _, err := s.SafeModel.WherePri(Ids).Update(param); err != nil {
 		return err
 	}
 	return nil

frontend_web/src/views/course/detail/index.vue

@@ -166,13 +166,6 @@
             this.doRefresh()
         },
         methods: {
-            formatTeachers (row, column) {
-                for (var i = 0; i < this.Teachers.length; i++) {
-                    if (parseInt(this.Teachers[i].ItemValue) === row.Teacher) {
-                        return this.Teachers[i].ItemName
-                    }
-                }
-            },
             // 表格就绪后后执行
             onGridReady (params) {
                 // 调整表格列宽大小自适应