Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 165640ccada379858b4e1769c6475fcc95324843

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

@@ -9,6 +9,7 @@
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.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -161,6 +162,9 @@
    @ApiOperation(value = "新增任务")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody TTaskDTO dto) {
        String nameAndCode = CodeGenerateUtils.generateVolumeSn();
        dto.setTaskName(nameAndCode);
        dto.setTaskCode(nameAndCode);
        dto.setTaskType(2);
        String implementTime1 = dto.getImplementTime1();
        // 转化为LocalDateTime类型
@@ -177,6 +181,7 @@
        dto.setAuditTime(LocalDateTime.now());
        TTask task = taskCleanerService.getById(dto.getTaskId());
        TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())
                .eq(TTaskDetail::getHandleType,1)
                .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
        dto.setClearStatus(one.getClearStatus());
        TLocation location = locationService.getById(task.getLocationId());
@@ -197,36 +202,31 @@
            tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");

        }else{

            dto.setHandleType(2);
            // 如果是初次审核就通过 将状态设置为已完成
            List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            if (list.isEmpty()){
                if (dto.getClearStatus()==1){
            List<TTaskDetail> list = tTaskDetailService.lambdaQuery()
                    .eq(TTaskDetail::getHandleType,1)
                    .eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
            if (one.getClearStatus()==1){
                if (list.size()<2){
                    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);
                    task.setStatus(5);
                    taskCleanerService.updateById(task);
                    // 增加消息
                    tNotice.setNoticeType(1);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
                    tNotice.setNoticeType(2);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
                }

            }else{
                // 将任务修改为待整改
                task.setStatus(4);
                taskCleanerService.updateById(task);
                // 增加消息
                tNotice.setNoticeType(1);
                tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
            }

        }
@@ -293,6 +293,9 @@
                tTaskDetail.setUnqualifiedName(byId3.getDataContent());
            }
        }
        if (tTaskDetail!=null){
            tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
        }
        taskDetailVO.setTaskDetail(tTaskDetail);
        taskDetailVO.setRecords(list);
        return R.ok(taskDetailVO);