1811872455@163.com преди 1 месец
родител
ревизия
8168c8e14a

+ 9 - 0
.idea/encodings.xml

@@ -6,16 +6,25 @@
     <file url="file://$PROJECT_DIR$/storlead-centre-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-centre-api/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-centre-service/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-centre-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/storlead-auth/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-framework/storlead-auth/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/storlead-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-framework/storlead-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/storlead-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-framework/storlead-core/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/storlead-mybatis/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-framework/storlead-mybatis/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/storlead-redis/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-framework/storlead-redis/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-framework/storlead-web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-framework/storlead-web/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-sms/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-sms/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-user/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/storlead-user/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-wx/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/storlead-wx/src/main/resources" charset="UTF-8" />
   </component>

+ 10 - 0
storlead-centre-service/src/main/java/com/storlead/centre/service/impl/AttendanceSignRecordServiceImpl.java

@@ -224,10 +224,20 @@ public class AttendanceSignRecordServiceImpl extends MyBaseServiceImpl<Attendanc
                     ;
                 }
             }
+
+
             LambdaUpdateWrapper<AttendanceSignRecordEntity> oawp = new LambdaUpdateWrapper<>();
             oawp.set(AttendanceSignRecordEntity::getSyncOa, Integer.valueOf(1));
             oawp.in(AttendanceSignRecordEntity::getId, ids);
             attendanceSignRecordService.update(oawp);
+
+            attendances.removeIf(item ->
+                    Objects.equals("未打卡", item.getExceptionType()));
+
+            if (CollectionUtils.isEmpty(attendances)) {
+                return;
+            }
+
             //同步OA数据
             List<HrmschedulesignEntity> hrmschedulesignsDb;
             List<HrmschedulesignEntity> hrmschedulesigns = SignDataConvert.attendanceListToOaSignVoList(attendances);