From a858d0f96cd50b7587cd0ac7291e0432e48ac759 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 157 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 97 insertions(+), 60 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
index 36cd49f..b7d84a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
@@ -32,9 +32,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import oshi.driver.mac.net.NetStat;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
@@ -62,6 +64,8 @@
private TNoticeService noticeService;
@Resource
private TNoticeSetService noticeSetService;
+ @Resource
+ private TEarlyWarningService earlyWarningService;
@Resource
private TTaskDetailService taskDetailService;
@@ -205,6 +209,21 @@
tNotice.setDataId(task.getId());
tNotice.setNoticeSetType(noticeSet.getNoticeType());
if (dto.getAuditStatus()==2){
+ if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
+ if (location.getUnqualifiedTaskId().split(",").length==2){
+ // 已经两条不合格了 生成点位不合格预警记录
+ location.setUnqualifiedTaskId(location.getUnqualifiedTaskId()+","+dto.getTaskId());
+ TEarlyWarning tEarlyWarning = new TEarlyWarning();
+ tEarlyWarning.setWarningType(2);
+ tEarlyWarning.setTaskId(location.getUnqualifiedTaskId());
+ earlyWarningService.save(tEarlyWarning);
+ location.setUnqualifiedTaskId("");
+ locationService.updateById(location);
+ }
+ }else{
+ location.setUnqualifiedTaskId(dto.getTaskId());
+ locationService.updateById(location);
+ }
dto.setHandleType(3);
// 将任务修改为待整改
task.setStatus(4);
@@ -212,9 +231,24 @@
// 增加消息
tNotice.setNoticeType(1);
tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
-
}else{
-
+ if (dto.getClearStatus()==2){
+ if (StringUtils.hasLength(location.getUnqualifiedTaskId())){
+ if (location.getUnqualifiedTaskId().split(",").length==2){
+ // 已经两条不合格了 生成点位不合格预警记录
+ location.setUnqualifiedTaskId(location.getUnqualifiedTaskId()+","+dto.getTaskId());
+ TEarlyWarning tEarlyWarning = new TEarlyWarning();
+ tEarlyWarning.setWarningType(2);
+ tEarlyWarning.setTaskId(location.getUnqualifiedTaskId());
+ earlyWarningService.save(tEarlyWarning);
+ location.setUnqualifiedTaskId("");
+ locationService.updateById(location);
+ }
+ }else{
+ location.setUnqualifiedTaskId(dto.getTaskId());
+ locationService.updateById(location);
+ }
+ }
dto.setHandleType(2);
// 如果是初次审核就通过 将状态设置为已完成
List<TTaskDetail> list = tTaskDetailService.lambdaQuery()
@@ -378,80 +412,83 @@
public void exportExcel(@RequestBody TaskListQuery query) {
List<SysUser> sysUsers = sysUserService.selectAllList();
List<TLocation> locationList = locationService.list();
- if (StringUtils.hasLength(query.getDeptName())){
- List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
- List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
- .stream().map(TProjectDept::getId).collect(Collectors.toList());
- for (TProjectDept tProjectDept : list) {
- if (tProjectDept.getParentId().equals("0")){
- List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
- .stream().map(TProjectDept::getId).collect(Collectors.toList());
- listIds.addAll(collect);
+ if(CollectionUtils.isEmpty(query.getTaskIds())){
+
+ if (StringUtils.hasLength(query.getDeptName())){
+ List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
+ List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ for (TProjectDept tProjectDept : list) {
+ if (tProjectDept.getParentId().equals("0")){
+ List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ listIds.addAll(collect);
+ }
+ }
+ List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
+ .stream().map(TDept::getId).collect(Collectors.toList());
+ listIds.addAll(deptIds);
+ if (listIds.isEmpty()){
+ listIds.add("0");
+ }
+ List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
+ .map(SysUser::getUserId).collect(Collectors.toList());
+ query.setPatrolInspectorIds( collect);
+ if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().contains(query.getPhonenumber())
+ && listIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ patrolInspectorIds.add(0L);
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
}
}
- List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
- .stream().map(TDept::getId).collect(Collectors.toList());
- listIds.addAll(deptIds);
- if (listIds.isEmpty()){
- listIds.add("0");
- }
- List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
- .map(SysUser::getUserId).collect(Collectors.toList());
- query.setPatrolInspectorIds( collect);
if (StringUtils.hasLength(query.getPhonenumber())){
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().contains(query.getPhonenumber())
- && listIds.contains(sysUser.getDeptId())
).map(SysUser::getUserId).collect(Collectors.toList());
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (!query.getPatrolInspectorIds().isEmpty()){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
if (patrolInspectorIds.isEmpty()){
patrolInspectorIds.add(0L);
}
- query.setPatrolInspectorIds(patrolInspectorIds);
}
- }
- if (StringUtils.hasLength(query.getPhonenumber())){
- List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().contains(query.getPhonenumber())
- ).map(SysUser::getUserId).collect(Collectors.toList());
- query.setPatrolInspectorIds(patrolInspectorIds);
- if (!query.getPatrolInspectorIds().isEmpty()){
- // 取交集
- patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ if (query.getClearStatus()!=null){
+ List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
+ .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
+ query.setTaskIds(collect);
+ if (collect.isEmpty()){
+ collect.add("0");
+ }
}
- query.setPatrolInspectorIds(patrolInspectorIds);
- if (patrolInspectorIds.isEmpty()){
- patrolInspectorIds.add(0L);
- }
- }
- if (query.getClearStatus()!=null){
- List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
- .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
- query.setTaskIds(collect);
- if (collect.isEmpty()){
- collect.add("0");
- }
- }
- if (StringUtils.hasLength(query.getLocationType())){
- List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
- .collect(Collectors.toList());
- if (collect.isEmpty()){
- collect.add("0");
- }
- query.setLocationIds(collect);
- }
- if (StringUtils.hasLength(query.getLocationName())){
- List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
- .collect(Collectors.toList());
- query.setLocationIds(collect);
- if (collect.isEmpty()){
- collect.add("0");
- }else{
- collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
+ if (StringUtils.hasLength(query.getLocationType())){
+ List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
+ .collect(Collectors.toList());
if (collect.isEmpty()){
collect.add("0");
}
query.setLocationIds(collect);
}
+ if (StringUtils.hasLength(query.getLocationName())){
+ List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
+ .collect(Collectors.toList());
+ query.setLocationIds(collect);
+ if (collect.isEmpty()){
+ collect.add("0");
+ }else{
+ collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add("0");
+ }
+ query.setLocationIds(collect);
+ }
+ }
}
List<TaskListVO> list = taskCleanerService.exportList(query);
--
Gitblit v1.7.1