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:29:54 +08:00
parent 05b2a3b666
commit 97b6110373
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -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++;
}

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

@ -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);
}

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

@ -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<ResultTask> {
ResultTaskDetailRes taskDetail(Long detailId);
int saveOrUpdateResultTask(ResultUpdateTaskReq req);
R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId);

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

@ -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<ResultTaskMapper, ResultT
}
@Override
public int saveOrUpdateResultTask(ResultUpdateTaskReq req) {
public R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId) {
Long tasklId = req.getTaskId();
Long detailId = req.getDetailId();
if(tasklId == null && detailId == null){
log.error("任务保存或更新失败：tasklId, detailId都为空");
return -1;
return R.error();
}
ResultTask resultTask;
if(tasklId == null){
log.info("绩效任务新增操作。。。");
ResultDetail resultDetail = resultDetailService.selectResultDetailById(req.getDetailId());
if(!userId.equals(resultDetail.getStaffId())){
log.info("非本人任务不能添加");
return R.error("非本人任务不能添加");
}
resultTask = new ResultTask();
BeanUtils.copyProperties(req,resultTask);
resultTask.setDetailId(detailId);
resultTaskMapper.insertResultTask(resultTask);
//将插入的id传递过去
req.setTaskId(resultTask.getId());
int i = changeTaskProcess(null, req,null);
changeTaskProcess(null, req,null);
}
else {
@ -163,7 +169,8 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
}
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
resultDetail.setProcessRate(BigDecimal.valueOf(caclateResultDetailProcess(detailId)));
return resultDetailService.updateResultDetailById(resultDetail);
resultDetailService.updateResultDetailById(resultDetail);
return R.ok();
}