From 53d014edd19f57125c355abe71ec5b478500e610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 09:57:40 +0800
Subject: [PATCH] 保洁巡检所有代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
index e4497a7..7ffdf68 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
@@ -20,7 +20,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.List;
/**
@@ -43,6 +45,10 @@
private TTaskMapper taskMapper;
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private TInspectorDetailMapper inspectorDetailMapper;
+ @Autowired
+ private TInspectorMapper inspectorMapper;
@Override
public PageInfo<AppealListVO> pageList(InsepectorListQuery query) {
if (StringUtils.hasLength(query.getEndTime())){
@@ -100,8 +106,24 @@
public List<TaskListAllVO> listAllTask(AppealListDTO query) {
List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
.eq(TTaskDetail::getHandleType,3).groupBy(TTaskDetail::getTaskId).orderByDesc(TTaskDetail::getCreateTime));
+ List<TInspectorDetail> inspectorDetails = inspectorDetailMapper.selectList(new LambdaQueryWrapper<TInspectorDetail>()
+ .eq(TInspectorDetail::getHandleType,3).groupBy(TInspectorDetail::getInspectorId).orderByDesc(TInspectorDetail::getCreateTime));
PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TaskListAllVO> list = this.baseMapper.listAllTask(query,pageInfo);
+ List<TaskListAllVO> list1 = inspectorMapper.listAllInspector(query,pageInfo);
+ for (TaskListAllVO taskListAllVO : list1) {
+ taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
+ if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){
+ taskListAllVO.setStatus(1);
+ }else{
+ // 查询任务的驳回原因
+ taskListAllVO.setStatus(2);
+ TInspectorDetail tTaskDetail = inspectorDetails.stream().filter(e -> e.getInspectorId().equals(taskListAllVO.getId())).findFirst().orElse(null);
+ if (tTaskDetail!=null){
+ taskListAllVO.setRejectRemark(tTaskDetail.getAuditRemark());
+ }
+ }
+ }
for (TaskListAllVO taskListAllVO : list) {
taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){
@@ -115,6 +137,29 @@
}
}
}
+ if (list1.isEmpty()){
+ list1=list;
+ } else{
+ list1.addAll(list);
+
+ }
+
+ // 根据distance进行排序从小到大
+ list1.sort(Comparator.comparing(TaskListAllVO::getDistance));
+ return list1;
+ }
+
+ public static void main(String[] args) {
+ List<Object> objects = new ArrayList<>();
+ List<Integer> anotherList = Arrays.asList(1,2);
+ }
+ @Override
+ public List<TaskListAllVO> locationList(AppealListDTO appealListDTO) {
+ PageInfo<AppealListVO> pageInfo = new PageInfo<>(appealListDTO.getPageNum(), appealListDTO.getPageSize());
+ List<TaskListAllVO> list = this.baseMapper.locationList(appealListDTO,pageInfo);
+ for (TaskListAllVO taskListAllVO : list) {
+ taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
+ }
return list;
}
}
--
Gitblit v1.7.1