Merge branch 'dev2.3.12' of http://192.168.3.207:8080/group3/qmx_admin into dev2.3.12

src/templateManage/jyTemplateManageController.go

@@ -12,20 +12,28 @@ import (
 func List(context *admin.Context) (interface{}, error) {
 	//接收前端参数
 	param := new(struct {
-		Search string `form:"search"`
+		Search   string `form:"search"`
+		Offset   int    `form:"offset"`
+		PageSize int    `form:"pageSize"`
 	})
 	err := context.Form(param)
 	if err != nil {
 		return nil, err
 	}
+	offSet := param.Offset
+	pageSize := param.PageSize
 	data := make(map[string]interface{})
-	var sql = "SELECT * FROM template_manage where   state=1 ORDER BY create_time desc"
+	var sql = "SELECT * FROM template_manage where   state=1 ORDER BY create_time desc "
 	if param.Search != "" {
 		sql = "SELECT * FROM template_manage where state=1 and  ( template_name like '%" + param.Search + "%'  or template_id like '%" + param.Search + "%') ORDER BY create_time desc"
 	}
 	res := util.JysqlDB.SelectBySql(sql)
-	data["lists"] = res
 	data["total"] = len((*res))
+	sql = "SELECT * FROM template_manage where   state=1 ORDER BY create_time desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
+	if param.Search != "" {
+		sql = "SELECT * FROM template_manage where state=1 and  ( template_name like '%" + param.Search + "%'  or template_id like '%" + param.Search + "%') ORDER BY create_time desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
+	}
+	data["lists"] = res
 	return data, nil
 }
 
@@ -63,7 +71,7 @@ func Update(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	if param.Id != 0 {
-		fool := UpdateSceneOne(param.Id, param.NewsContent, param.NewsTitle, param.NewsType, param.PcLink, param.TemplateName, param.WxLink, param.AndroidLink, param.AppleLink)
+		fool := UpdateSceneOne(param.Id, param.NewsContent, param.NewsTitle, param.NewsType, param.PcLink, param.TemplateName, param.WxLink, param.AndroidLink, param.AppleLink, context.User.Username)
 		return fool, nil
 	} else {
 		return "缺少参数", nil
@@ -100,6 +108,7 @@ func Add(context *admin.Context) (interface{}, error) {
 		"wx_link":       param.WxLink,
 		"template_id":   fmt.Sprint(now.Unix()) + fmt.Sprint(rand.Intn(100)),
 		"create_people": context.User.Username,
+		"last_people":   context.User.Username,
 		"create_time":   now,
 		"last_time":     now,
 		"state":         "1",
@@ -120,7 +129,7 @@ func Delete(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	if param.Id != 0 {
-		ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": 0})
+		ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": 0, "last_time": time.Now(), "last_people": context.User.Username})
 		if !ok {
 			return nil, errors.New("删除模板信息失败")
 		}

src/templateManage/jyTemplateManageService.go

@@ -16,8 +16,8 @@ func FindOneTemplate(id int) (res map[string]interface{}) {
 	return data
 }
 
-func UpdateSceneOne(id int, newsContent, newsTitle, newsType, pcLink, templateName, wxLink, androidLink, appleLink string) bool {
-	ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now()})
+func UpdateSceneOne(id int, newsContent, newsTitle, newsType, pcLink, templateName, wxLink, androidLink, appleLink, username string) bool {
+	ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now(), "last_people": username})
 	if !ok {
 		return false
 	}