Merge branch 'dev' of http://123.132.248.154:10000/chenwei/lanlingxian_ziranziyuanheguihua into dev
commit
20f9192e1d
|
|
@ -1842,15 +1842,15 @@ namespace OpenAuth.App.FormScheme
|
|||
public (List<object> Headers, List<dynamic> Data) GetFormDataHistory(
|
||||
FormDataHistoryReq req)
|
||||
{
|
||||
// ① 取到整张表的列名+中文描述
|
||||
// 取到整张表的列名+中文描述
|
||||
var allColumns = GetTableColumnsWithDescriptions(req.table); // [(FieldName,Description)]
|
||||
// 表单
|
||||
// 表单
|
||||
Repository.Domain.FormScheme schemeEntity = GetScheme(req.schemeId).Result;
|
||||
FormSchemeNewModel formSchemeModel = schemeEntity.Scheme.ToObject<FormSchemeNewModel>();
|
||||
var chilTable = formSchemeModel.Db.Find(t => t.Type == "chlid");
|
||||
var reqkey = chilTable.Field;
|
||||
|
||||
// ② 先执行查询,拿到数据
|
||||
// 先执行查询,拿到数据
|
||||
string fieldSql = string.Join(",", req.field.Select(f => $"\"{f}\""));
|
||||
string sql = $"SELECT {fieldSql} FROM \"{req.table}\" WHERE \"{reqkey}\" = @p0";
|
||||
|
||||
|
|
@ -1863,7 +1863,7 @@ namespace OpenAuth.App.FormScheme
|
|||
});
|
||||
}
|
||||
|
||||
// ③ 生成 item1:{title , dataIndex}
|
||||
// 生成 item1:{title , dataIndex}
|
||||
var item1 = req.field
|
||||
.Select(f =>
|
||||
{
|
||||
|
|
@ -1873,7 +1873,7 @@ namespace OpenAuth.App.FormScheme
|
|||
})
|
||||
.ToList<object>();
|
||||
|
||||
// ④ 把 DataTable → List<dynamic> (item2)
|
||||
// DataTable → List<dynamic> (item2)
|
||||
var item2 = dt.AsEnumerable()
|
||||
.Select(r =>
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue