From 57e40f546f3b2eb23ea596003f0b5154dde87fa4 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 19 Feb 2025 17:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../att/service/AttendanceDetailsServiceImpl.java | 4 ++++ .../com/bonus/system/file/dao/FileUploadDao.java | 10 ++++++++++ .../system/file/service/FileUploadService.java | 9 +++++++++ .../system/file/service/FileUploadServiceImpl.java | 14 ++++++++++++++ .../resources/mapper/file/FileUploadMapper.xml | 12 ++++++++++++ 5 files changed, 49 insertions(+) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java index 7d43d1b..b16bd5d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java @@ -55,6 +55,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService { @Override public List selectAttDetailsList(AttDataDetailsBean bean) { List list = attendanceDetailsDao.selectAttDetailsList(bean); + for (AttDataDetailsBean vo : list) { + List filesVoList = fileUploadService.getFiles(vo); + vo.setFilesVoList(filesVoList); + } return list; } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/dao/FileUploadDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/dao/FileUploadDao.java index 53691f3..4f1fc05 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/dao/FileUploadDao.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/dao/FileUploadDao.java @@ -1,5 +1,6 @@ package com.bonus.system.file.dao; +import com.bonus.system.att.entity.AttDataDetailsBean; import com.bonus.system.file.entity.FileSourceVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -33,4 +34,13 @@ public interface FileUploadDao { * @date 2025/2/19 15:16 */ void delFileResource(@Param("list") List list,@Param("sourceType") int sourceType); + + /** + * 获取考勤修改附件 + * @param list + * @return List + * @author cwchen + * @date 2025/2/19 17:11 + */ + List getFiles(List list); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadService.java index 0ec3637..8290b05 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadService.java @@ -20,4 +20,13 @@ public interface FileUploadService { * @date 2025/2/19 14:14 */ void saveAttUpdateFileSource(List list); + + /** + * 获取考勤修改附件 + * @param vo + * @return List + * @author cwchen + * @date 2025/2/19 17:10 + */ + List getFiles(AttDataDetailsBean vo); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java index 5e9ec80..1517755 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java @@ -77,4 +77,18 @@ public class FileUploadServiceImpl implements FileUploadService{ public void delFileResource(List list,int sourceType){ dao.delFileResource(list,sourceType); } + + @Override + public List getFiles(AttDataDetailsBean vo) { + try { + // 上班附件和下班附件 + List list = new ArrayList<>(); + list.add(vo.getUserId()+"@"+vo.getAttCurrentDay()+"@"+"1"); + list.add(vo.getUserId()+"@"+vo.getAttCurrentDay()+"@"+"2"); + return dao.getFiles(list); + } catch (Exception e) { + log.error(e.toString(),e); + return null; + } + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/file/FileUploadMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/file/FileUploadMapper.xml index 1477d54..7d160f3 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/file/FileUploadMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/file/FileUploadMapper.xml @@ -30,4 +30,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) AND source_type = #{sourceType} + + \ No newline at end of file