考勤记录增加查询条件

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml

@@ -21,6 +21,14 @@
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="Department"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">打卡地点</div>
+                                    <div id="ADR_Device"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">打卡结果</div>
+                                    <div id="ADStatus"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js

@@ -46,6 +46,8 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#Department').lrDepartmentSelect();
+            $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' });
+            $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'});
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js

@@ -80,7 +80,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
                 headData: [
                     { label: "上班时间", name: "WorkTime", width: 100, align: "left" },
-                    { label: "签到开始u时间", name: "SignInStartTime", width: 100, align: "left" },
+                    { label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
                     { label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
                     { label: "下班时间", name: "CloseTime", width: 100, align: "left" },
                     { label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs

@@ -66,9 +66,16 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Department",queryParam["Department"].ToString(), DbType.String);
                     strSql.Append(" AND emp.F_DepartmentId = @Department ");
                 }
-
-
-
+                if (!queryParam["ADR_Device"].IsEmpty())
+                {
+                    dp.Add("ADR_Device", queryParam["ADR_Device"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClockPlace = @ADR_Device ");
+                }
+                if (!queryParam["ADStatus"].IsEmpty())
+                {
+                    dp.Add("ADStatus", queryParam["ADStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ADStatus = @ADStatus ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<ADR_RecordEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)