This commit is contained in:
parent
607676d136
commit
b09896cc03
|
|
@ -303,4 +303,11 @@ public interface MachineMapper
|
|||
* @return
|
||||
*/
|
||||
List<Machine> getInfoByCode(Machine machine);
|
||||
|
||||
/**
|
||||
* 查询不到,直接查询结算表数据
|
||||
* @param leaseInfoBack
|
||||
* @return
|
||||
*/
|
||||
LeaseApplyInfo getBackUnitAndProjectBySlt(LeaseApplyInfo leaseInfoBack);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -1350,6 +1350,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
limit 100
|
||||
</select>
|
||||
|
||||
<select id="getBackUnitAndProjectBySlt" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo">
|
||||
select
|
||||
bu.unit_name as unitName,
|
||||
bp.pro_name as projectName,
|
||||
DATE_FORMAT(sai.end_time, '%Y-%m-%d') as leaseTime
|
||||
from slt_agreement_info sai
|
||||
left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id
|
||||
left join bm_unit bu on bai.unit_id = bu.unit_id
|
||||
left join bm_project bp on bai.project_id = bp.pro_id
|
||||
where sai.back_id = #{parentId}
|
||||
ORDER BY sai.end_time DESC
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<insert id="insertMaStatusLog">
|
||||
insert into update_ma_status_log
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
|
|
|
|||
Loading…
Reference in New Issue