Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordErrorEntity.java

@@ -5,13 +5,19 @@ import java.util.ArrayList;
 import java.math.BigDecimal;
 import cn.hutool.core.date.DateUtil;
 import java.util.Date;
+import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceRecordErrorVo;
 import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
 /**
  * 考勤打卡记录异常信息实体对象
  *
@@ -126,16 +132,22 @@ public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
     private String salaName;
     @Override
     public int hashCode() {
-        return this.getId().hashCode();
+        return (this.getStaffId()+this.getProcessStatus()+this.getShiftsId()+this.getErrorDateTime().getTime()+"").hashCode();
     }
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
         if (obj instanceof AttendanceRecordErrorEntity) {
             AttendanceRecordErrorEntity tmp = (AttendanceRecordErrorEntity) obj;
-            if (this.getId() == tmp.getId()) {
+/*            if (this.getId() == tmp.getId()) {
+                return true;
+            }*/
+
+            if(this.getStaffId()==tmp.getStaffId()&&this.getProcessStatus()==tmp.getErrorStatus()
+            &&this.getShiftsId()==tmp.getShiftsId()&&this.getErrorDateTime().getTime()==tmp.getErrorDateTime().getTime()){
                 return true;
             }
+
         }
         return false;
     }
@@ -164,4 +176,36 @@ public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
         this.salaId = null;
         this.salaName = "";
     }
+
+
+    public static void main(String[] args) {
+        List<AttendanceRecordErrorEntity> list = new ArrayList<>();
+
+        AttendanceRecordErrorEntity entity = new AttendanceRecordErrorEntity();
+        entity.initAttrValue();
+
+        entity.setStaffId(47L);
+        entity.setProcessStatus(0);
+        entity.setShiftsId(20L);
+        entity.setErrorDateTime(DateUtil.parseDateTime("2024-07-12 12:00:00"));
+
+        list.add(entity);
+
+        AttendanceRecordErrorEntity  entity1 = new AttendanceRecordErrorEntity();
+        BeanUtils.copyProperties(entity,entity1);
+        entity1.setShiftsId(21L);
+       // entity1.setErrorDateTime(DateUtil.parseDateTime("2024-07-12 12:00:01"));
+
+        list.add(entity1);
+        System.out.println(JSONObject.toJSONString(list));
+
+        List<AttendanceRecordErrorEntity> collect = list.stream().distinct().collect(Collectors.toList());
+
+        System.out.println("去重后");
+        System.out.println(JSON.toJSONString(collect));
+
+
+    }
+
+
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordErrorVo.java

@@ -35,5 +35,4 @@ public class AttendanceRecordErrorVo extends BaseEntityLong {
     private Integer duration;
 
 
-
 }

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

@@ -508,6 +508,9 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         AttendanceRecordErrorQuery errorQuery;
 
         if (!ObjectUtils.isEmpty(errorEntityList)) {
+            //过滤异常列表中存在相同的记录
+            errorEntityList= errorEntityList.stream().distinct().collect(Collectors.toList());
+
             for (AttendanceRecordErrorEntity errorEntity : errorEntityList) {
                 //查看是否存在相同的异常记录，如果存在 则不添加
                 errorQuery = new AttendanceRecordErrorQuery();

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

@@ -37,8 +37,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-05-11",
-  "attendanceDateEnd": "2024-05-11"
+  "attendanceDateStart": "2024-07-19",
+  "attendanceDateEnd": "2024-07-19"
 }
 
 ###海康考勤打卡记录计算1
@@ -46,8 +46,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-05-11",
-  "attendanceDateEnd": "2024-05-11",
+  "attendanceDateStart": "2024-07-19",
+  "attendanceDateEnd": "2024-07-19",
   "staffId": 322
 }