From 7f17cd5b503840c750e03ca9f51e780b7991f462 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 29 四月 2025 16:03:06 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 2b312cf..903d114 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -793,17 +793,41 @@
@Override
public HiddenDangerDataVO hiddenDangerData(HiddenDanger hiddenDanger){
HiddenDangerDataVO hiddenDangerDataVO = new HiddenDangerDataVO();
- List<HiddenDanger> hiddenDangerAllList = hiddenDangerMapper.selectJoinList(HiddenDanger.class,
+ List<HiddenDanger> hiddenDangerYearList = hiddenDangerMapper.selectJoinList(HiddenDanger.class,
new MPJLambdaWrapper<HiddenDanger>()
.selectAll(HiddenDanger.class)
.selectAs(HiddenDangerParam::getCompanyId, HiddenDanger::getAreaCompanyId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId) //闅愭偅鍖哄煙
.eq(HiddenDanger::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(hiddenDanger.getStatus()),HiddenDanger::getStatus,hiddenDanger.getStatus())
+ .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y') = DATE_FORMAT(now(), '%Y') ) ")
.ge(Objects.nonNull(hiddenDanger.getQueryStartTime()), HiddenDanger::getCreateDate,hiddenDanger.getQueryStartTime())
.le(Objects.nonNull(hiddenDanger.getQueryEndTime()),HiddenDanger::getCreateDate,hiddenDanger.getQueryEndTime())
);
+ List<GeneralDataVO> yearDataList = new ArrayList<>();
+ if(CollectionUtils.isEmpty(hiddenDangerYearList)){
+ return hiddenDangerDataVO;
+ }
+ for (int i = 1; i <=12 ; i++) {
+ GeneralDataVO generalDataVO = new GeneralDataVO();
+ generalDataVO.setName(Integer.toString(i));
+ generalDataVO.setTotal(hiddenDangerYearList.stream().filter(j->Constants.equalsInteger(Integer.valueOf(generalDataVO.getName()),Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM")))).collect(Collectors.toList()).size());
+ yearDataList.add(generalDataVO);
+ }
+ hiddenDangerDataVO.setYearList(yearDataList);
+
+ List<HiddenDanger> hiddenDangerAllList = hiddenDangerYearList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(DateUtil.formatDate(new Date(),"yyyy-MM-dd"))).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(hiddenDangerAllList)){
+ return hiddenDangerDataVO;
+ }
+
+
hiddenDangerDataVO.setTotal(hiddenDangerAllList.size());
+ hiddenDangerDataVO.setWaitDeal(hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
+ hiddenDangerDataVO.setBack(hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.TWO)).collect(Collectors.toList()).size());
+ hiddenDangerDataVO.setDealFinish(hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ONE)).collect(Collectors.toList()).size());
+ hiddenDangerDataVO.setTodayNew(hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(DateUtil.formatDate(new Date(),"yyyy-MM-dd"))).collect(Collectors.toList()).size());
+
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerAllList)){
List<Integer> cateList = hiddenDangerAllList.stream().map(i->i.getCateId()).collect(Collectors.toList());
//鍏ㄩ儴闅愭偅鍒嗙被鏁版嵁
@@ -856,6 +880,17 @@
}
hiddenDangerDataVO.setDepartmentList(companyGeneralDataList);
}
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerDataVO.getDepartmentList())){
+ List<GeneralDataVO> topList = hiddenDangerDataVO.getDepartmentList();
+ Collections.sort(topList, new Comparator<GeneralDataVO>() {
+ @Override
+ public int compare(GeneralDataVO o1, GeneralDataVO o2) {
+ // 杩斿洖鍊间负int绫诲瀷锛屽ぇ浜�0琛ㄧず姝ｅ簭锛屽皬浜�0琛ㄧず閫嗗簭
+ return o2.getTotal() - o1.getTotal();
+ }
+ });
+ hiddenDangerDataVO.setDepartmentSortList(topList);
+ }
}
return hiddenDangerDataVO;
--
Gitblit v1.9.3