diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
index 68f8545..14c0f67 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
@@ -329,9 +329,15 @@
 
             List<PersonDto> staffList = new ArrayList<>();
             staffList = atdPersonService.getPersonListByDeptId(mDept.getId());// 当前部门的员工名单
+            List<PersonDto> staffListNotKaoqin = new ArrayList<>();
             //删除设置为不考勤的员工
             for(PersonDto map: staffList){
                 if(!(((Map<String,Object>)map.getExt()).get("isKaoqin").toString().equals("1"))){
+                    staffListNotKaoqin.add(map);
+                }
+            }
+            if(!staffListNotKaoqin.isEmpty()) {
+                for (PersonDto map : staffListNotKaoqin){
                     staffList.remove(map);
                 }
             }

diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
index 68f8545..14c0f67 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
@@ -329,9 +329,15 @@
 
             List<PersonDto> staffList = new ArrayList<>();
             staffList = atdPersonService.getPersonListByDeptId(mDept.getId());// 当前部门的员工名单
+            List<PersonDto> staffListNotKaoqin = new ArrayList<>();
             //删除设置为不考勤的员工
             for(PersonDto map: staffList){
                 if(!(((Map<String,Object>)map.getExt()).get("isKaoqin").toString().equals("1"))){
+                    staffListNotKaoqin.add(map);
+                }
+            }
+            if(!staffListNotKaoqin.isEmpty()) {
+                for (PersonDto map : staffListNotKaoqin){
                     staffList.remove(map);
                 }
             }
diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
index f18fd4d..3a30f00 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
@@ -70,9 +70,7 @@
         for(Device device : deviceList){
             deviceIdList.add(device.getId().longValue());
         }
-        beginDate = beginDate + " 00:00:00";
-        endDate = endDate + " 23:59:59";
-        List<String> error = recordSupportService.syncRecords(deviceIdList,beginDate,endDate);
+        List<String> error = recordSupportService.syncRecords(deviceIdList,beginDate + " 00:00:00",endDate+ " 23:59:59");
 
         if(!error.isEmpty()){
             return ResponseData.error("获取识别记录失败");

diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
index 68f8545..14c0f67 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
@@ -329,9 +329,15 @@
 
             List<PersonDto> staffList = new ArrayList<>();
             staffList = atdPersonService.getPersonListByDeptId(mDept.getId());// 当前部门的员工名单
+            List<PersonDto> staffListNotKaoqin = new ArrayList<>();
             //删除设置为不考勤的员工
             for(PersonDto map: staffList){
                 if(!(((Map<String,Object>)map.getExt()).get("isKaoqin").toString().equals("1"))){
+                    staffListNotKaoqin.add(map);
+                }
+            }
+            if(!staffListNotKaoqin.isEmpty()) {
+                for (PersonDto map : staffListNotKaoqin){
                     staffList.remove(map);
                 }
             }
diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
index f18fd4d..3a30f00 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
@@ -70,9 +70,7 @@
         for(Device device : deviceList){
             deviceIdList.add(device.getId().longValue());
         }
-        beginDate = beginDate + " 00:00:00";
-        endDate = endDate + " 23:59:59";
-        List<String> error = recordSupportService.syncRecords(deviceIdList,beginDate,endDate);
+        List<String> error = recordSupportService.syncRecords(deviceIdList,beginDate + " 00:00:00",endDate+ " 23:59:59");
 
         if(!error.isEmpty()){
             return ResponseData.error("获取识别记录失败");
diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
index 1b5c1af..2984eed 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
@@ -104,11 +104,17 @@
             for (Dept dept : deptList) {
                 List<PersonDto> currentStaffList = new ArrayList<>();
                 currentStaffList = atdPersonService.getPersonListByDeptId(dept.getId());// 当前部门的员工名单
+                List<PersonDto> staffListNotKaoqin = new ArrayList<>();
                 // 滤除设置为不考勤的员工
                 for(PersonDto personDto: currentStaffList){
                     Map<String,Object> ext = (Map<String,Object>)personDto.getExt();
                     if(ext.get("isKaoqin").toString().equals("0")){
-                        currentStaffList.remove(personDto);
+                        staffListNotKaoqin.add(personDto);
+                    }
+                }
+                if(!staffListNotKaoqin.isEmpty()) {
+                    for (PersonDto map : staffListNotKaoqin){
+                        currentStaffList.remove(map);
                     }
                 }
 
@@ -116,6 +122,10 @@
                 List<Map<String, Object>> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate);
 
                 for (PersonDto mStaff : currentStaffList) {
+                    if(mStaff.getName().equals("曹磊")){
+                        String currentDate = beginDateDate.plusDays(2).toString();
+                        LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter);
+                    }
                     String currentID = mStaff.getId().toString();
                     String currentName = mStaff.getName();
                     for (int i = 0; i < days; i++) {
@@ -707,7 +717,7 @@
             if (remarks.size() > 0) {
                 boolean isEmpty = true;
                 for (Map<String, Object> m : remarks) {
-                    String exsitType = m.get("remarks_type").toString().trim();  //已添加的备注类型
+                    String exsitType = m.get("remarksType").toString().trim();  //已添加的备注类型
                     String remarksInfo = m.get("remarks").toString();  //已添加的备注信息
                     if (typeByRecord.equals("5")) {
                         if (exsitType.equals("5")) {

diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
index 68f8545..14c0f67 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
@@ -329,9 +329,15 @@
 
             List<PersonDto> staffList = new ArrayList<>();
             staffList = atdPersonService.getPersonListByDeptId(mDept.getId());// 当前部门的员工名单
+            List<PersonDto> staffListNotKaoqin = new ArrayList<>();
             //删除设置为不考勤的员工
             for(PersonDto map: staffList){
                 if(!(((Map<String,Object>)map.getExt()).get("isKaoqin").toString().equals("1"))){
+                    staffListNotKaoqin.add(map);
+                }
+            }
+            if(!staffListNotKaoqin.isEmpty()) {
+                for (PersonDto map : staffListNotKaoqin){
                     staffList.remove(map);
                 }
             }
diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
index f18fd4d..3a30f00 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
@@ -70,9 +70,7 @@
         for(Device device : deviceList){
             deviceIdList.add(device.getId().longValue());
         }
-        beginDate = beginDate + " 00:00:00";
-        endDate = endDate + " 23:59:59";
-        List<String> error = recordSupportService.syncRecords(deviceIdList,beginDate,endDate);
+        List<String> error = recordSupportService.syncRecords(deviceIdList,beginDate + " 00:00:00",endDate+ " 23:59:59");
 
         if(!error.isEmpty()){
             return ResponseData.error("获取识别记录失败");
diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
index 1b5c1af..2984eed 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
@@ -104,11 +104,17 @@
             for (Dept dept : deptList) {
                 List<PersonDto> currentStaffList = new ArrayList<>();
                 currentStaffList = atdPersonService.getPersonListByDeptId(dept.getId());// 当前部门的员工名单
+                List<PersonDto> staffListNotKaoqin = new ArrayList<>();
                 // 滤除设置为不考勤的员工
                 for(PersonDto personDto: currentStaffList){
                     Map<String,Object> ext = (Map<String,Object>)personDto.getExt();
                     if(ext.get("isKaoqin").toString().equals("0")){
-                        currentStaffList.remove(personDto);
+                        staffListNotKaoqin.add(personDto);
+                    }
+                }
+                if(!staffListNotKaoqin.isEmpty()) {
+                    for (PersonDto map : staffListNotKaoqin){
+                        currentStaffList.remove(map);
                     }
                 }
 
@@ -116,6 +122,10 @@
                 List<Map<String, Object>> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate);
 
                 for (PersonDto mStaff : currentStaffList) {
+                    if(mStaff.getName().equals("曹磊")){
+                        String currentDate = beginDateDate.plusDays(2).toString();
+                        LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter);
+                    }
                     String currentID = mStaff.getId().toString();
                     String currentName = mStaff.getName();
                     for (int i = 0; i < days; i++) {
@@ -707,7 +717,7 @@
             if (remarks.size() > 0) {
                 boolean isEmpty = true;
                 for (Map<String, Object> m : remarks) {
-                    String exsitType = m.get("remarks_type").toString().trim();  //已添加的备注类型
+                    String exsitType = m.get("remarksType").toString().trim();  //已添加的备注类型
                     String remarksInfo = m.get("remarks").toString();  //已添加的备注信息
                     if (typeByRecord.equals("5")) {
                         if (exsitType.equals("5")) {
diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java
index a681e29..58155e4 100644
--- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java
+++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java
@@ -60,27 +60,27 @@
             String nowS = sdf.format(new Date());
 
             //计算生成报表的起始日期（生成报表时含本日期）
-//            Date d = sdf.parse(nowS);
-//            List<Map<String, Object>> maxDate = this.reportService.getMaxDate();
-//            if (!maxDate.isEmpty() && maxDate.get(0) != null) {
-//                d = sdf.parse(maxDate.get(0).get("date").toString());
-//            }
-//            c.setTime(d);
-//            c.add(Calendar.DAY_OF_MONTH, 1);// +1天
-//            beginDate = sdf.format(c.getTime());
-//            beginDateDate = LocalDate.parse(beginDate, fomatter);
+            Date d = sdf.parse(nowS);
+            List<Map<String, Object>> maxDate = this.reportService.getMaxDate();
+            if (!maxDate.isEmpty() && maxDate.get(0) != null) {
+                d = sdf.parse(maxDate.get(0).get("date").toString());
+            }
+            c.setTime(d);
+            c.add(Calendar.DAY_OF_MONTH, 1);// +1天
+            beginDate = sdf.format(c.getTime());
+            beginDateDate = LocalDate.parse(beginDate, fomatter);
 //
 //            //计算生成报表的截止日期（生成报表时含本日期）
-//            Date date4 = sdf.parse(nowS);
-//            c.setTime(date4);
-//            c.add(Calendar.DAY_OF_MONTH, -1);// -1天
-//            endDate = sdf.format(c.getTime());
-//            endDateDate = LocalDate.parse(endDate, fomatter);
-
-            beginDate = "2020-05-19";
-            beginDateDate = LocalDate.parse(beginDate, fomatter);
-            endDate ="2020-05-21";
+            Date date4 = sdf.parse(nowS);
+            c.setTime(date4);
+            c.add(Calendar.DAY_OF_MONTH, -1);// -1天
+            endDate = sdf.format(c.getTime());
             endDateDate = LocalDate.parse(endDate, fomatter);
+
+//            beginDate = "2020-06-09";
+//            beginDateDate = LocalDate.parse(beginDate, fomatter);
+//            endDate ="2020-06-10";
+//            endDateDate = LocalDate.parse(endDate, fomatter);
             //生成报表数据
             if (!endDateDate.isBefore(beginDateDate)) {
                 Long deptId = new Long((long)-1);