updates
parent
82dd7be4c0
commit
50d5d59f0b
|
|
@ -829,7 +829,7 @@ namespace Journeys_WantHome.Controllers
|
||||||
|
|
||||||
string kol_uid = obj["kol_uid"].ToString();
|
string kol_uid = obj["kol_uid"].ToString();
|
||||||
|
|
||||||
List<kolProject> kolProjects = conn.Query<kolProject>("select * from kolProject where kol_uid = @kol_uid order by kolProject_modifydate desc", new { kol_uid = kol_uid }).ToList();
|
List<kolProject> kolProjects = conn.Query<kolProject>("select A.* from kolProject A, project B where A.project_uid = B.project_uid and A.kol_uid = @kol_uid order by A.kolProject_modifydate desc", new { kol_uid = kol_uid }).ToList();
|
||||||
|
|
||||||
foreach (kolProject item in kolProjects)
|
foreach (kolProject item in kolProjects)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ public class kolProjectDetail
|
||||||
public List<kolCooperateType> kolCooperateTypes = new List<kolCooperateType>();
|
public List<kolCooperateType> kolCooperateTypes = new List<kolCooperateType>();
|
||||||
public List<kolCooperateTypeDetail> kolCooperateTypeDetails = new List<kolCooperateTypeDetail>();
|
public List<kolCooperateTypeDetail> kolCooperateTypeDetails = new List<kolCooperateTypeDetail>();
|
||||||
public List<kolProjectFile> kolProjectFiles = new List<kolProjectFile>();
|
public List<kolProjectFile> kolProjectFiles = new List<kolProjectFile>();
|
||||||
public project project = new project();
|
public project project;
|
||||||
|
|
||||||
public kolProjectDetail()
|
public kolProjectDetail()
|
||||||
{
|
{
|
||||||
|
|
@ -41,7 +41,8 @@ public class kolProjectDetail
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
project = conn.QueryFirst<project>("select * from project where project_uid = @project_uid ", new { project_uid = kolProject.project_uid });
|
project = conn.QueryFirstOrDefault<project>("select * from project where project_uid = @project_uid ", new { project_uid = kolProject.project_uid });
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1086,7 +1086,12 @@ $(document).ready(function () {
|
||||||
//}
|
//}
|
||||||
|
|
||||||
],
|
],
|
||||||
|
responsive: {
|
||||||
|
details: {
|
||||||
|
display: $.fn.dataTable.Responsive.display.childRowImmediate,
|
||||||
|
type: ''
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSearchRecords: function handleSearchRecords() {
|
handleSearchRecords: function handleSearchRecords() {
|
||||||
|
|
@ -1242,7 +1247,12 @@ $(document).ready(function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
],
|
],
|
||||||
|
responsive: {
|
||||||
|
details: {
|
||||||
|
display: $.fn.dataTable.Responsive.display.childRowImmediate,
|
||||||
|
type: ''
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSearchRecords: function handleSearchRecords() {
|
handleSearchRecords: function handleSearchRecords() {
|
||||||
|
|
|
||||||
|
|
@ -461,7 +461,12 @@ $(document).ready(function () {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
responsive: {
|
||||||
|
details: {
|
||||||
|
display: $.fn.dataTable.Responsive.display.childRowImmediate,
|
||||||
|
type: ''
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSearchRecords: function handleSearchRecords() {
|
handleSearchRecords: function handleSearchRecords() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue