Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 653cb0ed3e7be231059480cee266b11f1c9ba11e

 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;
@@ -57,7 +58,10 @@
public class TTaskController {
    @Resource
    private TTaskCleanService taskCleanerService;

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

@@ -158,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类型
@@ -172,26 +179,65 @@
    @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());
        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());
        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);
            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);
                    tNotice.setNoticeType(2);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
                }else{
                    task.setStatus(5);
                    taskCleanerService.updateById(task);
                    tNotice.setNoticeType(2);
                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");
                }
            }else{
                byId.setStatus(5);
                taskCleanerService.updateById(byId);
                // 将任务修改为待整改
                task.setStatus(4);
                taskCleanerService.updateById(task);
                // 增加消息
                tNotice.setNoticeType(1);
                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)
@@ -246,6 +292,9 @@
            if (byId3!=null){
                tTaskDetail.setUnqualifiedName(byId3.getDataContent());
            }
        }
        if (tTaskDetail!=null){
            tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
        }
        taskDetailVO.setTaskDetail(tTaskDetail);
        taskDetailVO.setRecords(list);
@@ -302,9 +351,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);