Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

@@ -26,6 +26,8 @@ import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -89,9 +91,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-               query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-               query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(!ObjectUtils.isEmpty(query.getErrorTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+               query.setErrorTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+               //query.setErrorTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
         super.doListBefore(query, model, context);
     }