DeXun/fad_oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bbug

Browse Source
This commit is contained in:
wangyu
2026-06-16 15:51:19 +08:00
parent 44949287e0
commit c1a382c255
7 changed files with 122 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmMyApplyController.java
View File

@@ -18,8 +18,10 @@ import com.ruoyi.hrm.domain.vo.HrmMyApplyVo;
import com.ruoyi.hrm.domain.vo.HrmReimburseReqVo;
import com.ruoyi.hrm.domain.vo.HrmSealReqVo;
import com.ruoyi.hrm.domain.vo.HrmTravelReqVo;
import com.ruoyi.hrm.domain.HrmFlowInstance;
import com.ruoyi.hrm.mapper.HrmAppropriationReqMapper;
import com.ruoyi.hrm.mapper.HrmEmployeeMapper;
import com.ruoyi.hrm.mapper.HrmFlowInstanceMapper;
import com.ruoyi.hrm.mapper.HrmLeaveReqMapper;
import com.ruoyi.hrm.mapper.HrmReimburseReqMapper;
import com.ruoyi.hrm.mapper.HrmSealReqMapper;
@@ -32,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -48,6 +52,7 @@ public class HrmMyApplyController extends BaseController {
private final HrmSealReqMapper sealReqMapper;
private final HrmReimburseReqMapper reimburseReqMapper;
private final HrmAppropriationReqMapper appropriationReqMapper;
private final HrmFlowInstanceMapper flowInstanceMapper;
@GetMapping("/list")
public TableDataInfo<HrmMyApplyVo> list(String bizType, String status, String keyword, PageQuery pageQuery) {
@@ -80,6 +85,9 @@ public class HrmMyApplyController extends BaseController {
all.addAll(mapAppropriation(appropriationReqMapper.selectVoWithProjectList(buildAppropriationBo(emp.getEmpId(), status)), nickName));
}
// 用流程实例状态覆盖业务表状态，避免历史数据状态未同步
overrideStatusByFlowInstance(all);
if (keyword != null && !keyword.isEmpty()) {
String lower = keyword.toLowerCase();
all = all.stream().filter(v -> contains(v, lower)).collect(Collectors.toList());
@@ -93,6 +101,34 @@ public class HrmMyApplyController extends BaseController {
return TableDataInfo.build(page);
}
private void overrideStatusByFlowInstance(List<HrmMyApplyVo> all) {
if (all == null || all.isEmpty()) return;
Map<String, List<Long>> bizIdsByType = all.stream()
.filter(v -> v.getBizType() != null && v.getBizId() != null)
.collect(Collectors.groupingBy(
HrmMyApplyVo::getBizType,
Collectors.mapping(HrmMyApplyVo::getBizId, Collectors.toList())
));
Map<String, String> statusByKey = new HashMap<>();
bizIdsByType.forEach((bizType, bizIds) -> {
if (bizIds.isEmpty()) return;
List<HrmFlowInstance> insts = flowInstanceMapper.selectList(
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<HrmFlowInstance>()
.eq(HrmFlowInstance::getBizType, bizType)
.in(HrmFlowInstance::getBizId, bizIds)
);
for (HrmFlowInstance inst : insts) {
if (inst.getStatus() == null) continue;
statusByKey.merge(bizType + "_" + inst.getBizId(), inst.getStatus(),
(oldS, newS) -> oldS);
}
});
for (HrmMyApplyVo v : all) {
String s = statusByKey.get(v.getBizType() + "_" + v.getBizId());
if (s != null) v.setStatus(s);
}
}
private boolean contains(HrmMyApplyVo v, String lower) {
return Objects.toString(v.getTitle(), "").toLowerCase().contains(lower)
|| Objects.toString(v.getRemark(), "").toLowerCase().contains(lower)
@@ -109,7 +145,7 @@ public class HrmMyApplyController extends BaseController {
private List<HrmMyApplyVo> mapLeave(List<HrmLeaveReqVo> list, String nickName) { return list.stream().map(v -> toVo("leave", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
private List<HrmMyApplyVo> mapTravel(List<HrmTravelReqVo> list, String nickName) { return list.stream().map(v -> toVo("travel", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
private List<HrmMyApplyVo> mapSeal(List<HrmSealReqVo> list, String nickName) { return list.stream().map(v -> toVo("seal", v.getBizId(), v.getEmpId(), nickName, v.getRemark(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
private List<HrmMyApplyVo> mapSeal(List<HrmSealReqVo> list, String nickName) { return list.stream().map(v -> toVo("seal", v.getBizId(), v.getEmpId(), nickName, v.getPurpose() != null ? v.getPurpose() : v.getRemark(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
private List<HrmMyApplyVo> mapReimburse(List<HrmReimburseReqVo> list, String nickName) { return list.stream().map(v -> toVo("reimburse", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
private List<HrmMyApplyVo> mapAppropriation(List<HrmAppropriationReqVo> list, String nickName) { return list.stream().map(v -> toVo("appropriation", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }

4
fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java
View File

@@ -6,6 +6,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
@Data
public class HrmFlowInstanceVo implements Serializable {
@@ -41,4 +42,7 @@ public class HrmFlowInstanceVo implements Serializable {
private Date createTime;
private String updateBy;
private Date updateTime;
/** 业务表回填的数据，用于列表关键信息展示 */
private Map<String, Object> bizData;
}

54
fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.UserService;
@@ -27,7 +28,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RequiredArgsConstructor
@@ -42,6 +45,11 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
private final UserService userService;
private final HrmFlowCcMapper ccMapper;
private final HrmTravelReqMapper travelReqMapper;
private final HrmLeaveReqMapper leaveReqMapper;
private final HrmSealReqMapper sealReqMapper;
private final HrmReimburseReqMapper reimburseReqMapper;
private final HrmAppropriationReqMapper appropriationReqMapper;
private final ObjectMapper objectMapper;
private final ApplicationEventPublisher eventPublisher;
@Override
@@ -188,9 +196,55 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
}
}
}
fillInstanceBizData(result.getRecords());
return TableDataInfo.build(result);
}
@SuppressWarnings("unchecked")
private void fillInstanceBizData(List<HrmFlowInstanceVo> records) {
if (records == null || records.isEmpty()) return;
Map<String, List<Long>> bizIdsByType = records.stream()
.filter(v -> v.getBizType() != null && v.getBizId() != null)
.collect(Collectors.groupingBy(
HrmFlowInstanceVo::getBizType,
Collectors.mapping(HrmFlowInstanceVo::getBizId, Collectors.toList())
));
Map<String, Object> bizDataMap = new HashMap<>();
bizIdsByType.forEach((bizType, bizIds) -> {
if (bizIds.isEmpty()) return;
switch (bizType) {
case "leave":
leaveReqMapper.selectBatchIds(bizIds).forEach(d ->
bizDataMap.put("leave_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
break;
case "travel":
travelReqMapper.selectBatchIds(bizIds).forEach(d ->
bizDataMap.put("travel_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
break;
case "seal":
sealReqMapper.selectBatchIds(bizIds).forEach(d ->
bizDataMap.put("seal_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
break;
case "reimburse":
reimburseReqMapper.selectBatchIds(bizIds).forEach(d ->
bizDataMap.put("reimburse_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
break;
case "appropriation":
appropriationReqMapper.selectBatchIds(bizIds).forEach(d ->
bizDataMap.put("appropriation_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
break;
default:
break;
}
});
records.forEach(vo -> {
Object data = bizDataMap.get(vo.getBizType() + "_" + vo.getBizId());
if (data != null) {
vo.setBizData((Map<String, Object>) data);
}
});
}
@Override
public List<HrmFlowInstanceVo> queryList(HrmFlowInstanceBo bo) {
LambdaQueryWrapper<HrmFlowInstance> lqw = buildQueryWrapper(bo);