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

设备清单

This commit is contained in:
mashuai 2024-10-29 16:11:23 +08:00
parent 9acc8d2c18
commit 3dcf2d31de
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,14 +2,18 @@ package com.bonus.material.ma.service.impl;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.bonus.common.biz.enums.HttpCodeEnum;
import com.bonus.common.core.constant.SecurityConstants;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.ma.domain.Type;
import com.bonus.material.ma.vo.MachineVo;
import com.bonus.material.purchase.config.RemoteConfig;
import com.bonus.system.api.RemoteUserService;
import com.bonus.system.api.domain.SysUser;
import com.fasterxml.jackson.databind.DeserializationFeature;
@ -38,6 +42,9 @@ public class MachineServiceImpl implements IMachineService
@Resource
private RemoteUserService remoteUserService;
@Resource
private RemoteConfig remoteConfig;
/**
* 查询机具设备管理
*
@ -50,6 +57,10 @@ public class MachineServiceImpl implements IMachineService
MachineVo machineVo = machineMapper.selectMachineByMaId(maId);
setUserName(machineVo.getKeeperId(), machineVo::setKeeperName);
setUserName(machineVo.getRepairId(), machineVo::setRepairName);
Map<String, String> machineStatus = remoteConfig.getDictValue("ma_machine_status");
if (StringUtils.isNotBlank(machineVo.getMaStatus())) {
machineVo.setStatusName(StringUtils.isBlank(machineStatus.get(machineVo.getMaStatus())) ? "" : machineStatus.get(machineVo.getMaStatus()));
}
return machineVo;
}
@ -80,7 +91,16 @@ public class MachineServiceImpl implements IMachineService
@Override
public List<MachineVo> selectMachineList(Machine machine)
{
return machineMapper.selectMachineList(machine);
List<MachineVo> list = machineMapper.selectMachineList(machine);
Map<String, String> machineStatus = remoteConfig.getDictValue("ma_machine_status");
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(machineVo -> {
if (StringUtils.isNotBlank(machineVo.getMaStatus())) {
machineVo.setStatusName(StringUtils.isBlank(machineStatus.get(machineVo.getMaStatus())) ? "" : machineStatus.get(machineVo.getMaStatus()));
}
});
}
return list;
}
/**

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MachineVo.java
View File

@ -39,4 +39,7 @@ public class MachineVo extends Machine {
@ApiModelProperty("资产属性名称")
private String assetName;
@ApiModelProperty("状态名称")
private String statusName;
}

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

@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ma.ma_status as maStatus,
ma.qr_code as qrCode,
ma.buy_price as buyPrice,
ma.ma_vender as maVender,
msi.supplier as maVender,
ma.out_fac_time as outFacTime,
ma.out_fac_code as outFacCode,
ma.assets_code as assetsCode,
@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and mt3.`level` = '2' and mt3.del_flag = '0'
LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id
and mt4.`level` = '1' and mt4.del_flag = '0'
LEFT JOIN ma_supplier_info msi ON msi.supplier_id = ma.ma_vender
where
1 = 1
<if test="keyWord != null and keyWord != ''">