wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-12-14 14:45:33 +08:00
parent 565b7389d0
commit 0c327dd319
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
View File

@ -65,7 +65,7 @@ public class ResultTaskController extends AbstractController{
@ApiOperation("任务删除") @ApiOperation("任务删除")
@ApiResponses({@ApiResponse(code = 200,message = "成功")}) @ApiResponses({@ApiResponse(code = 200,message = "成功")})
public R deleteTask(Long taskId){ public R deleteTask(Long taskId){
resultTaskService.deleteTask(taskId); Long userId = getUserId();
return R.ok(); return resultTaskService.deleteTask(taskId,userId);
} }
} }

2
src/main/java/com/lz/modules/performance/service/ResultTaskService.java
View File

@ -44,7 +44,7 @@ public interface ResultTaskService extends IService<ResultTask> {
int deleteResultTasksByDetailId(Long detailId); int deleteResultTasksByDetailId(Long detailId);
List<ResultTask> selectResultTasksByDetailId(Long detailId); List<ResultTask> selectResultTasksByDetailId(Long detailId);
void deleteTask(Long taskId); R deleteTask(Long taskId,Long userId);
List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId); List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId);
} }

9
src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
View File

@ -279,8 +279,13 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
} }
@Override @Override
public void deleteTask(Long taskId) { public R deleteTask(Long taskId,Long userId) {
ResultTask resultTask = resultTaskMapper.selectResultTaskById(taskId); ResultTask resultTask = resultTaskMapper.selectResultTaskById(taskId);
ResultDetail resultDetail = resultDetailService.selectResultDetailById(resultTask.getDetailId());
if(!userId.equals(resultDetail.getStaffId())){
log.info("非本人任务不能删除");
return R.error("非本人任务不能删除");
}
resultTaskMapper.deleteResultTaskById(taskId); resultTaskMapper.deleteResultTaskById(taskId);
TaskProcessRecord taskProcessRecord = new TaskProcessRecord(); TaskProcessRecord taskProcessRecord = new TaskProcessRecord();
taskProcessRecord.setTaskId(taskId); taskProcessRecord.setTaskId(taskId);
@ -288,9 +293,9 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
taskProcessRecord.setLabel("将" +resultTask.getName() + "任务删除"); taskProcessRecord.setLabel("将" +resultTask.getName() + "任务删除");
taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord); taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
//修改总进度 //修改总进度
ResultDetail resultDetail = resultDetailService.selectResultDetailById(resultTask.getDetailId());
resultDetail.setProcessRate(BigDecimal.valueOf(caclateResultDetailProcess(resultTask.getDetailId()))); resultDetail.setProcessRate(BigDecimal.valueOf(caclateResultDetailProcess(resultTask.getDetailId())));
resultDetailService.updateResultDetailById(resultDetail); resultDetailService.updateResultDetailById(resultDetail);
return R.ok();
} }
@Override @Override