From 245e62f87e29b22b1824d5361d073acaa06ceed9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 七月 2025 11:11:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 211 insertions(+), 17 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 9781920..5bcbb49 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
@@ -1,7 +1,16 @@
package com.ruoyi.web.controller.api;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.time.LocalDateTime;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.io.resource.ClassPathResource;
import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TTaskAuditBatchDTO;
import com.ruoyi.system.dto.TTaskAuditDTO;
@@ -21,14 +30,17 @@
import com.ruoyi.system.vo.system.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -45,7 +57,10 @@
public class TTaskController {
@Resource
private TTaskCleanService taskCleanerService;
-
+ @Resource
+ private TNoticeService noticeService;
+ @Resource
+ private TNoticeSetService noticeSetService;
@Resource
private TTaskDetailService taskDetailService;
@@ -67,6 +82,8 @@
private TDictDataService dictDataService;
@Resource
private TokenService tokenService;
+ @Resource
+ private TCleanerService cleanerService;
@ApiOperation(value = "任务记录分页列表")
@PostMapping(value = "/pageList")
@@ -84,7 +101,7 @@
}
if (StringUtils.hasLength(query.getPhonenumber())){
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().equals(query.getPhonenumber())
+ sysUser.getPhonenumber().contains(query.getPhonenumber())
&& projectIds.contains(sysUser.getDeptId())
).map(SysUser::getUserId).collect(Collectors.toList());
if (patrolInspectorIds.isEmpty()){
@@ -95,8 +112,9 @@
}
if (StringUtils.hasLength(query.getPhonenumber())){
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
- sysUser.getPhonenumber().equals(query.getPhonenumber())
+ 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());
@@ -114,7 +132,7 @@
return R.ok(new PageInfo<>());
}
}
- if (query.getLocationType()!=null){
+ 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()){
@@ -125,8 +143,8 @@
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()){
- query.setLocationIds(collect);
return R.ok(new PageInfo<>());
}else{
collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
@@ -143,33 +161,74 @@
@ApiOperation(value = "新增任务")
@PostMapping(value = "/add")
public R<Boolean> add(@RequestBody TTaskDTO dto) {
+ dto.setTaskType(2);
+ String implementTime1 = dto.getImplementTime1();
+ // 转化为LocalDateTime类型
+ dto.setImplementTime(LocalDateTime.parse(implementTime1, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ TCleaner byId = cleanerService.getById(dto.getCleanerId());
+ dto.setProjectId(byId.getProjectId());
taskCleanerService.save(dto);
return R.ok();
}
@Log(title = "审核任务", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核任务")
@PostMapping(value = "/audit")
- public R<Boolean> audit(@RequestBody @Valid TTaskAuditDTO dto) {
+ public R<Boolean> audit(@RequestBody TTaskAuditDTO dto) {
dto.setAuditTime(LocalDateTime.now());
+ TTask task = taskCleanerService.getById(dto.getTaskId());
+ TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
+ .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
+ dto.setClearStatus(one.getClearStatus());
+ TLocation location = locationService.getById(task.getLocationId());
+ TNotice tNotice = new TNotice();
+ TNoticeSet noticeSet = noticeSetService.lambdaQuery().eq(TNoticeSet::getType, 2).last("limit 1")
+ .one();
+ tNotice.setUserId(task.getPatrolInspector());
+ tNotice.setStatus(1);
+ tNotice.setDataId(task.getId());
+ tNotice.setNoticeSetType(noticeSet.getNoticeType());
if (dto.getAuditStatus()==2){
dto.setHandleType(3);
// 将任务修改为待整改
- TTask byId = taskCleanerService.getById(dto.getTaskId());
- byId.setStatus(4);
- taskCleanerService.updateById(byId);
+ task.setStatus(4);
+ taskCleanerService.updateById(task);
+ // 增加消息
+ tNotice.setNoticeType(1);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
+
}else{
dto.setHandleType(2);
+ // 如果是初次审核就通过 将状态设置为已完成
+ List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
+ if (list.isEmpty()){
+ task.setStatus(6);
+ taskCleanerService.updateById(task);
+ tNotice.setNoticeType(2);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
+ }else{
+ task.setStatus(5);
+ taskCleanerService.updateById(task);
+ tNotice.setNoticeType(2);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
+ }
}
+ noticeService.save(tNotice);
dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
taskDetailService.save(dto);
+ one.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ one.setAuditTime(LocalDateTime.now());
+ one.setAuditRemark(dto.getAuditRemark());
+ one.setAuditStatus(dto.getAuditStatus());
+ taskDetailService.updateById(one);
return R.ok();
}
@Log(title = "批量审核任务", businessType = BusinessType.UPDATE)
@ApiOperation(value = "批量审核任务")
@PostMapping(value = "/auditBatch")
- public R<Boolean> auditBatch(@RequestBody @Valid TTaskAuditBatchDTO dto) {
+ public R<Boolean> auditBatch(@RequestBody @Validated TTaskAuditBatchDTO dto) {
List<TTaskDetail> tTaskDetails = new ArrayList<>();
for (String s : dto.getTaskIds().split(",")) {
+ TTask byId = taskCleanerService.getById(s);
TTaskDetail tTaskDetail = new TTaskDetail();
tTaskDetail.setTaskId(s);
tTaskDetail.setAuditTime(LocalDateTime.now());
@@ -177,11 +236,19 @@
if (dto.getAuditStatus()==2){
tTaskDetail.setHandleType(3);
// 将任务修改为待整改
- TTask byId = taskCleanerService.getById(tTaskDetail.getTaskId());
byId.setStatus(4);
taskCleanerService.updateById(byId);
}else{
tTaskDetail.setHandleType(2);
+ // 如果是初次审核就通过 将状态设置为已完成
+ List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, s).list();
+ if (list.isEmpty()){
+ byId.setStatus(6);
+ taskCleanerService.updateById(byId);
+ }else{
+ byId.setStatus(5);
+ taskCleanerService.updateById(byId);
+ }
}
tTaskDetails.add(tTaskDetail);
}
@@ -212,6 +279,38 @@
taskDetailVO.setRecords(list);
return R.ok(taskDetailVO);
}
+ @ApiOperation(value = "详情任务-根据任务编号")
+ @GetMapping(value = "/detailByTaskCode")
+ public R<TaskDetailVO> detailByTaskCode(@RequestParam String taskCode) {
+ TTask task = taskCleanerService.lambdaQuery().eq(TTask::getTaskCode, taskCode)
+ .last("limit 1").one();
+ TaskDetailVO taskDetailVO = new TaskDetailVO();
+ if (task!=null){
+ String id = task.getId();
+ List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, id)
+ .orderByDesc(BaseModel::getCreateTime).list();
+ TTask byId = taskCleanerService.getById(id);
+ BeanUtils.copyProperties(byId, taskDetailVO);
+ TLocation byId1 = locationService.getById(byId.getLocationId());
+ TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
+ taskDetailVO.setLocationAddress(byId1.getLocationAddress());
+ taskDetailVO.setLocationIcon(byId2.getLocationIcon());
+ taskDetailVO.setLocationName(byId2.getLocationName());
+ TTaskDetail tTaskDetail = list.stream().filter(e -> e.getHandleType() == 1).findFirst().orElse(null);
+ if (tTaskDetail!=null && tTaskDetail.getUnqualified()!=null){
+ TDictData byId3 = dictDataService.getById(tTaskDetail.getUnqualified());
+ if (byId3!=null){
+ tTaskDetail.setUnqualifiedName(byId3.getDataContent());
+ }
+ }
+ taskDetailVO.setTaskDetail(tTaskDetail);
+ taskDetailVO.setRecords(list);
+ }else{
+ return R.fail("任务不存在");
+ }
+
+ return R.ok(taskDetailVO);
+ }
@ApiOperation(value = "详情任务-操作记录-详情")
@GetMapping(value = "/detailRecord")
public R<TaskRecordDetailVO> detailRecord(@RequestParam String id) {
@@ -231,9 +330,11 @@
byId4.setUnqualifiedName(byId3.getDataContent());
}
}
- SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
- if (sysUser!=null){
- byId4.setAuditPersonName(sysUser.getUserName());
+ if (byId4.getAuditPerson()!=null){
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
+ if (sysUser!=null){
+ byId4.setAuditPersonName(sysUser.getUserName());
+ }
}
taskDetailVO.setTaskDetail(byId4);
return R.ok(taskDetailVO);
@@ -247,5 +348,98 @@
return R.ok();
}
+ @Log(title = "任务记录导出", businessType = BusinessType.EXPORT)
+ @ApiOperation(value = "任务记录导出")
+ @PostMapping(value = "/exportExcel")
+ public void exportExcel(@RequestBody TaskListQuery query) {
+ List<SysUser> sysUsers = sysUserService.selectAllList();
+ List<TLocation> locationList = locationService.list();
+ if (StringUtils.hasLength(query.getDeptName())){
+ List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
+ .stream().map(TDept::getId).collect(Collectors.toList());
+ projectIds.addAll(deptIds);
+ if (projectIds.isEmpty()){
+ projectIds.add("-1");
+ }
+ if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().equals(query.getPhonenumber())
+ && projectIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ patrolInspectorIds.add(-1L);
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
+ }
+ if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().equals(query.getPhonenumber())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (!query.getPatrolInspectorIds().isEmpty()){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ patrolInspectorIds.add(-1L);
+ }
+ }
+ 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("-1");
+ }
+ }
+ if (query.getLocationType()!=null){
+ List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
+ .collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add("-1");
+ }
+ 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());
+ if (collect.isEmpty()){
+ collect.add("-1");
+ }else{
+ collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add("-1");
+ }
+ query.setLocationIds(collect);
+ }
+ }
+ List<TaskListVO> list = taskCleanerService.exportList(query);
+
+ //1.获取excel模板
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TaskListVO.class, list);
+ HttpServletResponse response = WebUtils.response();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("任务记录列表.xls", "utf-8");
+ response.setHeader("Content-dispodition", "attachment;filename=" + fileName);
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+
}
--
Gitblit v1.7.1