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

优化

This commit is contained in:
mashuai 2025-08-05 13:56:49 +08:00
parent a866447d06
commit 9611f236b9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java
View File

@ -98,7 +98,7 @@ public interface MaterialMachineMapper {
* @param machine1
* @return
*/
MaterialSltAgreementInfo selectStatusById(Machine machine1);
List<MaterialSltAgreementInfo> selectStatusById(Machine machine1);
/**
* 获取设备状态

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
View File

@ -111,8 +111,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
// 根据maId去协议表查询设备设备状态，赋值maStatus
for (Machine machine1 : mergedList) {
if (machine1.getMaId() != null) {
MaterialSltAgreementInfo sltAgreementInfo = materialMachineMapper.selectStatusById(machine1);
if (sltAgreementInfo != null) {
List<MaterialSltAgreementInfo> sltAgreementInfo = materialMachineMapper.selectStatusById(machine1);
if (CollectionUtils.isNotEmpty(sltAgreementInfo)) {
machine1.setMaStatus("在用");
} else {
machine1.setMaStatus("在库");

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
View File

@ -129,7 +129,7 @@ public interface TmTaskMapper {
* @param parseLong
* @return
*/
TmTask selectTmTaskByPreTaskId(long parseLong);
TmTask selectTmTaskByPreTaskId(Long parseLong);
/**
* 查询单位信息