diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java index b90c1e8..5eae136 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java @@ -520,6 +520,19 @@ public class VisCarryStuffController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, VisExitOutVo vo) { List list = visCarryStuffService.selectVisitorList(vo); + + List collect = list.stream().map(VisStuffInfoExportVo::getExitId).collect(Collectors.toList()); + + //查询放行保安名字 + VisExitOutRecordVo visExitOutRecordVo = new VisExitOutRecordVo(); + visExitOutRecordVo.setExitIds(collect); + List rList = visExitOutRecordService.selectList(visExitOutRecordVo); + Map map1 = new HashMap<>(); + if (CollUtil.isNotEmpty(rList)) { + map1 = rList.stream().collect(Collectors.toMap(VisExitOutRecordVo::getExitId, VisExitOutRecordVo::getUserName, (key1, key2) -> key1)); + } + + Map finalMap = map1; Map map = dictDataService.queryDictData("vis_out_stuff_type"); list.forEach(stuff -> { if (StrUtil.isNotBlank(stuff.getType())) { @@ -542,6 +555,9 @@ public class VisCarryStuffController extends BaseController { } } } + if (null != finalMap.get(stuff.getExitId())) { + stuff.setReleaseName(finalMap.get(stuff.getExitId())); + } }); ExcelUtil util = new ExcelUtil<>(VisStuffInfoExportVo.class); util.exportExcel(response, list, "出厂物资明细数据"); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java index 1a246c7..6dca667 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java @@ -124,6 +124,11 @@ public class VisExitOutVo extends BaseEntity { */ private String examineState; + /** + * 审核状态 0:通过,1:驳回,2审核中,4:已取消,5:已失效 + */ + private List examineStateList; + /** * 审核状态 0:通过,1:驳回 */ diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisStuffInfoExportVo.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisStuffInfoExportVo.java index 60773a8..ca1ab19 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisStuffInfoExportVo.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisStuffInfoExportVo.java @@ -207,7 +207,7 @@ public class VisStuffInfoExportVo extends BaseEntity { /** * 审核状态 */ - @Excel(name = "审核状态", sort = 20, readConverterExp = "0=通过,1=驳回,2=审核中,4=已取消,5=已失效") + @Excel(name = "审核状态", sort = 21, readConverterExp = "0=通过,1=驳回,2=审核中,4=已取消,5=已失效") private String examineState; /** @@ -215,5 +215,10 @@ public class VisStuffInfoExportVo extends BaseEntity { */ private Integer sort; + /** + * 放行人名字 + */ + @Excel(name = "放行人", sort = 20) + private String releaseName; } diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml index 6180a94..ac7603f 100644 --- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml +++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml @@ -174,6 +174,12 @@ and e.examine_state = #{examineState} and e.is_exist_back = #{isExistBack} and e.create_by = #{createBy} + + and e.examine_state in + + #{examineState} + + order by create_time desc