考勤类型
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js
index e8d5700c1..e5e4e2669 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js
@@ -21,6 +21,8 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
param: {}
});
+
+ $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
},
initData: function () {
if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
index 9659fb013..f39527928 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
@@ -98,23 +98,55 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetPageList',
headData: [
- { label: "员工名字", name: "UserName", width: 100, align: "left" },
+ {
+ label: "员工名字", name: "UserNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_account',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
{ label: "员工编号", name: "UserNo", width: 100, align: "left" },
{
label: "部门", name: "Department", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('department', {
+ console.log(value);
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
+ keyId: 'id',
callback: function (_data) {
- callback(_data.name);
+ callback(_data['name']);
}
});
}
},
- { label: "考勤类型", name: "ADType", width: 100, align: "left" },
+ {
+ label: "考勤类型", name: "ADType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'ADType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ } },
{ label: "考勤时间", name: "ADTime", width: 100, align: "left" },
{ label: "打卡时间", name: "ClockTime", width: 100, align: "left" },
- { label: "打卡结果", name: "ClockStatus", width: 100, align: "left" },
+ {
+ label: "打卡结果", name: "ClockStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'ADStatus',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ } },
{ label: "打卡地点", name: "ClockPlace", width: 100, align: "left" },
],
mainId: 'ID',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ContractManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ContractManagement/Index.js
index 8e9871097..4989de272 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ContractManagement/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ContractManagement/Index.js
@@ -246,9 +246,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- callback(_data['f_fullname']);
+ callback(_data['name']);
}
});
}
@@ -259,9 +259,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- callback(_data['f_fullname']);
+ callback(_data['name']);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Form.js
index c1789c22d..4712aa4a7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Form.js
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' });
+ $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
$('#UnitName').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
$('#Type').lrDataItemSelect({ code: 'EUserType' });
$('#RelationShip').lrDataItemSelect({ code: 'ERelationship' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Index.js
index de8405081..0ce585346 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Index.js
@@ -119,9 +119,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- callback(_data['f_fullname']);
+ callback(_data['name']);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Form.js
index a604a7ddb..ba6a8eae4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Form.js
@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
},
bind: function () {
$('#Creater').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
- $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' });
+ $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
$('#UnitName').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
$('#Type').lrDataItemSelect({ code: 'EUserType' });
$('#RelationShip').lrDataItemSelect({ code: 'ERelationship' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.js
index 2b75f8df3..78becc06f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.js
@@ -113,9 +113,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- callback(_data['f_fullname']);
+ callback(_data['name']);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js
index 58043e523..89963173f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js
@@ -83,9 +83,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- callback(_data['f_fullname']);
+ callback(_data['name']);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_BrowseRecord/IndexFile.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_BrowseRecord/IndexFile.js
index db9f63486..a661b0f31 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_BrowseRecord/IndexFile.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_BrowseRecord/IndexFile.js
@@ -29,10 +29,10 @@ var bootstrap = function ($, learun) {
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
sync: true,
callback: function (_data) {
- callback(_data.f_fullname);
+ callback(_data.name);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Form.js
index 0fc63559e..d870d723c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Form.js
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#WPDepartment').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' });
+ $('#WPDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
$('#WPUser').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
$('#WPTimeType').lrDataItemSelect({ code: 'WorkPlanType' });
$('#WPFile').lrUploader();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Index.js
index a85a1ca3d..8421fa908 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Index.js
@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
- $('#WPDepartment').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' });
+ $('#WPDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
$('#WPUser').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
$('#WPTimeType').lrDataItemSelect({ code: 'WorkPlanType' });
// 刷新
@@ -110,9 +110,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- callback(_data['f_fullname']);
+ callback(_data['name']);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Form.js
index 13dbbbe37..bd95ecd75 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Form.js
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#WSDepartment').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' });
+ $('#WSDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
$('#WSUser').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
$('#WSTimeType').lrDataItemSelect({ code: 'WorkSummaryType' });
$('#WSFile').lrUploader();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Index.js
index 53b3bc119..8ca93d5cb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Index.js
@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
- $('#WSDepartment').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' });
+ $('#WSDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
$('#WSUser').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
$('#WSTimeType').lrDataItemSelect({ code: 'WorkSummaryType' });
// 刷新
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
index 0604b69c8..3047b8b85 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
@@ -486,9 +486,9 @@
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- result = _data.f_fullname;
+ result = _data.name;
}
});
return result;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
index 202a069d3..d78388a52 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
@@ -527,9 +527,9 @@
sync: true,
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
- keyId: 'f_departmentid',
+ keyId: 'id',
callback: function (_data) {
- result = _data.f_fullname;
+ result = _data.name;
}
});
return result;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
index b44b2369b..e5248474d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
@@ -29,9 +29,23 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
{
try
{
+ var baseDataName = this.BaseRepository().getDbConnection().Database;
var strSql = new StringBuilder();
- strSql.Append("SELECT * ");
- strSql.Append(" FROM ADR_Record t ");
+ strSql.Append(@"SELECT t.ID,
+ emp.F_RealName UserName,
+ t.UserNo,
+ emp.F_DepartmentId Department ,
+ t.ADType,
+ t.ADTime,
+ t.ClockTime,
+ t.ClockStatus,
+ t.ClockPlace,
+ t.ADYear,
+ t.ADMonth,
+ t.ADDay,
+ t.ADPhoto
+ ");
+ strSql.Append($" FROM ADR_Record t RIGHT JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
@@ -45,13 +59,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
if (!queryParam["UserName"].IsEmpty())
{
dp.Add("UserName", "%" + queryParam["UserName"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.UserName Like @UserName ");
+ strSql.Append(" AND emp.EmpName Like @UserName ");
}
if (!queryParam["Department"].IsEmpty())
{
dp.Add("Department",queryParam["Department"].ToString(), DbType.String);
- strSql.Append(" AND t.Department = @Department ");
+ strSql.Append(" AND emp.F_DepartmentId = @Department ");
}
+
+
return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString(),dp, pagination);
}
catch (Exception ex)