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

优化

This commit is contained in:
mashuai 2026-01-29 16:41:46 +08:00
parent 607676d136
commit b09896cc03
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
View File

@ -303,4 +303,11 @@ public interface MachineMapper
* @return * @return
*/ */
List<Machine> getInfoByCode(Machine machine); List<Machine> getInfoByCode(Machine machine);
/**
* 查询不到，直接查询结算表数据
* @param leaseInfoBack
* @return
*/
LeaseApplyInfo getBackUnitAndProjectBySlt(LeaseApplyInfo leaseInfoBack);
} }

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

@ -574,6 +574,11 @@ public class MachineServiceImpl implements IMachineService
baseInfo.setBackProject(null); baseInfo.setBackProject(null);
} else { } else {
LeaseApplyInfo leaseDetailBack = machineMapper.getBackUnitAndProject(leaseInfoBack); 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.setBackTime(String.valueOf(leaseDetailBack.getLeaseTime()));
baseInfo.setBackUnit(leaseDetailBack.getUnitName()); baseInfo.setBackUnit(leaseDetailBack.getUnitName());
baseInfo.setBackProject(leaseDetailBack.getProjectName()); baseInfo.setBackProject(leaseDetailBack.getProjectName());

14
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -1350,6 +1350,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
limit 100 limit 100
</select> </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 id="insertMaStatusLog">
insert into update_ma_status_log insert into update_ma_status_log
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">