From 776e4e14f68ffd4b36fbef9edefbd28b3cb3250f Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 20 Nov 2024 17:58:59 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=91=98=E5=B7=A5=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E7=8F=AD=E6=89=93=E5=8D=A1=E7=8F=AD=E7=BB=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecordStaffAttendanceServiceImpl.java | 24 +++++++++++++++++- .../impl/RecordStaffCommuteServiceImpl.java | 25 ++++++++++++++++++- .../record/RecordStaffAttendanceMapper.xml | 2 -- .../mes/record/RecordStaffCommuteMapper.xml | 2 -- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffAttendanceServiceImpl.java b/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffAttendanceServiceImpl.java index c4f9e9f..fb21ada 100644 --- a/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffAttendanceServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffAttendanceServiceImpl.java @@ -3,6 +3,9 @@ package com.os.mes.record.service.impl; import java.util.List; import com.os.common.utils.DateUtils; +import com.os.common.utils.StringUtils; +import com.os.mes.base.domain.BaseTeamMembers; +import com.os.mes.base.mapper.BaseTeamMembersMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.os.mes.record.mapper.RecordStaffAttendanceMapper; @@ -20,6 +23,9 @@ public class RecordStaffAttendanceServiceImpl implements IRecordStaffAttendanceS @Autowired private RecordStaffAttendanceMapper recordStaffAttendanceMapper; + @Autowired + private BaseTeamMembersMapper baseTeamMembersMapper; + /** * 查询员工打卡记录 * @@ -39,7 +45,23 @@ public class RecordStaffAttendanceServiceImpl implements IRecordStaffAttendanceS */ @Override public List selectRecordStaffAttendanceList(RecordStaffAttendance recordStaffAttendance) { - return recordStaffAttendanceMapper.selectRecordStaffAttendanceList(recordStaffAttendance); + List staffAttendanceList = recordStaffAttendanceMapper.selectRecordStaffAttendanceList(recordStaffAttendance); + List teamMembers = baseTeamMembersMapper.selectBaseTeamMembersList(new BaseTeamMembers()); + for (RecordStaffAttendance staffAttendance : staffAttendanceList) { + if (StringUtils.isEmpty(staffAttendance.getTeamCode())) { + continue; + } + for (BaseTeamMembers teamMember : teamMembers) { + if (staffAttendance.getTeamCode().contains(teamMember.getTeamCode())) { + if (StringUtils.isEmpty(staffAttendance.getTeamName())) { + staffAttendance.setTeamName(teamMember.getTeamName()); + } else { + staffAttendance.setTeamName(staffAttendance.getTeamName() + "," + teamMember.getTeamName()); + } + } + } + } + return staffAttendanceList; } /** diff --git a/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffCommuteServiceImpl.java b/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffCommuteServiceImpl.java index 5db2068..459477b 100644 --- a/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffCommuteServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffCommuteServiceImpl.java @@ -3,6 +3,10 @@ package com.os.mes.record.service.impl; import java.util.List; import com.os.common.utils.DateUtils; +import com.os.common.utils.StringUtils; +import com.os.mes.base.domain.BaseTeamMembers; +import com.os.mes.base.mapper.BaseTeamMembersMapper; +import com.os.mes.record.domain.RecordStaffAttendance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.os.mes.record.mapper.RecordStaffCommuteMapper; @@ -20,6 +24,9 @@ public class RecordStaffCommuteServiceImpl implements IRecordStaffCommuteService @Autowired private RecordStaffCommuteMapper recordStaffCommuteMapper; + @Autowired + private BaseTeamMembersMapper baseTeamMembersMapper; + /** * 查询员工上下班记录 * @@ -39,7 +46,23 @@ public class RecordStaffCommuteServiceImpl implements IRecordStaffCommuteService */ @Override public List selectRecordStaffCommuteList(RecordStaffCommute recordStaffCommute) { - return recordStaffCommuteMapper.selectRecordStaffCommuteList(recordStaffCommute); + List staffCommuteList = recordStaffCommuteMapper.selectRecordStaffCommuteList(recordStaffCommute); + List teamMembers = baseTeamMembersMapper.selectBaseTeamMembersList(new BaseTeamMembers()); + for (RecordStaffCommute staffAttendance : staffCommuteList) { + if (StringUtils.isEmpty(staffAttendance.getTeamCode())) { + continue; + } + for (BaseTeamMembers teamMember : teamMembers) { + if (staffAttendance.getTeamCode().contains(teamMember.getTeamCode())) { + if (StringUtils.isEmpty(staffAttendance.getTeamName())) { + staffAttendance.setTeamName(teamMember.getTeamName()); + } else { + staffAttendance.setTeamName(staffAttendance.getTeamName() + "," + teamMember.getTeamName()); + } + } + } + } + return staffCommuteList; } /** diff --git a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml index f6c62c6..c0f9156 100644 --- a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml @@ -27,7 +27,6 @@ bsi.staff_name, rsa.attendance_type, rsa.team_code, - btm.team_name, rsa.classes, rsa.remark, rsa.is_flag, @@ -37,7 +36,6 @@ rsa.update_time, rsa.machine_code from record_staff_attendance rsa - left join base_team_members btm on btm.team_code = rsa.team_code left join base_staff_info bsi on bsi.staff_id = rsa.staff_id diff --git a/os-mes/src/main/resources/mapper/mes/record/RecordStaffCommuteMapper.xml b/os-mes/src/main/resources/mapper/mes/record/RecordStaffCommuteMapper.xml index 04edfb3..d547397 100644 --- a/os-mes/src/main/resources/mapper/mes/record/RecordStaffCommuteMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/record/RecordStaffCommuteMapper.xml @@ -30,7 +30,6 @@ rsc.staff_id, bsi.staff_name, rsc.team_code, - btm.team_name, rsc.classes, rsc.start_work_time, rsc.end_work_time, @@ -46,7 +45,6 @@ bsi.pass_word from record_staff_commute rsc left join base_staff_info bsi on bsi.staff_id = rsc.staff_id - left join base_team_members btm on btm.team_code = rsc.team_code