代码初始化

k94314517

2025-05-07 83520d366314d40f337f5c789f6cfeae75a51f64

代码初始化

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java

@@ -351,7 +351,8 @@
                rataList.add(generalDataVO);
            }
        }else{
            List<String> categoryNameList = yearList.stream().filter(i-> StringUtils.isNotBlank(i.getCategoryParentName())).map(i->i.getCategoryParentName()).collect(Collectors.toList());
            List<String> categoryNameList = yearList.stream().filter(i-> StringUtils.isNotBlank(i.getCategoryParentName()))
                    .map(i->i.getCategoryParentName()).collect(Collectors.toList());
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryNameList)){
                Set<String> setList = new HashSet<>(categoryNameList);
                for (String categoryName:setList) {
@@ -402,7 +403,7 @@
            if(Constants.equalsInteger(DateUtil.getNowYearNum(),Integer.valueOf(inParkDataDTO.getDateStr()))){
                maxMonth =  DateUtil.getNowMonthNum();
            }
            for (int i = maxMonth; i >=0 ; i--) {
            for (int i = maxMonth; i >0 ; i--) {
                dateList.add(DateUtil.getNowYearNum()+"-"+ StringUtils.leftPad(i+"",2,"0"));
            }
        }else {
@@ -420,7 +421,7 @@
                    lastDay = today;
                }
            }
            for (int i = lastDay; i >= 0 ; i--) {
            for (int i = lastDay; i > 0 ; i--) {
                dateList.add(year + "-" + StringUtils.leftPad(month.toString(),2,"0") + "-" + StringUtils.leftPad(Integer.toString(i),2,"0"));
            }
        }
@@ -443,11 +444,11 @@
            }
            totalString.add("合计");
            resultList.add(totalString);
            Integer total = 0;
            for (String str:dataList) {
                Integer total = 0;
                List<String> dataChildList = new ArrayList<>();
                dataChildList.add(str);
                for (String categoryName:setList) {
                    List<String> dataChildList = new ArrayList<>();
                    dataChildList.add(str);
                    if(Constants.equalsInteger(dateStr.length(),4)){
                        Integer childNum = allList.stream().filter(i->categoryName.equals(i.getCategoryName())
                                && DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(str)).collect(Collectors.toList()).size();
@@ -463,9 +464,9 @@
                        );
                        total = total + childNum;
                    }
                    dataChildList.add(Integer.toString(total));
                    resultList.add(dataChildList);
                }
                dataChildList.add(Integer.toString(total));
                resultList.add(dataChildList);
            }
        }else{
            for (int j = 0; j < userTypeList.length; j++) {
@@ -526,7 +527,6 @@
                        person -> person,
                        (existing, replacement) -> existing
                ));

        List<InoutRecord> uniqueList = new ArrayList<>(uniqueByMemberPhone.values());
        return uniqueList;
    }
@@ -538,7 +538,6 @@
                        person -> person,
                        (existing, replacement) -> existing
                ));

        List<InoutRecord> uniqueList = new ArrayList<>(uniqueByCarCode.values());
        return uniqueList;
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -1907,6 +1907,7 @@

                visitVO.setName(days);
                InterestedListVO carVO = new InterestedListVO();
                carVO.setNum(Constants.ZERO);
                carVO.setName(days);

                if(CollectionUtils.isNotEmpty(inoutRecordList)){