Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java

@@ -163,4 +163,7 @@ public class Machine extends BaseEntity
     @ApiModelProperty("规格型号-四级")
     private String materialModel;
 
+    @ApiModelProperty("资产属性ID")
+    private String assetsId;
+
 }

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

@@ -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;
     }
 
     /**

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

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

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

@@ -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 != ''">
@@ -269,6 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectMan != null">inspect_man = #{inspectMan},</if>
             <if test="inspectStatus != null">inspect_status = #{inspectStatus},</if>
             <if test="phone != null">phone = #{phone},</if>
+            <if test="assetsId != null">assets_id = #{assetsId},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where ma_id = #{maId}
     </update>