bug修改

xuhy

2025-07-02 0f7254953cf629f4a6cbbf18c39292b5984d2b71

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

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

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

@@ -172,24 +175,40 @@
    @PostMapping(value = "/audit")
    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();
            if (list.isEmpty()){
                byId.setStatus(6);
                taskCleanerService.updateById(byId);
                task.setStatus(6);
                taskCleanerService.updateById(task);
            }else{
                byId.setStatus(5);
                taskCleanerService.updateById(byId);
                task.setStatus(5);
                taskCleanerService.updateById(task);
            }
            // 增加消息
            tNotice.setNoticeType(2);
            tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
        }
        noticeService.save(tNotice);
        dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
        taskDetailService.save(dto);
        return R.ok();