From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 14:00:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java index 93e4c90..af13ac2 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java @@ -1943,11 +1943,11 @@ ); //鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁� data.setRelatedTotal( - (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count() + (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR) ).count() ); //鍦ㄥ洯鍐呴儴鍛樺伐浜烘暟 data.setInternalTotal( - (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ONE)).count() + (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) ).count() ); //鍦ㄥ洯璁垮鏁伴噺 data.setVisitTotal( @@ -1957,7 +1957,11 @@ data.setInParkCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count() ); - //鍦ㄥ洯鐩稿叧鏂硅溅杈� + //鍦ㄥ洯杞﹁締 + data.setInParkCarUserTotal( + (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)).count() + ); + /* //鍦ㄥ洯鐩稿叧鏂硅溅杈� data.setRelatedCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.relation)).count() @@ -1966,26 +1970,26 @@ data.setInternalCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.internal)).count() - ); + );*/ //鏉ヨ杞﹁締 data.setVisitCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) - &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.visitor)).count() + &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.fkCar)).count() ); //鑷敱鐗╂祦杞︽暟閲� data.setVisitCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) - &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.selfTruck)).count() + &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.atwlzyCar)).count() ); //甯傚叕鍙稿嵏璐ц溅鏁伴噺 data.setInternalJobCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) - &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.cityComTruck)).count() + &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.sgsxhCar)).count() ); //澶栧崗杞︽暟閲� data.setRelatedJobCarTotal( (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE) - &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count() + &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.wxysCar)).count() ); data.setVideoPluginUrl(getVideoUrl()); return data; -- Gitblit v1.9.3