diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java index 887f5ba3..d14cb3f5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java @@ -303,4 +303,11 @@ public interface MachineMapper * @return */ List getInfoByCode(Machine machine); + + /** + * 查询不到,直接查询结算表数据 + * @param leaseInfoBack + * @return + */ + LeaseApplyInfo getBackUnitAndProjectBySlt(LeaseApplyInfo leaseInfoBack); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java index f0232e26..6977f445 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java @@ -574,6 +574,11 @@ public class MachineServiceImpl implements IMachineService baseInfo.setBackProject(null); } else { LeaseApplyInfo leaseDetailBack = machineMapper.getBackUnitAndProject(leaseInfoBack); + // 查询不到,直接查询结算表数据 + if (leaseDetailBack == null || StringUtils.isBlank(leaseDetailBack.getUnitName()) || + StringUtils.isBlank(leaseDetailBack.getProjectName())) { + leaseDetailBack = machineMapper.getBackUnitAndProjectBySlt(leaseInfoBack); + } baseInfo.setBackTime(String.valueOf(leaseDetailBack.getLeaseTime())); baseInfo.setBackUnit(leaseDetailBack.getUnitName()); baseInfo.setBackProject(leaseDetailBack.getProjectName()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index 94349329..7db9789e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -1350,6 +1350,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit 100 + + insert into update_ma_status_log