XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

兴安优化出门证页面列表

Browse Source
This commit is contained in:
zc
2025-08-08 17:26:33 +08:00
parent 8ef43cccf0
commit f50dbe88ea
4 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java
View File

@@ -520,6 +520,19 @@ public class VisCarryStuffController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, VisExitOutVo vo) {
List<VisStuffInfoExportVo> list = visCarryStuffService.selectVisitorList(vo);
List<Long> collect = list.stream().map(VisStuffInfoExportVo::getExitId).collect(Collectors.toList());
//查询放行保安名字
VisExitOutRecordVo visExitOutRecordVo = new VisExitOutRecordVo();
visExitOutRecordVo.setExitIds(collect);
List<VisExitOutRecordVo> rList = visExitOutRecordService.selectList(visExitOutRecordVo);
Map<Long, String> map1 = new HashMap<>();
if (CollUtil.isNotEmpty(rList)) {
map1 = rList.stream().collect(Collectors.toMap(VisExitOutRecordVo::getExitId, VisExitOutRecordVo::getUserName, (key1, key2) -> key1));
}
Map<Long, String> finalMap = map1;
Map<String, String> 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<VisStuffInfoExportVo> util = new ExcelUtil<>(VisStuffInfoExportVo.class);
util.exportExcel(response, list, "出厂物资明细数据");

5
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java
View File

@@ -124,6 +124,11 @@ public class VisExitOutVo extends BaseEntity {
*/
private String examineState;
/**
* 审核状态 0：通过，1：驳回，2审核中，4：已取消，5：已失效
*/
private List<String> examineStateList;
/**
* 审核状态 0：通过，1：驳回
*/

7
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisStuffInfoExportVo.java
View File

@@ -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;
}

6
dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml
View File

@@ -174,6 +174,12 @@
<if test="examineState != null and examineState != '' and examineState != 3">and e.examine_state = #{examineState}</if>
<if test="isExistBack != null">and e.is_exist_back = #{isExistBack}</if>
<if test="createBy != null">and e.create_by = #{createBy}</if>
<if test="examineStateList != null and examineStateList.size() > 0">
and e.examine_state in
<foreach item="examineState" collection="examineStateList" open="(" separator="," close=")">
#{examineState}
</foreach>
</if>
</where>
order by create_time desc
</select>