diff --git a/Logs/dsSupport.log b/Logs/dsSupport.log index be1106f6..e3e32a97 100644 --- a/Logs/dsSupport.log +++ b/Logs/dsSupport.log @@ -136,3 +136,24 @@ [Error]2020/09/01 16:55:14 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value [Error]2020/09/01 16:55:14 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value [Error]2020/09/01 16:55:14 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:17 SqlQueryError Error 1054: Unknown column 'da.delete_flag' in 'where clause' +[Error]2020/09/03 08:33:17 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:17 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:17 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:17 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:17 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:17 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:29 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:29 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:29 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:29 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:29 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:33:29 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:34:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:34:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:34:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:34:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:34:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:34:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/03 08:46:37 SqlQueryError Error 1054: Unknown column 'da.delete_flag' in 'where clause' +[Error]2020/09/03 08:47:17 SqlQueryError Error 1054: Unknown column 'da.delete_flag' in 'where clause' diff --git a/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go b/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go index 54039591..13b4d536 100644 --- a/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go +++ b/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go @@ -23,7 +23,7 @@ func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int32, [ var query MySwagger.DataaccessQuery if swag.DatasourceId != "" { - conditions = append(conditions, "da.datasource_id="+"'"+html.EscapeString(swag.DatasourceId)+"'") + conditions = append(conditions, "datasource_id="+"'"+html.EscapeString(swag.DatasourceId)+"'") } if swag.SourceSystemid != "" { var query MySwagger.DatasourceQuery @@ -38,29 +38,33 @@ func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int32, [ SourceSystemIdString += ", '" + v["id"].(string) + "'" } } - conditions = append(conditions, "da.datasource_id in "+"("+html.EscapeString(SourceSystemIdString)+")") + conditions = append(conditions, "datasource_id in "+"("+html.EscapeString(SourceSystemIdString)+")") } } if swag.ConsumeSystemid != "" { - conditions = append(conditions, "da.consume_systemid="+"'"+html.EscapeString(swag.ConsumeSystemid)+"'") + conditions = append(conditions, "consume_systemid="+"'"+html.EscapeString(swag.ConsumeSystemid)+"'") } if swag.QueryFlag != 0 { - conditions = append(conditions, "da.query_flag="+"'"+strconv.Itoa(swag.QueryFlag)+"'") + conditions = append(conditions, "query_flag="+"'"+strconv.Itoa(swag.QueryFlag)+"'") } if swag.SetFlag != 0 { - conditions = append(conditions, "da.set_flag="+"'"+strconv.Itoa(swag.SetFlag)+"'") + conditions = append(conditions, "set_flag="+"'"+strconv.Itoa(swag.SetFlag)+"'") } if swag.ConsumeType != 0 { - conditions = append(conditions, "da.consume_type="+"'"+strconv.Itoa(swag.ConsumeType)+"'") + conditions = append(conditions, "consume_type="+"'"+strconv.Itoa(swag.ConsumeType)+"'") } if swag.ConsumeOrgid != "" { - conditions = append(conditions, "da.consume_orgid="+"'"+html.EscapeString(swag.ConsumeOrgid)+"'") + conditions = append(conditions, "consume_orgid="+"'"+html.EscapeString(swag.ConsumeOrgid)+"'") } if swag.DeleteFlag != 0 { - conditions = append(conditions, "da.delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + } else { + conditions = append(conditions, "delete_flag='-1'") } if swag.EnableFlag != 0 { - conditions = append(conditions, "da.enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + } else { + conditions = append(conditions, "enable_flag='1'") } if swag.Page != 0 { page = swag.Page diff --git a/dsSupport/MyModel/DataError/DataerrorService/DataerrorService.go b/dsSupport/MyModel/DataError/DataerrorService/DataerrorService.go index 3f0f3433..19f75eaa 100644 --- a/dsSupport/MyModel/DataError/DataerrorService/DataerrorService.go +++ b/dsSupport/MyModel/DataError/DataerrorService/DataerrorService.go @@ -28,9 +28,13 @@ func GetDataerrorResults(swag MySwagger.DataerrorSwag) (bool, string, int32, []m if swag.DeleteFlag != 0 { conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + } else { + conditions = append(conditions, "delete_flag='-1'") } if swag.EnableFlag != 0 { conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + } else { + conditions = append(conditions, "enable_flag='1'") } if swag.Page != 0 { page = swag.Page diff --git a/dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go b/dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go index a1aabcc2..861f9a38 100644 --- a/dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go +++ b/dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go @@ -61,9 +61,13 @@ func GetDatasourceResults(swag MySwagger.DatasourceSwag) (bool, string, int32, [ } if swag.DeleteFlag != 0 { conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + } else { + conditions = append(conditions, "delete_flag='-1'") } if swag.EnableFlag != 0 { conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + } else { + conditions = append(conditions, "enable_flag='1'") } if swag.Page != 0 { page = swag.Page diff --git a/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go b/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go index cf363114..6d9dd439 100644 --- a/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go +++ b/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go @@ -41,9 +41,13 @@ func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int32, []map[s } if swag.DeleteFlag != 0 { conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + } else { + conditions = append(conditions, "delete_flag='-1'") } if swag.EnableFlag != 0 { conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + } else { + conditions = append(conditions, "enable_flag='1'") } if swag.Page != 0 { page = swag.Page diff --git a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go index edb1e124..0775ab4f 100644 --- a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go +++ b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go @@ -55,8 +55,15 @@ func GetMetadataResults(swag MySwagger.MetadataSwag) (bool, string, int32, []map if swag.CheckExist != 0 { conditions = append(conditions, "check_exist="+"'"+strconv.Itoa(swag.CheckExist)+"'") } + if swag.DeleteFlag != 0 { + conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + } else { + conditions = append(conditions, "delete_flag='-1'") + } if swag.EnableFlag != 0 { conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + } else { + conditions = append(conditions, "enable_flag='1'") } if swag.Page != 0 { page = swag.Page diff --git a/dsSupport/MyModel/MySwagger/DatasourceESSwag.go b/dsSupport/MyModel/MySwagger/DatasourceESSwag.go index cc95de58..98503f6f 100644 --- a/dsSupport/MyModel/MySwagger/DatasourceESSwag.go +++ b/dsSupport/MyModel/MySwagger/DatasourceESSwag.go @@ -2,9 +2,9 @@ package MySwagger type DatasourceESSwag struct { DatasourceCode string `json:"datasource_code" xorm:"not null comment('数据源编码') VARCHAR(8)" example:"org_tree"` - OrgIDs []string `json:"orgids" xorm:"not null comment('提供数据范围【1：本机构，2：本机构以及下属机构，-1：不限制】') VARCHAR(36)" example:""` + OrgIDs []string `json:"orgids" xorm:"not null comment('提供数据范围【1：本机构，2：本机构以及下属机构，-1：不限制】') VARCHAR(36)" example:"[F38BD0DB-0142-4356-8F2B-623813FC2578,F38BD0DB-0142-4356-8F2B-623813FC2578]"` BeginTime string `json:"begin_time" example:"2020-06-22 17:26:53"` - Conditions map[string]interface{} `json:"conditions" example:""` - Sort map[string]interface{} `json:"sort" example:""` + Conditions map[string]interface{} `json:"conditions" example:"[{res_id:12300,res_name:初一语文一单元作业,teacher_id:123001,time_spend:100s}]"` + Sort map[string]interface{} `json:"sort" example:"[{res_id:12300,res_name:初一语文一单元作业,teacher_id:123001,time_spend:100s}]"` Page int `json:"page" example:"1"` } \ No newline at end of file diff --git a/dsSupport/MyModel/MySwagger/Jyt2012Swag.go b/dsSupport/MyModel/MySwagger/Jyt2012Swag.go index e8a26d7a..015f34f1 100644 --- a/dsSupport/MyModel/MySwagger/Jyt2012Swag.go +++ b/dsSupport/MyModel/MySwagger/Jyt2012Swag.go @@ -14,7 +14,7 @@ import "time" type Jyt2012Swag struct { Id string `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)" example:"F38BD0DB-0142-4356-8F2B-623813FC2578"` DicName string `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)" example:"sex"` - DicValue string `json:"dic_name" xorm:"not null comment('字典/字典项值') VARCHAR(100)" example:"10"` + DicValue string `json:"dic_name" xorm:"not null comment('字典/字典项值') VARCHAR(100)" example:"10"` DicType int `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)" example:"1"` DicInfo string `json:"dic_info" xorm:"default ''NULL'' comment('字典项说明') VARCHAR(500)" example:"我是字典项说明"` RootFlag int `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)" example:"1"` diff --git a/dsSupport/MyModel/OrgTree/OrgtreeService/OrgtreeService.go b/dsSupport/MyModel/OrgTree/OrgtreeService/OrgtreeService.go index f4b1d3ee..8141fada 100644 --- a/dsSupport/MyModel/OrgTree/OrgtreeService/OrgtreeService.go +++ b/dsSupport/MyModel/OrgTree/OrgtreeService/OrgtreeService.go @@ -48,9 +48,13 @@ func GetOrgtreeResults(swag MySwagger.OrgtreeSwag) (bool, string, []map[string]i } if swag.DeleteFlag != 0 { conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'") + } else { + conditions = append(conditions, "delete_flag='-1'") } if swag.EnableFlag != 0 { conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'") + } else { + conditions = append(conditions, "enable_flag='1'") } if swag.Page != 0 { page = swag.Page