From 6d575116cec9baae247d8af9fa6d6bd712429997 Mon Sep 17 00:00:00 2001
From: cobb <emoxun8215@126.com>
Date: Tue, 12 Apr 2022 09:17:47 +0800
Subject: [PATCH] fix

---
 main.go                       | 14 +++++++-------
 src/components/HelloWorld.vue | 25 ++++++++++---------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/main.go b/main.go
index 82251af..178022f 100644
--- a/main.go
+++ b/main.go
@@ -14,17 +14,17 @@ var (
 func main() {
 	pflag.Parse()
 	s := `
-	CREATE TABLE IF NOT EXISTS qiangjunwang.gb_question (
-	id int(11) NOT NULL AUTO_INCREMENT COMMENT '问卷id',
-	title varchar(255) DEFAULT NULL COMMENT '问卷标题',
+	CREATE TABLE IF NOT EXISTS qiangjunwang.gb_question_answer (
+	id int(11) NOT NULL AUTO_INCREMENT COMMENT '用户id',
+	ques_id bigint(20) NOT NULL COMMENT '问卷调查表ID',
 	file_url varchar(255) DEFAULT NULL COMMENT '文件地址',
-	remark varchar(255) DEFAULT NULL COMMENT '备注',
-	admin_id bigint(20) NULL DEFAULT NULL COMMENT '创建人员ID',
-	admin_name varchar(64) DEFAULT NULL COMMENT '创建人员名字',
+	remark varchar(255) DEFAULT NULL,
+	admin_id bigint(20) NULL DEFAULT NULL COMMENT '提交人员ID',
+	admin_name varchar(64) DEFAULT NULL COMMENT '提交人员名字',
 	update_time int(11) NULL DEFAULT 0 COMMENT '修改时间',
 	create_time int(11) NULL DEFAULT 0 COMMENT '创建时间',
 	PRIMARY KEY (id)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '问卷调查表';
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '问卷调查答案表';
 `
 
 	res, err := parser.ParseSqlFormat(s,
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
index 5c95433..31f2a86 100644
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -485,6 +485,13 @@ export default {
       return db
     }
 
+	func (obj *${tableNameLower}Q) where(key string, value interface{}) {
+		obj.opts = append(obj.opts, func(db *gorm.DB) *gorm.DB {
+			db = db.Where(obj.Repo.PreTableName(key), value)
+			return db
+		})
+	}
+
     func (obj *${tableNameLower}Q) Select(strings ...string) *${tableNameLower}Q {
       fn := func(db *gorm.DB) *gorm.DB {
         if len(strings) > 0 {
@@ -617,11 +624,7 @@ export default {
           `;
           optCommon += `
             func (obj *${tableNameLower}Q) ${skey}In(${skey}s ...${type}) *${tableNameLower}Q {
-              	fn := func(db *gorm.DB) *gorm.DB {
-		            db = db.Where(obj.Repo.PreTableName("${key} in (?)"), ${skey}s)
-		            return db
-	             }
-              obj.opts = append(obj.opts, fn)
+		      obj.where("${key} in (?)", ${skey}s)
               return obj
             }
             \n
@@ -645,11 +648,7 @@ export default {
           }
           optCommon += `
             func (obj *${tableNameLower}Q) ${skey}(${skey} ${type}) *${tableNameLower}Q {
-              fn := func(db *gorm.DB) *gorm.DB {
-                db = db.Where(obj.Repo.PreTableName("${key} = ?"), ${skey})
-                return db
-              }
-              obj.opts = append(obj.opts, fn)
+              obj.where("${key} = ?", ${skey})
               return obj
             }
             \n
@@ -663,11 +662,7 @@ export default {
             `;
             optCommon += `
             func (obj *${tableNameLower}Q) ${skey}Like(${skey} ${type}) *${tableNameLower}Q {
-              fn := func(db *gorm.DB) *gorm.DB {
-                db = db.Where(obj.Repo.PreTableName("${key} like ?"), "%"+${skey}+"%")
-                return db
-              }
-              obj.opts = append(obj.opts, fn)
+              obj.where("${key} like ?", "%"+${skey}+"%")
               return obj
             }
             \n