字段变为布尔型

dao/base/implments/ScriptItem.dao.impl.go

@@ -312,10 +312,11 @@ func (impl *ScriptItemDAOImplement) UpdateWhere(predicates []grmi.Predicate, ent
  ******************************************************************************/
 func (impl *ScriptItemDAOImplement) SelectTableInfo(tableName string) ([]model.TableData, error) {
 	datalist := make([]model.TableData, 0)
-	err := impl.session.SQL("SELECT COLUMN_NAME as TabMapCol,DATA_TYPE as ColType FROM INFORMATION_SCHEMA.columns WHERE TABLE_NAME=?", tableName).Find(&datalist)
+	err := impl.session.SQL("SELECT COLUMN_NAME as tabmapcol,DATA_TYPE as coltype FROM INFORMATION_SCHEMA.columns WHERE TABLE_NAME=?", tableName).Find(&datalist)
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println(datalist)
 	return datalist, nil
 }
 

meta/base/Script.meta.go

@@ -24,12 +24,12 @@ var Script_ScriptType = grmi.NewField("ScriptType", "[Script].ScriptType", "scri
 var Script_FilePath = grmi.NewField("FilePath", "[Script].FilePath", "filepath", grmi.TypeString)
 var Script_Separator = grmi.NewField("Separator", "[Script].Separator", "separator", grmi.TypeString)
 var Script_UseHead = grmi.NewField("UseHead", "[Script].UseHead", "usehead", grmi.TypeInt)
-var Script_ClearTable = grmi.NewField("ClearTable", "[Script].ClearTable", "cleartable", grmi.TypeInt)
+var Script_ClearTable = grmi.NewField("ClearTable", "[Script].ClearTable", "cleartable", grmi.TypeBool)
 var Script_StartRow = grmi.NewField("StartRow", "[Script].StartRow", "startrow", grmi.TypeInt)
 var Script_StartCol = grmi.NewField("StartCol", "[Script].StartCol", "startcol", grmi.TypeInt)
-var Script_AppendNewRecord = grmi.NewField("AppendNewRecord", "[Script].AppendNewRecord", "appendnewrecord", grmi.TypeInt)
-var Script_UpdateRecord = grmi.NewField("UpdateRecord", "[Script].UpdateRecord", "updaterecord", grmi.TypeInt)
-var Script_AppendAndUpdateRecord = grmi.NewField("AppendAndUpdateRecord", "[Script].AppendAndUpdateRecord", "appendandupdaterecord", grmi.TypeInt)
+var Script_AppendNewRecord = grmi.NewField("AppendNewRecord", "[Script].AppendNewRecord", "appendnewrecord", grmi.TypeBool)
+var Script_UpdateRecord = grmi.NewField("UpdateRecord", "[Script].UpdateRecord", "updaterecord", grmi.TypeBool)
+var Script_AppendAndUpdateRecord = grmi.NewField("AppendAndUpdateRecord", "[Script].AppendAndUpdateRecord", "appendandupdaterecord", grmi.TypeBool)
 var Script_CallSpecFunc = grmi.NewField("CallSpecFunc", "[Script].CallSpecFunc", "callspecfunc", grmi.TypeInt)
 var Script_CallFunction = grmi.NewField("CallFunction", "[Script].CallFunction", "callfunction", grmi.TypeString)
 var Script_InputPara1 = grmi.NewField("InputPara1", "[Script].InputPara1", "inputpara1", grmi.TypeString)

models/base/Script.model.go

@@ -28,12 +28,12 @@ type Script struct {
 	FilePath              string        `xorm:"varchar(50) 'FilePath' not null" json:"Script-FilePath"`
 	Separator             string        `xorm:"varchar(20) 'Separator' not null" json:"Script-Separator"`
 	UseHead               int           `xorm:"int 'UseHead' not null" json:"Script-UseHead"`
-	ClearTable            int           `xorm:"int 'ClearTable' not null" json:"Script-ClearTable"`
+	ClearTable            bool          `xorm:"bit 'ClearTable' not null" json:"Script-ClearTable"`
 	StartRow              int           `xorm:"int 'StartRow' not null" json:"Script-StartRow"`
 	StartCol              int           `xorm:"int 'StartCol' not null" json:"Script-StartCol"`
-	AppendNewRecord       int           `xorm:"int 'AppendNewRecord' not null" json:"Script-AppendNewRecord"`
-	UpdateRecord          int           `xorm:"int 'UpdateRecord' not null" json:"Script-UpdateRecord"`
-	AppendAndUpdateRecord int           `xorm:"int 'AppendAndUpdateRecord' not null" json:"Script-AppendAndUpdateRecord"`
+	AppendNewRecord       bool          `xorm:"bit 'AppendNewRecord' not null" json:"Script-AppendNewRecord"`
+	UpdateRecord          bool          `xorm:"bit 'UpdateRecord' not null" json:"Script-UpdateRecord"`
+	AppendAndUpdateRecord bool          `xorm:"bit 'AppendAndUpdateRecord' not null" json:"Script-AppendAndUpdateRecord"`
 	CallSpecFunc          int           `xorm:"int 'CallSpecFunc' not null" json:"Script-CallSpecFunc"`
 	CallFunction          string        `xorm:"varchar(100) 'CallFunction' not null" json:"Script-CallFunction"`
 	InputPara1            string        `xorm:"varchar(255) 'InputPara1' not null" json:"Script-InputPara1"`

models/base/base.go

@@ -88,9 +88,10 @@ type CustomerLable struct {
  * @Date                     : 2021-12-28
  *
  ******************************************************************************/
+
 type TableData struct {
-	TabMapCol string `json:"TabMapCol" xorm:"-"`
-	ColType   string `json:"ColType" xorm:"-"`
+	Tabmapcol string
+	Coltype   string
 }
 /******************************************************************************
  *

services/ap/implments/CustDemandVerHead.service.impl.go

@@ -1566,6 +1566,9 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 			return grmi.NewBusinessError("Excel缺少Date信息!")
 		}
 		weekDate, err := time.Parse("20060102", dateTime)
+		if err !=nil{
+			return err
+		}
 		week, year, _ := utils.WeekByDate(weekDate)
 		versionId := utils.ValueToString(year, "") + "." + utils.ValueToString(week, "")
 

services/base/implments/Script.service.impl.go

@@ -523,7 +523,7 @@ func (impl *ScriptServiceImplement) ReadXlsx(user *global.User, path string, scr
 		//查询单条语句
 		selectSql := fmt.Sprintf(`SELECT COUNT(*) FROM %s WHERE %s`, tablename, wherestr)
 		//新增新纪录
-		if result.AppendNewRecord == 1 {
+		if result.AppendNewRecord {
 			//2.开始导入
 			_, err := session.Exec(insertSql)
 			if err != nil {
@@ -532,7 +532,7 @@ func (impl *ScriptServiceImplement) ReadXlsx(user *global.User, path string, scr
 		}
 
 		//更新数据表
-		if result.UpdateRecord == 1 {
+		if result.UpdateRecord {
 			//更新
 			_, err = session.Exec(updateSql)
 			if err != nil {
@@ -541,7 +541,7 @@ func (impl *ScriptServiceImplement) ReadXlsx(user *global.User, path string, scr
 		}
 
 		//添加并且更新数据表
-		if result.AppendAndUpdateRecord == 1 {
+		if result.AppendAndUpdateRecord {
 			//查询数据
 			var countLi []int
 			err := session.SQL(selectSql).Find(&countLi)
@@ -562,7 +562,7 @@ func (impl *ScriptServiceImplement) ReadXlsx(user *global.User, path string, scr
 	}
 
 	//新增并且更新纪录
-	if result.ClearTable == 1 {
+	if result.ClearTable {
 		//删除sql语句
 		deleteStr := fmt.Sprintf("delete from %s", tablename)
 		_, err := session.Exec(deleteStr)

services/base/implments/ScriptItem.service.impl.go

@@ -350,8 +350,8 @@ func (impl *ScriptItemServiceImplement) SelectTableInfo(user *global.User, table
 	}
 	for _, v := range datalist {
 		dataone := model.ScriptItem{}
-		dataone.TabMapCol = v.TabMapCol
-		dataone.ColFieldType = v.ColType
+		dataone.TabMapCol = v.Tabmapcol
+		dataone.ColFieldType = v.Coltype
 		data = append(data, dataone)
 	}
 	return data, nil

web/controllers/base/Script.rest.go

@@ -460,7 +460,7 @@ func RegisterUploadExcel(party router.Party, httpMethod string, path string, met
 			return
 		}
 		guid := utils.MakeOrderSn("script")
-		savePath := "public/uploadxlsx/" + info.Filename + "_" + guid + ".xlsx"
+		savePath := "web/public/uploadxlsx/" + info.Filename + "_" + guid + ".xlsx"
 		err = utils.SaveUploadedFile(info, savePath)
 		if err != nil {
 			supports.Error(ctx, iris.StatusBadRequest, "保存上传文件出错,err: "+err.Error(), nil)