From 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 14:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 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 cd50d37..06a69f4 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
@@ -1,10 +1,31 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.system.applet.dto.AppealListDTO;
+import com.ruoyi.system.applet.query.AppealListQuery;
+import com.ruoyi.system.applet.vo.TaskListAllVO;
import com.ruoyi.system.mapper.TAppealMapper;
+import com.ruoyi.system.mapper.TDeptMapper;
+import com.ruoyi.system.mapper.TTaskDetailMapper;
+import com.ruoyi.system.mapper.TTaskMapper;
import com.ruoyi.system.model.TAppeal;
+import com.ruoyi.system.model.TDept;
+import com.ruoyi.system.model.TTask;
+import com.ruoyi.system.model.TTaskDetail;
+import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.service.TAppealService;
+import com.ruoyi.system.vo.system.AppealListVO;
+import com.ruoyi.system.vo.system.InspectorListVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -16,5 +37,51 @@
*/
@Service
public class TAppealServiceImpl extends ServiceImpl<TAppealMapper, TAppeal> implements TAppealService {
+ @Autowired
+ private TDeptMapper deptMapper;
+ @Autowired
+ private TTaskDetailMapper taskDetailMapper;
+ @Autowired
+ private TTaskMapper taskMapper;
+ @Override
+ public PageInfo<AppealListVO> pageList(InsepectorListQuery query) {
+ PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AppealListVO> list = this.baseMapper.pageList(query,pageInfo);
+ List<TTask> tTasks = taskMapper.selectList(null);
+ for (AppealListVO taskListVO : list) {
+ TTask tTask = tTasks.stream().filter(e -> e.getId().equals(taskListVO.getTaskId())).findFirst().orElse(null);
+ if (tTask!=null){
+ TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
+ taskListVO.setDeptName(tDept.getDeptName());
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ @Override
+ public PageInfo<AppealListVO> pageListUser(AppealListQuery query) {
+ PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AppealListVO> list = this.baseMapper.pageListUser(query,pageInfo);
+ for (AppealListVO taskListVO : list) {
+ taskListVO.setDistance(taskListVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_UP));
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public List<TaskListAllVO> listAllTask(AppealListDTO query) {
+ PageInfo<AppealListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TaskListAllVO> list = this.baseMapper.listAllTask(query,pageInfo);
+ for (TaskListAllVO taskListAllVO : list) {
+ taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_UP));
+ if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){
+ taskListAllVO.setStatus(1);
+ }else{
+ taskListAllVO.setStatus(2);
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.7.1