【修改】考勤记录的编辑、查询；考勤明细统计；

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

@@ -13,11 +13,11 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ADR_Record" >
         <div class="lr-form-item-title">考勤时间</div>
-        <input id="ADTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ADTime').trigger('change'); } })"   />
+        <input id="ADTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ADTime').trigger('change'); } })"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ADR_Record" >
         <div class="lr-form-item-title">打卡时间</div>
-        <input id="ClockTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ClockTime').trigger('change'); } })"   />
+        <input id="ClockTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ClockTime').trigger('change'); } })"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ADR_Record" >
         <div class="lr-form-item-title">打卡状态</div>

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

@@ -21,7 +21,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 param: {} 
             });
-
+            $('#ADType').lrDataItemSelect({ code: 'ADType' });
             $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
         },
         initData: function () {
@@ -34,6 +34,8 @@ var bootstrap = function ($, learun) {
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
+                        $("#ADTime").val(data[id].ADTime);
+                        $("#ClockTime").val(data[id].ClockTime);
                     }
                 });
             }

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

@@ -14,9 +14,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">员工名字</div>
+                                    <div class="lr-form-item-title">姓名</div>
                                     <input id="UserName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">职工编号</div>
+                                    <input id="UserNo" type="text" class="form-control" />
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="Department"></div>

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

@@ -44,7 +44,7 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 250, 400);
             $('#Department').lrDepartmentSelect();
             $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' });
             $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'});

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -154,4 +154,6 @@
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
   <!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
   <add key="EmpNoRule" value="jy"/>
+  <!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
+  <add key="ADR_RecordUserNoPrev" value="DCZZ"/>
 </appSettings>

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

@@ -63,6 +63,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("UserName", "%" + queryParam["UserName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND emp.F_RealName Like @UserName ");
                 }
+                if (!queryParam["UserNo"].IsEmpty())
+                {
+                    dp.Add("UserNo", queryParam["UserNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.UserNo = @UserNo ");
+                }
                 if (!queryParam["Department"].IsEmpty())
                 {
                     dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
@@ -249,12 +254,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 {
                     date = queryParam["Date"].ToDate().ToDateString();
                 }
-
                 var strSql = new StringBuilder();
                 strSql.Append("select u.F_Encode as UserNo,u.F_RealName as UserName,u.F_DepartmentId as Department,t.ID,t.ADType,t.ADTime,t.ClockTime,t.ClockStatus ");
-                strSql.Append("  from " + basedbname + ".dbo.LR_Base_User u ");
-                strSql.Append("  left join ADR_Record t on u.F_EnCode=t.UserNo and t.ADYear='" + date.Substring(0, 4) + "' and t.ADMonth='" + date.Substring(5, 2) + "' and t.ADDay='" + date.Substring(8, 2) + "' ");
-                strSql.Append(" where u.F_Description='教师' AND u.F_DeleteMark = 0 AND u.F_EnabledMark = 1 and u.F_Encode is  not null ");
+                strSql.Append(" from " + basedbname + ".dbo.LR_Base_User u ");
+                strSql.Append(" inner join EmpInfo emp on u.F_EnCode=emp.EmpNo ");
+                strSql.Append(" left join ADR_Record t on u.F_EnCode=t.UserNo and t.ADYear='" + date.Substring(0, 4) + "' and t.ADMonth='" + date.Substring(5, 2) + "' and t.ADDay='" + date.Substring(8, 2) + "' ");
+                strSql.Append(" where u.F_Description='教师' AND u.F_DeleteMark = 0 AND u.F_EnabledMark = 1 and u.F_Encode is not null ");
+
+                var UserNoPrev = Config.GetValue("ADR_RecordUserNoPrev");
+                if (!string.IsNullOrEmpty(UserNoPrev))
+                {
+                    strSql.Append(" and u.F_encode like '" + UserNoPrev + "%' ");
+                }
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["UserNo"].IsEmpty())