保洁巡检本周代码

无关风月

2025-07-03 8d0bd68856c69ccc2a76f54a96fdd498ce3327c7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java

@@ -32,12 +32,14 @@
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.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

@@ -55,7 +57,10 @@
public class TTaskController {
    @Resource
    private TTaskCleanService taskCleanerService;

    @Resource
    private TNoticeService noticeService;
    @Resource
    private TNoticeSetService noticeSetService;
    @Resource
    private TTaskDetailService taskDetailService;

@@ -77,6 +82,8 @@
    private TDictDataService dictDataService;
    @Resource
    private TokenService tokenService;
    @Resource
    private TCleanerService cleanerService;

    @ApiOperation(value = "任务记录分页列表")
    @PostMapping(value = "/pageList")
@@ -94,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()){
@@ -105,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());
@@ -124,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()){
@@ -135,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());
@@ -153,32 +161,73 @@
    @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 byId = taskCleanerService.getById(dto.getTaskId());
        TTask task = taskCleanerService.getById(dto.getTaskId());
        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);
            // 将任务修改为待整改
            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 = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            if (list.isEmpty()){
                byId.setStatus(6);
                taskCleanerService.updateById(byId);
                if (dto.getClearStatus()==1){
                    task.setStatus(6);
                    taskCleanerService.updateById(task);
                }else{
                    task.setStatus(4);
                    taskCleanerService.updateById(task);
// 增加消息
                    tNotice.setNoticeType(1);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
                }

            }else{
                byId.setStatus(5);
                taskCleanerService.updateById(byId);
                if (dto.getClearStatus()==1){
                    task.setStatus(5);
                    taskCleanerService.updateById(task);
                    // 增加消息
                    tNotice.setNoticeType(2);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
                }else{
                    task.setStatus(4);
                    taskCleanerService.updateById(task);
                    // 增加消息
                    tNotice.setNoticeType(1);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
                }

            }

        }
        noticeService.save(tNotice);
        dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
        taskDetailService.save(dto);
        return R.ok();
@@ -186,7 +235,7 @@
    @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);
@@ -240,6 +289,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) {
@@ -275,7 +356,7 @@
        return R.ok();
    }

    @Log(title = "任务记录导出", businessType = BusinessType.DELETE)
    @Log(title = "任务记录导出", businessType = BusinessType.EXPORT)
    @ApiOperation(value = "任务记录导出")
    @PostMapping(value = "/exportExcel")
    public void exportExcel(@RequestBody TaskListQuery query) {