From 54b54315510eed85fb81211cd4f4df25414bdf9a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 七月 2025 20:44:48 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
index b6bbbfb..fa09d0b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java
+++ b/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类型
@@ -176,6 +180,10 @@
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())
+ .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")
@@ -194,23 +202,42 @@
tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
}else{
+
dto.setHandleType(2);
// 如果是初次审核就通过 将状态设置为已完成
- List<TTaskDetail> list = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();
- if (list.isEmpty()){
- task.setStatus(6);
- taskCleanerService.updateById(task);
+ 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{
- task.setStatus(5);
+ // 将任务修改为待整改
+ task.setStatus(4);
taskCleanerService.updateById(task);
+ // 增加消息
+ tNotice.setNoticeType(1);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");
}
- // 增加消息
- 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)
@@ -265,6 +292,9 @@
if (byId3!=null){
tTaskDetail.setUnqualifiedName(byId3.getDataContent());
}
+ }
+ if (tTaskDetail!=null){
+ tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
}
taskDetailVO.setTaskDetail(tTaskDetail);
taskDetailVO.setRecords(list);
@@ -321,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);
--
Gitblit v1.7.1