Merge remote-tracking branch 'origin/master'

xuhy

2025-06-17 ead0a2f837503380c26f008338ac9ce026680e47

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

@@ -1,5 +1,4 @@
package com.ruoyi.web.controller.api;
import com.google.common.collect.Lists;
import java.time.LocalDateTime;

import com.ruoyi.common.core.domain.BaseModel;
@@ -16,9 +15,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.dto.TTaskDTO;
import com.ruoyi.system.dto.TTemplateDTO;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.ProjectDeptListQuery;
import com.ruoyi.system.query.TaskListQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.*;
@@ -47,7 +44,7 @@
@RequestMapping("/t-task")
public class TTaskController {
    @Resource
    private TTaskService taskService;
    private TTaskCleanService taskCleanerService;

    @Resource
    private TTaskDetailService taskDetailService;
@@ -59,10 +56,7 @@
    private TLocationService locationService;
    @Resource
    private TProjectDeptService projectDeptService;
    @Resource
    private TCleanerService cleanerService;
    @Resource
    private TTaskService tTaskService;

    @Resource
    private TTaskDetailService tTaskDetailService;
    @Resource
@@ -142,14 +136,14 @@
                query.setLocationIds(collect);
            }
        }
        return R.ok(taskService.pageList(query));
        return R.ok(taskCleanerService.pageList(query));
    }

    @Log(title = "新增任务", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增任务")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody TTaskDTO dto) {
        taskService.save(dto);
        taskCleanerService.save(dto);
        return R.ok();
    }
    @Log(title = "审核任务", businessType = BusinessType.UPDATE)
@@ -157,14 +151,23 @@
    @PostMapping(value = "/audit")
    public R<Boolean> audit(@RequestBody @Valid TTaskAuditDTO dto) {
        dto.setAuditTime(LocalDateTime.now());
        TTask byId = taskCleanerService.getById(dto.getTaskId());
        if (dto.getAuditStatus()==2){
            dto.setHandleType(3);
            // 将任务修改为待整改
            TTask byId = taskService.getById(dto.getTaskId());
            byId.setStatus(4);
            taskService.updateById(byId);
            taskCleanerService.updateById(byId);
        }else{
            dto.setHandleType(2);
            // 如果是初次审核就通过 将状态设置为已完成
            List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            if (list.isEmpty()){
                byId.setStatus(6);
                taskCleanerService.updateById(byId);
            }else{
                byId.setStatus(5);
                taskCleanerService.updateById(byId);
            }
        }
        dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
        taskDetailService.save(dto);
@@ -176,6 +179,7 @@
    public R<Boolean> auditBatch(@RequestBody @Valid 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());
@@ -183,11 +187,19 @@
            if (dto.getAuditStatus()==2){
                tTaskDetail.setHandleType(3);
                // 将任务修改为待整改
                TTask byId = taskService.getById(tTaskDetail.getTaskId());
                byId.setStatus(4);
                taskService.updateById(byId);
                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);
        }
@@ -200,7 +212,7 @@
        List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, id)
                .orderByDesc(BaseModel::getCreateTime).list();
        TaskDetailVO taskDetailVO = new TaskDetailVO();
        TTask byId = taskService.getById(id);
        TTask byId = taskCleanerService.getById(id);
        BeanUtils.copyProperties(byId, taskDetailVO);
        TLocation byId1 = locationService.getById(byId.getLocationId());
        TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
@@ -224,7 +236,7 @@

        TaskRecordDetailVO taskDetailVO = new TaskRecordDetailVO();
        TTaskDetail byId4 = taskDetailService.getById(id);
        TTask byId = taskService.getById(byId4.getTaskId());
        TTask byId = taskCleanerService.getById(byId4.getTaskId());
        BeanUtils.copyProperties(byId, taskDetailVO);
        TLocation byId1 = locationService.getById(byId.getLocationId());
        TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
@@ -249,7 +261,7 @@
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestParam String ids) {
        String[] split = ids.split(",");
        taskService.removeBatchByIds(Arrays.asList(split));
        taskCleanerService.removeBatchByIds(Arrays.asList(split));
        return R.ok();
    }