From c5675aa3b997583cae930b5cfb4b6487e4d38cfa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 14:14:53 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 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 903d114..d276e6a 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
@@ -10,6 +10,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.dao.*;
import com.doumee.dao.business.vo.GeneralDataVO;
+import com.doumee.dao.business.vo.HiddenDangerCompanyVO;
import com.doumee.dao.business.vo.HiddenDangerDataVO;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -793,33 +794,35 @@
@Override
public HiddenDangerDataVO hiddenDangerData(HiddenDanger hiddenDanger){
HiddenDangerDataVO hiddenDangerDataVO = new HiddenDangerDataVO();
- List<HiddenDanger> hiddenDangerYearList = hiddenDangerMapper.selectJoinList(HiddenDanger.class,
+ List<HiddenDanger> hiddenDangerAllList = 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())
+// .apply(" ( DATE_FORMAT(t.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)){
+ if(CollectionUtils.isEmpty(hiddenDangerAllList)){
return hiddenDangerDataVO;
}
+ Integer nowYear = DateUtil.getNowYearNum();
+ Integer nowMonth = DateUtil.getNowMonthNum();
+ String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd");
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());
+ generalDataVO.setTotal(
+ hiddenDangerAllList.stream().filter(j->Constants.equalsInteger(nowYear,Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"yyyy")))&&Constants.equalsInteger(Integer.valueOf(generalDataVO.getName()),
+ Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM")))).collect(Collectors.toList()).size());
+ generalDataVO.setName(generalDataVO.getName()+"鏈�");
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());
@@ -829,7 +832,7 @@
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());
+ List<Integer> cateList = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))).map(i->i.getCateId()).collect(Collectors.toList());
//鍏ㄩ儴闅愭偅鍒嗙被鏁版嵁
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateList)){
List<GeneralDataVO> cateGeneralDataList = new ArrayList<>();
@@ -844,7 +847,7 @@
if(optionalHiddenDanger.isPresent()){
GeneralDataVO generalDataVO = new GeneralDataVO();
HiddenDangerParam hiddenDangerParam = optionalHiddenDanger.get();
- Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getCateId(),hiddenDangerParam.getId())).collect(Collectors.toList()).size();
+ Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getCateId(),hiddenDangerParam.getId())&& DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))).collect(Collectors.toList()).size();
generalDataVO.setName(hiddenDangerParam.getName());
generalDataVO.setTotal(total);
generalDataVO.setRata(
@@ -858,23 +861,29 @@
hiddenDangerDataVO.setCateList(cateGeneralDataList);
}
//鍏ㄩ儴闅愭偅鍖哄煙閮ㄩ棬鏁版嵁
- List<Integer> companyIdList = hiddenDangerAllList.stream().map(i->i.getAreaCompanyId()).collect(Collectors.toList());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(companyIdList)){
+
+ List<HiddenDangerCompanyVO> hiddenDangerCompanyVOList = hiddenDangerAllList.stream().
+ filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7)))
+ .map(i->new HiddenDangerCompanyVO(i.getAreaName(),i.getAreaCompanyId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerCompanyVOList)){
List<GeneralDataVO> companyGeneralDataList = new ArrayList<>();
- Set<Integer> companyIdSetList = new HashSet<>(companyIdList);
+ Set<HiddenDangerCompanyVO> companyIdSetList = new HashSet<>(hiddenDangerCompanyVOList);
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
.lambda().eq(Company::getIsdeleted,Constants.ZERO));
- for (Integer companyId:companyIdSetList) {
- if(Objects.isNull(companyId)){
+ for (HiddenDangerCompanyVO hiddenDangerCompanyVO:companyIdSetList) {
+ if(Objects.isNull(hiddenDangerCompanyVO)
+ || Objects.isNull(hiddenDangerCompanyVO.getId())
+ || StringUtils.isBlank(hiddenDangerCompanyVO.getCategoryName())){
continue;
}
- Optional<Company> optionalCompany = companyList.stream().filter(i->Constants.equalsInteger(i.getId(),companyId)).findAny();
+ Optional<Company> optionalCompany = companyList.stream().filter(i->Constants.equalsInteger(i.getId(),hiddenDangerCompanyVO.getId())).findAny();
if(optionalCompany.isPresent()){
GeneralDataVO generalDataVO = new GeneralDataVO();
Company company = optionalCompany.get();
- Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size();
+ Integer total = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))&&Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size();
generalDataVO.setName(company.getName());
generalDataVO.setTotal(total);
+ generalDataVO.setCategoryName(hiddenDangerCompanyVO.getCategoryName());
companyGeneralDataList.add(generalDataVO);
}
}
--
Gitblit v1.9.3