bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏问题

This commit is contained in:
hongchao 2026-02-10 17:12:40 +08:00
parent 074d9d7a81
commit e51a46522f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
View File

@ -556,9 +556,15 @@ public class MachineServiceImpl implements IMachineService
baseInfo.setScrapTime(scrapTime != null ? scrapTime.getScrapTime() : "暂无"); baseInfo.setScrapTime(scrapTime != null ? scrapTime.getScrapTime() : "暂无");
// 查询领料任务 // 查询领料任务
LeaseApplyInfo leaseInfo = machineMapper.getLeaseDataByMaId(machine); LeaseApplyInfo leaseInfo = machineMapper.getLeaseDataByMaId(machine);
baseInfo.setLeaseTime(leaseInfo.getLeaseTime()); if(leaseInfo != null){
baseInfo.setLeaseUnit(leaseInfo.getUnitName()); baseInfo.setLeaseTime(String.valueOf(leaseInfo.getLeaseTime()));
baseInfo.setLeaseProject(leaseInfo.getProjectName()); baseInfo.setLeaseUnit(leaseInfo.getUnitName());
baseInfo.setLeaseProject(leaseInfo.getProjectName());
}else{
baseInfo.setLeaseTime(null);
baseInfo.setLeaseUnit(null);
baseInfo.setLeaseProject(null);
}
// LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine); // LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine);
// if (leaseInfo == null || leaseInfo.getParentId() == null) { // if (leaseInfo == null || leaseInfo.getParentId() == null) {
// baseInfo.setLeaseTime(null); // baseInfo.setLeaseTime(null);