|
|
|
@ -281,8 +281,8 @@ func (c *CustomerFormMaster) CreateFormTable() (relevance string, err error) { |
|
|
|
|
|
|
|
var tableFormSqlAry FormTableSql |
|
|
|
tableFormSqlAry.TableSubUnitAnalysis(c.Form.Name, c.List, true, tableFieldList) |
|
|
|
// jsonStr, _ := json.Marshal(tableFieldList)
|
|
|
|
// fmt.Printf("数据表-----》%v\n", string(jsonStr))
|
|
|
|
jsonStr, _ := json.Marshal(tableFieldList) |
|
|
|
fmt.Printf("数据表-----》%v\n", string(jsonStr)) |
|
|
|
isSunForm := false |
|
|
|
if len(tableFormSqlAry.MasterSql) <= 0 { |
|
|
|
err = errors.New("没有主表!") |
|
|
|
@ -294,7 +294,7 @@ func (c *CustomerFormMaster) CreateFormTable() (relevance string, err error) { |
|
|
|
} else { |
|
|
|
err = CreateForm(c.Form.Name, c.Form.FormName, "MyISAM", true) |
|
|
|
} |
|
|
|
// fmt.Printf("数据表--1---》%v\n", tableFormSqlAry.MasterSql)
|
|
|
|
fmt.Printf("数据表--1---》%v\n", tableFormSqlAry.MasterSql) |
|
|
|
CreateFormFiled(c.Form.Name, c.Form.FormName, true, tableFormSqlAry.MasterSql) //添加主表字段
|
|
|
|
sunFormNameAry := make(map[string]string) |
|
|
|
var sunTableNameAry []string |
|
|
|
@ -476,6 +476,8 @@ func newFieldOld(tablename string, oldTable, alreadyExists []string) (sql []stri |
|
|
|
sql = append(sql, fmt.Sprintf("ALTER TABLE `%v` ADD COLUMN %v int(1) unsigned NOT NULL DEFAULT '1' COMMENT '状态(1:启用,2:禁用;3:删除)';", tablename, v)) |
|
|
|
case "flowIsOpen": |
|
|
|
sql = append(sql, fmt.Sprintf("ALTER TABLE `%v` ADD COLUMN %v int(1) unsigned NOT NULL DEFAULT '2' COMMENT '是否开启工作流';", tablename, v)) |
|
|
|
case "createrOrg": |
|
|
|
sql = append(sql, fmt.Sprintf("ALTER TABLE `%v` ADD COLUMN %v int(1) unsigned NOT NULL DEFAULT '2' COMMENT '创建人行政组织';", tablename, v)) |
|
|
|
default: |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1571,7 +1573,7 @@ func (a *ApiMethod) GainFormPageListCont(c *gin.Context) { |
|
|
|
for i, v := range formList { |
|
|
|
formList[i]["isRetract"] = false |
|
|
|
if mastrKey, ok := v["runFlowId"]; ok { |
|
|
|
// fmt.Printf("masters_key----------->%v\n", v["masters_key"])
|
|
|
|
fmt.Printf("runFlowId------wrewrwerwerwerwe----->%v\n", v["runFlowId"]) |
|
|
|
mastrKeyInt, _ := publicmethod.StringToInt64(mastrKey) |
|
|
|
if mastrKeyInt != 0 { |
|
|
|
var runFlowInfo customerForm.RunWorkflow |
|
|
|
|