修改记录

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java

@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.common.code.StaffSatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.service.AttendanceGroupFixedworkService;
@@ -84,12 +85,11 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
             //查看当前需要考勤但是没有记录的人
             List<Long> unAttendStaffIdList = groupStaffList.stream().filter(f -> !attendStaffSet.contains(f.getStaffId())).map(i -> i.getStaffId()).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(unAttendStaffIdList)) {
-
                 for (Long staffId : unAttendStaffIdList) {
                     StaffEntity staffCache = staffService.getCache(staffId.toString());
-                    if (!ObjectUtils.isEmpty(staffCache)) {
+                    if (!ObjectUtils.isEmpty(staffCache) && StaffSatusEnum.离职.getValue() != staffCache.getStatus()) {
+                        //构建考勤记录  判断当前人是否离职，如果非离职 构建记录
 
-                        //构建考勤记录
                         AttendanceRecordHikEntity recordHikEntity = new AttendanceRecordHikEntity();
                         recordHikEntity.initAttrValue();
                         recordHikEntity.setStaffId(staffCache.getId());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -337,6 +337,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         for (AttendanceRecordDetailEntity recordDetailEntity : detailEntityList) {
             Integer goWorkResult = recordDetailEntity.getGoWorkResult();
             Integer offWorkResult = recordDetailEntity.getOffWorkResult();
+
+            //判断是否是离职员工 如果是 则不添加
+
+
+
             //判断上班
             AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId());
             if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue;
@@ -402,16 +407,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 errorEntityList.add(errorEntity);
             }
 
-//
-//            if(GoWorkResultEnum.正常.getValue() == goWorkResult&&OffWorkResultEnum.正常.getValue() == offWorkResult){
-////将异常的记录删除
-//                AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
-//                errorEntity.initAttrValue();
-//                BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
-//
-//                errorSwitchNormalList.add(errorEntity);
-//            }
-
         }
 
         //删除当前员工当日未处理的异常后，重新添加

attendance-performance-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -6,8 +6,17 @@
     "baseUrl": "http://192.168.0.98:11039/attendance",
     "baseLogin": "http://192.168.0.98:11078/base"
   },
+  "yibin": {
+    "baseUrl": "http://112.19.80.237:11039/attendance",
+    "baseLogin": "http://192.168.0.98:11078/base"
+  },
+
   "portal": {
     "baseUrl": "http://192.168.0.98:11072/zwfw",
     "baseLogin": "http://192.168.0.98:11078/base"
+  },
+
+  "portal-yibin": {
+    "baseUrl": "http://112.19.80.237:11078/zwfw"
   }
 }
\ No newline at end of file

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"admin",
+  "password":"xhxADMIN8@a",
   "securityCode":"admin"
 }
 
@@ -33,8 +33,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2023-10-05",
-  "attendanceDateEnd":"2023-10-05"
+  "attendanceDateStart":"2023-09-28",
+  "attendanceDateEnd":"2023-10-08"
 }