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-01 09:53:50 +08:00
parent 2f8d7a2846
commit 26e9ea735c
5 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,10 +143,23 @@ public class VisCarryStuffController extends BaseController {
}
});
//查询放行保安名字
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, List<VisStuffInfoVo>> collect1 = stuffList.stream().collect(Collectors.groupingBy(VisStuffInfoVo::getExitId));
Map<Long, String> finalMap = map1;
list.forEach(exit -> {
exit.setVisStuffInfoList(collect1.get(exit.getId()));
if (null != finalMap.get(exit.getId())) {
exit.setReleaseName(finalMap.get(exit.getId()));
}
});
return getDataTable(list);

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

@@ -18,6 +18,11 @@ public class VisExitOutRecordVo extends BaseEntity {
*/
private Long exitId;
/**
* 出门证主键ids
*/
private List<Long> exitIds;
/**
* 放行人（保安）

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

@@ -129,6 +129,11 @@ public class VisExitOutVo extends BaseEntity {
*/
private String state;
/**
* 放行人名字
*/
private String releaseName;
/**
* 申请类型 0:临时访客 1：携物出门
*/

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

@@ -187,7 +187,7 @@
select reviewer,
state,
sp.position type,
date_format(created_time, '%Y-%m-%d %H:%i:%s') createdTime,
date_format(ifnull(updated_time,created_time), '%Y-%m-%d %H:%i:%s') createdTime,
sp.name reviewerName
from vis_visitor_review_process vvrp
left join sys_people sp on vvrp.reviewer = sp.id and sp.del_flag = '0'

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

@@ -64,6 +64,12 @@
<if test="exitPermitNo != null and exitPermitNo != ''">and e.exitPermit_no = #{exitPermitNo}</if>
<if test="applyName != null and applyName != ''">and e.`name` like concat('%', #{applyName}, '%')</if>
<if test="exitId != null">and r.`exit_id` = #{exitId}</if>
<if test="exitIds != null and exitIds.size() > 0">
and r.`exit_id` in
<foreach collection="exitIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where>
</select>