Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 c3a11538b96aeac198fbaa467210ef8754773ad1

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java

@@ -348,7 +348,7 @@
                        idleCount += assetMain.getQuantity();
                    }else if (assetMain.getAssetStatus().contains("使用中")){
                        useCount += assetMain.getQuantity();
                    }else if (assetMain.getAssetStatus().contains("损坏") || assetMain.getAssetStatus().contains("报废")){
                    }else if (assetMain.getAssetStatus().contains("损") || assetMain.getAssetStatus().contains("废")){
                        disposeCount += assetMain.getQuantity();
                    }else{
                        otherCount += assetMain.getQuantity();
@@ -536,4 +536,14 @@
        return list;
    }

    @Override
    public String getAssetTypeNameById(Integer assetTypeId) {
        if (assetTypeId != null) {
            AssetType assetType = this.getById(assetTypeId);
            if (assetType != null) {
                return assetType.getTypeName();
            }
        }
        return null;
    }
}