修改部门同步

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

@@ -87,7 +87,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                 if (ObjectUtils.isEmpty(deptEntity)) {
                     deptEntity = new DeptEntity();
                     deptEntity.initAttrValue();
-                    if (ObjectUtils.isEmpty(deptEntityParent)) {
+                    if (!ObjectUtils.isEmpty(deptEntityParent)) {
                         deptEntity.setParentId(deptEntityParent.getId());
                     }
                     deptEntity.setDeptName(orgInfo.getOrgName());

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

@@ -352,7 +352,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 errorEntity.setShiftsName(recordDetailEntity.getShiftsName());
                 errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
                 errorEntity.setCreateTime(new Date());
-                errorEntity.setCreateUserId(context.getUser().getId());
+                errorEntity.setCreateUserId(1L);
                 Date goWorkDate = attendanceClassDetailEntity.getGoWorkDate();
                 errorEntity.setGoOffDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(goWorkDate)).toJdkDate());
                 if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
@@ -382,7 +382,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 errorEntity.setShiftsName(recordDetailEntity.getShiftsName());
                 errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
                 errorEntity.setCreateTime(new Date());
-                errorEntity.setCreateUserId(context.getUser().getId());
+                errorEntity.setCreateUserId(context==null?1L:context.getUser().getId());
                 Date offWorkDate = attendanceClassDetailEntity.getOffWorkDate();
                 errorEntity.setGoOffDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(offWorkDate)).toJdkDate());
                 if (!ObjectUtils.isEmpty(recordDetailEntity.getOffWorkDate())) {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -146,7 +146,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             staffQuery.setStatusNotList(Arrays.asList(StaffSatusEnum.离职.getValue()));
             Map<String, StaffEntity> staffCollect = this.find(staffQuery).stream().collect(Collectors.toMap(x -> x.getWorkNum(), y -> y, (o, n) -> n));
 
-
             List<PersonInfo> personInfoList = personRest.getData().getList();
             for (PersonInfo personInfo : personInfoList) {
                 if (ObjectUtils.isEmpty(personInfo.getJobNo())) {
@@ -155,7 +154,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                 }
                 if (staffCollect.containsKey(personInfo.getJobNo())) {
                     staffCollect.remove(personInfo.getJobNo());
-
                 }
 
                 StaffEntity staffEntity = this.getExtCache(StrUtil.padPre(personInfo.getJobNo(), 8, "0"));
@@ -179,7 +177,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     staffEntity.setCreateUserId(1L);
                     staffEntity.setCreateTime(new Date());
                     this.save(staffEntity);
-
                 } else {
                     //更新
                     if (!ObjectUtils.isEmpty(deptEntity)) {
@@ -202,7 +199,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             if (staffCollect.size() > 0) {
                 //需要将此人员变更为离职
                 staffCollect.entrySet().stream().forEach(item -> {
-
                     String key = item.getKey();
                     if (!ObjectUtils.isEmpty(key)) {
                         StaffEntity staff = item.getValue();

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

@@ -24,6 +24,15 @@ Content-Type: application/json
 {}
 
 
+###海康考勤打卡记录计算
+POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "attendanceDateStart":"2023-12-11",
+  "attendanceDateEnd":"2023-12-11"
+}
 
 
 
@@ -43,7 +52,7 @@ POST {{baseUrl}}//attendance/stat/summary
 Authorization: {{authToken}}
 Content-Type: application/json
 
-{"summaryTimeStart":"2024-01-01","summaryTimeEnd":"2024-01-03"}
+{"summaryTimeStart":"2023-12-01","summaryTimeEnd":"2023-12-31"}
 
 
 ###短信设置编辑