diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java index 7f2c6de..e07c484 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java @@ -90,7 +90,7 @@ public class ExportFileController { public void exportPerson(HttpServletRequest request, HttpServletResponse response, BraceletParamsDto dto) { try { List personExportVoList = new ArrayList<>(); - List personLists = iPersonMgeService.getPersonLists(dto); + List personLists = iPersonMgeService.getExportPersonLists(dto); for (int i = 0; i < personLists.size(); i++) { PersonExportVo exportVo = new PersonExportVo(); PersonVo vo = personLists.get(i); diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java index c857dd0..f4354f9 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java @@ -97,6 +97,15 @@ public interface PersonMgeMapper { */ List getPersonLists(BraceletParamsDto dto); + /** + * 查询导出人员数据 + * @param dto + * @return List + * @author cwchen + * @date 2024/8/9 8:54 + */ + List getExportPersonLists(BraceletParamsDto dto); + /** * 验证安全帽编号、马甲编码是否存在 * diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java index 467abd1..9a9c896 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java @@ -91,4 +91,13 @@ public interface IPersonMgeService { public AjaxResult updateCertificate(@RequestPart(value = "highfile") MultipartFile[] highfile, @RequestPart(value = "electfile") MultipartFile[] electfile, @RequestPart(value = "elsefile") MultipartFile[] elsefile, @RequestBody Long id); + + /** + * 获取人员导出数据 + * @param dto + * @return List + * @author cwchen + * @date 2024/8/9 8:51 + */ + List getExportPersonLists(BraceletParamsDto dto); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java index f8db8d4..8116b50 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java @@ -88,6 +88,20 @@ public class PersonMgeServiceImpl implements IPersonMgeService { return list; } + @Override + public List getExportPersonLists(BraceletParamsDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getExportPersonLists(dto); + for (PersonVo vo : list) { + vo = handleData(vo); + } + } catch (Exception e) { + log.error(e.toString(), e); + } + return list; + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult addPerson(MultipartFile file, String params) { diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml index 0ce9a9c..7b41223 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY tp.id,sfs.id,sfs.file_path - ORDER BY tp.id + ORDER BY tp.update_time DESC + +