From 8ea3b11f54ea9b56f295eeed04eb869e7f67bd16 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 21:33:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 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 3bcb3c9..c40fd30 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
@@ -4,14 +4,12 @@
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.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.common.core.domain.entity.SysUser;
+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.*;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.InsepectorListQuery;
import com.ruoyi.system.service.TAppealService;
import com.ruoyi.system.vo.system.AppealListVO;
@@ -19,6 +17,8 @@
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;
@@ -35,22 +35,67 @@
@Autowired
private TDeptMapper deptMapper;
@Autowired
+ private TProjectDeptMapper projectDeptMapper;
+ @Autowired
private TTaskDetailMapper taskDetailMapper;
@Autowired
private TTaskMapper taskMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
@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);
+ List<SysUser> sysUsers = sysUserMapper.selectAllList();
+
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());
+ SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(tTask.getPatrolInspector()))).findFirst().orElse(null);
+ if (sysUser!=null){
+ if (sysUser.getDeptType()==2){
+ TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
+ if (tDept!=null){
+ taskListVO.setDeptName(tDept.getDeptName());
+ }
+ }else{
+ TProjectDept tProjectDept = projectDeptMapper.selectById(tTask.getPatrolInspectorDept());
+ if (tProjectDept!=null){
+ taskListVO.setDeptName(tProjectDept.getProjectName());
+
+ }
+ }
+ }
}
}
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