Commit 3708c327 authored by 赵啸非's avatar 赵啸非

修改每日考勤记录重复多条情况

parent f6e2d8c3
...@@ -19,12 +19,12 @@ import java.util.Arrays; ...@@ -19,12 +19,12 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* AttendanceClassService * AttendanceClassService
* 考勤班次信息 service实现 * 考勤班次信息 service实现
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-08
*/ */
@Service("attendanceClassService") @Service("attendanceClassService")
public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<AttendanceClassDao, AttendanceClassEntity, Long> implements AttendanceClassService { public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<AttendanceClassDao, AttendanceClassEntity, Long> implements AttendanceClassService {
@Autowired @Autowired
...@@ -32,8 +32,8 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan ...@@ -32,8 +32,8 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan
@Override @Override
protected void saveAfter(AttendanceClassEntity entity, Context context) throws AppException { protected void saveAfter(AttendanceClassEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getAttendanceClassDetailList())){ if (!ObjectUtils.isEmpty(entity.getAttendanceClassDetailList())) {
entity.getAttendanceClassDetailList().stream().peek(item->{ entity.getAttendanceClassDetailList().stream().peek(item -> {
item.setClassId(entity.getId()); item.setClassId(entity.getId());
item.setCreateUser(context.getUser().getLoginName()); item.setCreateUser(context.getUser().getLoginName());
item.setCreateUserId(context.getUser().getId()); item.setCreateUserId(context.getUser().getId());
...@@ -46,8 +46,17 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan ...@@ -46,8 +46,17 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan
@Override @Override
protected void updateAfter(AttendanceClassEntity entity, Context context) throws AppException { protected void updateAfter(AttendanceClassEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getAttendanceClassDetailList())){ if (!ObjectUtils.isEmpty(entity.getAttendanceClassDetailList())) {
Long[] attendanceClassDetailIds = attendanceClassDetailService.find(new AttendanceClassDetailQuery().classId(entity.getId())).stream().map(AttendanceClassDetailEntity::getId).toArray(Long[]::new); //更新
entity.getAttendanceClassDetailList().stream().peek(item ->{
item.setClassId(entity.getId());
item.setUpdateUser(context.getUser().getLoginName());
item.setUpdateUserId(context.getUser().getId());
item.setUpdateTime(new Date());
}).count();
attendanceClassDetailService.update(entity.getAttendanceClassDetailList());
/* Long[] attendanceClassDetailIds = attendanceClassDetailService.find(new AttendanceClassDetailQuery().classId(entity.getId())).stream().map(AttendanceClassDetailEntity::getId).toArray(Long[]::new);
attendanceClassDetailService.remove(attendanceClassDetailIds,context); attendanceClassDetailService.remove(attendanceClassDetailIds,context);
entity.getAttendanceClassDetailList().stream().peek(item ->{ entity.getAttendanceClassDetailList().stream().peek(item ->{
item.setClassId(entity.getId()); item.setClassId(entity.getId());
...@@ -58,7 +67,7 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan ...@@ -58,7 +67,7 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan
item.setUpdateUserId(context.getUser().getId()); item.setUpdateUserId(context.getUser().getId());
item.setUpdateTime(new Date()); item.setUpdateTime(new Date());
}).count(); }).count();
attendanceClassDetailService.save(entity.getAttendanceClassDetailList()); attendanceClassDetailService.save(entity.getAttendanceClassDetailList());*/
} }
super.updateAfter(entity, context); super.updateAfter(entity, context);
} }
...@@ -66,7 +75,7 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan ...@@ -66,7 +75,7 @@ public class AttendanceClassServiceImpl extends AbstractCRUDServiceImpl<Attendan
@Override @Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException { protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<AttendanceClassDetailEntity> attendanceClassDetaillist = attendanceClassDetailService.find(new AttendanceClassDetailQuery().classIdList(Arrays.asList(ids))); List<AttendanceClassDetailEntity> attendanceClassDetaillist = attendanceClassDetailService.find(new AttendanceClassDetailQuery().classIdList(Arrays.asList(ids)));
attendanceClassDetailService.removeList(attendanceClassDetaillist,context); attendanceClassDetailService.removeList(attendanceClassDetaillist, context);
super.removeAfter(ids, context, result); super.removeAfter(ids, context, result);
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment