diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 95f5633f..dbd02b6f 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -752,6 +752,7 @@ public class ResultRecordController extends AbstractController { @PostMapping("/saveDetail") @ApiOperation("保存绩效详情-吴林") public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) { + Long userId = getUserId(); ResultRecord resultRecord = new ResultRecord(); BeanUtils.copyProperties(dto, resultRecord); resultRecord.setAllScore(resultRecord.getLastScore()); @@ -874,7 +875,7 @@ public class ResultRecordController extends AbstractController { taskReq.setName(taskDto.getName()); taskReq.setOrderBy(orderBy); taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate())); - resultTaskService.saveOrUpdateResultTask(taskReq); + resultTaskService.saveOrUpdateResultTask(taskReq,userId); orderBy++; } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index fe99d0fb..6af16f55 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -9,6 +9,7 @@ import com.lz.modules.performance.req.ResultUpdateTaskReq; import com.lz.modules.performance.res.ResultTaskDetailRes; import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.performance.service.TaskProcessRecordService; +import com.lz.modules.sys.controller.AbstractController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/performance") @Slf4j @Api(value="绩效任务接口", tags={"绩效任务"}) -public class ResultTaskController { +public class ResultTaskController extends AbstractController{ @Autowired private ResultTaskService resultTaskService; @@ -47,11 +48,8 @@ public class ResultTaskController { @ApiOperation("任务新增或修改") @ApiResponses({@ApiResponse(code = 200,message = "成功")}) public R changeTask(@RequestBody ResultUpdateTaskReq req){ - int i = resultTaskService.saveOrUpdateResultTask(req); - if(i>0){ - return R.ok(); - } - return R.error(); + Long userId = getUserId(); + return resultTaskService.saveOrUpdateResultTask(req,userId); } diff --git a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java index ff9d59e8..566990e9 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -1,6 +1,7 @@ package com.lz.modules.performance.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.common.utils.R; import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.req.ResultUpdateTaskReq; @@ -36,7 +37,7 @@ public interface ResultTaskService extends IService { ResultTaskDetailRes taskDetail(Long detailId); - int saveOrUpdateResultTask(ResultUpdateTaskReq req); + R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId); diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index f26d4217..b2f18d98 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.BigDecimalUtil; +import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; @@ -124,23 +125,28 @@ public class ResultTaskServiceImpl extends ServiceImpl