bug修改

xuhy

3 天以前 29ad8c492f475031f9c4bbbf6f6c9cf97f201f87

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

@@ -176,6 +176,9 @@
    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")
@@ -198,38 +201,25 @@
            // 如果是初次审核就通过 将状态设置为已完成
            List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            if (list.isEmpty()){
                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{
                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()+"】任务不合格,请重新上传!");
                }

            }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)
@@ -340,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);