Browse Source

数据源 departmentid 改为 id

考勤记录 根据no 查询 name 和 department
大厂分支
zhichao lei 4 years ago
parent
commit
e3acc36eb9
27 changed files with 102 additions and 56 deletions
  1. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
  2. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Index.js
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_PurchaseApply/Index.js
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js
  7. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
  8. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
  9. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js
  10. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
  11. +1
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml
  12. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js
  13. +37
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
  14. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ContractManagement/Index.js
  15. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Form.js
  16. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Index.js
  17. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Form.js
  18. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.js
  19. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js
  20. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_BrowseRecord/IndexFile.js
  21. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Form.js
  22. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Index.js
  23. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Form.js
  24. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Index.js
  25. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
  26. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
  27. +20
    -4
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs

+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js View File

@@ -147,9 +147,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']);
}
});
}
@@ -186,9 +186,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']);
}
});
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Index.js View File

@@ -120,9 +120,9 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'f_fullname',
keyId: 'name',
callback: function (_data) {
callback(_data['f_departmentid']);
callback(_data['id']);
}
});
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_PurchaseApply/Index.js View File

@@ -203,9 +203,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']);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js View File

@@ -26,7 +26,7 @@ var bootstrap = function ($, learun) {
bind: function () {
var loginInfo = top.learun.clientdata.get(['userinfo']);
$('#ReceiveUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }).lrselectSet(loginInfo.userId);
$('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' }).lrselectSet(loginInfo.departmentId);
$('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }).lrselectSet(loginInfo.departmentId);
$('#Ass_ReceiveItem').jfGrid({
headData: [
{


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js View File

@@ -26,7 +26,7 @@ var bootstrap = function ($, learun) {
bind: function () {
var loginInfo = top.learun.clientdata.get(['userinfo']);
$('#ReceiveUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }).lrselectSet(loginInfo.userId);
$('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'f_departmentid', text: 'f_fullname' }).lrselectSet(loginInfo.departmentId);
$('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }).lrselectSet(loginInfo.departmentId);
$('#Ass_ReceiveItem').jfGrid({
headData: [
{


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js View File

@@ -183,9 +183,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']);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml View File

@@ -282,7 +282,7 @@
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys, function (i, item) {
str += '<option value="' + item.f_departmentid + '">' + item.f_fullname + '</option>'
str += '<option value="' + item.id + '">' + item.name + '</option>'
})
$("#F_DepartmentId").html(str);
},


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js View File

@@ -347,9 +347,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']);
}
});
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js View File

@@ -368,9 +368,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']);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml View File

@@ -301,7 +301,7 @@
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys, function (i, item) {
str += '<option value="' + item.f_departmentid + '">' + item.f_fullname + '</option>'
str += '<option value="' + item.id + '">' + item.name + '</option>'
})
$("#F_DepartmentId").html(str);
},


+ 1
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml View File

@@ -5,11 +5,7 @@
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="ADR_Record" >
<div class="lr-form-item-title">员工名字</div>
<input id="UserName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="ADR_Record" >
<div class="lr-form-item-title">部门</div>
<div id="Department" ></div>
<div id="UserNo" type="text" class="form-control"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="ADR_Record" >
<div class="lr-form-item-title">考勤类型</div>


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js View File

@@ -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) {


+ 37
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js View File

@@ -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',


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ContractManagement/Index.js View File

@@ -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']);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Form.js View File

@@ -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' });


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituation/Index.js View File

@@ -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']);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Form.js View File

@@ -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' });


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.js View File

@@ -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']);
}
});
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js View File

@@ -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']);
}
});
}


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_BrowseRecord/IndexFile.js View File

@@ -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);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Form.js View File

@@ -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();


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkPlan/Index.js View File

@@ -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']);
}
});
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Form.js View File

@@ -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();


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WP_WorkSummary/Index.js View File

@@ -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' });
// 刷新


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml View File

@@ -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;


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml View File

@@ -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;


+ 20
- 4
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs View File

@@ -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<ADR_RecordEntity>(strSql.ToString(),dp, pagination);
}
catch (Exception ex)


Loading…
Cancel
Save