Merge remote-tracking branch 'origin/master'

mitao

2 天以前 9c76b7efccd70395231b032a193a89f7638b657e

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java

@@ -192,10 +192,10 @@
                query.setDeptIds(deptIds);
            }
        }
        String[] dateList = query.getDate().split(",");
        String[] dateList = query.getDate().split("-");
        String month = dateList[1];
        int monthValue = Integer.parseInt(month);
        int year = LocalDateTime.now().getYear();
        int year = Integer.parseInt(dateList[0]);
        LocalDateTime firstDay = LocalDateTime.of(year, monthValue, 1, 0, 0, 0);
        LocalDateTime lastDay = LocalDateTime.of(year, monthValue,
                YearMonth.of(year, monthValue).lengthOfMonth(), 23, 59, 59);
@@ -241,12 +241,25 @@
        if (StringUtils.hasLength(query.getNameOrCode())){
            // 查询出资产名称或者资产编号符合条件的code
            List<Integer> assetMainIds = assetMainService.lambdaQuery()
                    .eq(AssetMain::getAssetTypeId,8)
                    .and(wrapper -> wrapper.like(AssetMain::getAssetName, query.getNameOrCode())
                            .or()
                            .like(AssetMain::getAssetCode, query.getNameOrCode()))
                    .list()
                    .stream()
                    .map(AssetMain::getAssetTypeId)
                    .map(AssetMain::getId)
                    .collect(Collectors.toList());
            query.setAssetMainIds(assetMainIds);
            if (assetMainIds.isEmpty()){
                res.setPageList(new PageInfo<>());
                return R.ok(res);
            }
        }else{
            List<Integer> assetMainIds = assetMainService.lambdaQuery()
                    .eq(AssetMain::getAssetTypeId,8)
                    .list()
                    .stream()
                    .map(AssetMain::getId)
                    .collect(Collectors.toList());
            query.setAssetMainIds(assetMainIds);
            if (assetMainIds.isEmpty()){