From 095d19dff25e37c8abf3cf197a4bdac6a2b3ecd5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 02 七月 2025 09:37:45 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 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 d276e6a..d35604c 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
@@ -108,6 +108,7 @@
|| Objects.isNull(hiddenDanger.getCateId())
|| Objects.isNull(hiddenDanger.getApplyCheckUserId())
|| Objects.isNull(hiddenDanger.getCheckUserId())
+ || Objects.isNull(hiddenDanger.getCheckTypeId())
|| Objects.isNull(hiddenDanger.getSubmitTime())
|| StringUtils.isBlank(hiddenDanger.getContent())
){
@@ -121,6 +122,10 @@
hiddenDanger.setIsdeleted(Constants.ZERO);
hiddenDanger.setCreateDate(new Date());
hiddenDanger.setEditDate(new Date());
+ HiddenDangerParam hiddenDangerCheckParam = hiddenDangerParamMapper.selectById(hiddenDanger.getCheckTypeId());
+ if(Objects.isNull(hiddenDangerCheckParam)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅妫�鏌ョ被鍨�");
+ }
HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId());
if(Objects.isNull(hiddenDangerParam)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鍖哄煙");
@@ -341,12 +346,14 @@
.select("t2.name",HiddenDanger::getCheckorName)
.select("t2.phone",HiddenDanger::getCheckorPhone)
.select("t5.company_name_path",HiddenDanger::getDutyCompanyName)
- .select("t4.company_name_path",HiddenDanger::getCompanyName);
+ .select("t4.company_name_path",HiddenDanger::getCompanyName)
+ .select("t6.name", HiddenDanger::getCheckTypeName);
queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin("company t5 on t2.company_id=t5.id");
+ .leftJoin("company t5 on t2.company_id=t5.id")
+ .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id");
queryWrapper
.eq(HiddenDanger::getId, id)
.eq(HiddenDanger::getIsdeleted, Constants.ZERO)
@@ -434,6 +441,7 @@
queryWrapper.selectAll(HiddenDanger.class)
.selectAs(HiddenDangerParam::getName,HiddenDanger::getCategoryName)
.select("t1.name", HiddenDanger::getMemberName)
+ .select("t6.name", HiddenDanger::getCheckTypeName)
.select("t1.phone",HiddenDanger::getMemberPhone)
.select("t2.name",HiddenDanger::getCheckorName)
.select("t2.phone",HiddenDanger::getCheckorPhone)
@@ -443,6 +451,7 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
+ .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id")
.leftJoin("company t5 on t2.company_id=t5.id");
//鏁版嵁鏉冮檺寮�濮�--------------------start----------------
@@ -861,7 +870,6 @@
hiddenDangerDataVO.setCateList(cateGeneralDataList);
}
//鍏ㄩ儴闅愭偅鍖哄煙閮ㄩ棬鏁版嵁
-
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());
@@ -880,7 +888,8 @@
if(optionalCompany.isPresent()){
GeneralDataVO generalDataVO = new GeneralDataVO();
Company company = optionalCompany.get();
- 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();
+ 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());
@@ -889,19 +898,44 @@
}
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);
- }
+// 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);
+// }
+
}
+
+ List<Map<String,Object>> mapList = hiddenDangerMapper.selectJoinMaps(new MPJLambdaWrapper<HiddenDanger>()
+ .select(" t1.name as cateName,t2.name as companyName , count(1) total ")
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
+ .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
+ .apply(" DATE_FORMAT(t.CREATE_DATE, '%Y%M') = DATE_FORMAT(now(), '%Y%M') ")
+ .groupBy("t1.name , t2.name")
+ .orderByDesc(" count(1) ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(mapList)){
+ List<GeneralDataVO> topList = new ArrayList<>();
+ for (Map<String,Object> map:mapList) {
+ GeneralDataVO generalDataVO = new GeneralDataVO();
+ generalDataVO.setTotal(Integer.valueOf(map.get("total").toString()));
+ generalDataVO.setName(map.get("companyName").toString());
+ generalDataVO.setCategoryName(map.get("cateName").toString());
+ topList.add(generalDataVO);
+ }
+ hiddenDangerDataVO.setDepartmentSortList(topList);
+ }
+
+
+
return hiddenDangerDataVO;
}
--
Gitblit v1.9.3