fix
This commit is contained in:
parent
05b2a3b666
commit
97b6110373
@ -752,6 +752,7 @@ public class ResultRecordController extends AbstractController {
|
|||||||
@PostMapping("/saveDetail")
|
@PostMapping("/saveDetail")
|
||||||
@ApiOperation("保存绩效详情-吴林")
|
@ApiOperation("保存绩效详情-吴林")
|
||||||
public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) {
|
public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) {
|
||||||
|
Long userId = getUserId();
|
||||||
ResultRecord resultRecord = new ResultRecord();
|
ResultRecord resultRecord = new ResultRecord();
|
||||||
BeanUtils.copyProperties(dto, resultRecord);
|
BeanUtils.copyProperties(dto, resultRecord);
|
||||||
resultRecord.setAllScore(resultRecord.getLastScore());
|
resultRecord.setAllScore(resultRecord.getLastScore());
|
||||||
@ -874,7 +875,7 @@ public class ResultRecordController extends AbstractController {
|
|||||||
taskReq.setName(taskDto.getName());
|
taskReq.setName(taskDto.getName());
|
||||||
taskReq.setOrderBy(orderBy);
|
taskReq.setOrderBy(orderBy);
|
||||||
taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate()));
|
taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate()));
|
||||||
resultTaskService.saveOrUpdateResultTask(taskReq);
|
resultTaskService.saveOrUpdateResultTask(taskReq,userId);
|
||||||
orderBy++;
|
orderBy++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.lz.modules.performance.req.ResultUpdateTaskReq;
|
|||||||
import com.lz.modules.performance.res.ResultTaskDetailRes;
|
import com.lz.modules.performance.res.ResultTaskDetailRes;
|
||||||
import com.lz.modules.performance.service.ResultTaskService;
|
import com.lz.modules.performance.service.ResultTaskService;
|
||||||
import com.lz.modules.performance.service.TaskProcessRecordService;
|
import com.lz.modules.performance.service.TaskProcessRecordService;
|
||||||
|
import com.lz.modules.sys.controller.AbstractController;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import io.swagger.annotations.ApiResponse;
|
import io.swagger.annotations.ApiResponse;
|
||||||
@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
@RequestMapping("/performance")
|
@RequestMapping("/performance")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Api(value="绩效任务接口", tags={"绩效任务"})
|
@Api(value="绩效任务接口", tags={"绩效任务"})
|
||||||
public class ResultTaskController {
|
public class ResultTaskController extends AbstractController{
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ResultTaskService resultTaskService;
|
private ResultTaskService resultTaskService;
|
||||||
@ -47,11 +48,8 @@ public class ResultTaskController {
|
|||||||
@ApiOperation("任务新增或修改")
|
@ApiOperation("任务新增或修改")
|
||||||
@ApiResponses({@ApiResponse(code = 200,message = "成功")})
|
@ApiResponses({@ApiResponse(code = 200,message = "成功")})
|
||||||
public R changeTask(@RequestBody ResultUpdateTaskReq req){
|
public R changeTask(@RequestBody ResultUpdateTaskReq req){
|
||||||
int i = resultTaskService.saveOrUpdateResultTask(req);
|
Long userId = getUserId();
|
||||||
if(i>0){
|
return resultTaskService.saveOrUpdateResultTask(req,userId);
|
||||||
return R.ok();
|
|
||||||
}
|
|
||||||
return R.error();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package com.lz.modules.performance.service;
|
package com.lz.modules.performance.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
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.dto.ResultTaskDto;
|
||||||
import com.lz.modules.performance.entity.ResultTask;
|
import com.lz.modules.performance.entity.ResultTask;
|
||||||
import com.lz.modules.performance.req.ResultUpdateTaskReq;
|
import com.lz.modules.performance.req.ResultUpdateTaskReq;
|
||||||
@ -36,7 +37,7 @@ public interface ResultTaskService extends IService<ResultTask> {
|
|||||||
|
|
||||||
ResultTaskDetailRes taskDetail(Long detailId);
|
ResultTaskDetailRes taskDetail(Long detailId);
|
||||||
|
|
||||||
int saveOrUpdateResultTask(ResultUpdateTaskReq req);
|
R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.lz.common.utils.BigDecimalUtil;
|
import com.lz.common.utils.BigDecimalUtil;
|
||||||
|
import com.lz.common.utils.R;
|
||||||
import com.lz.common.utils.StringUtil;
|
import com.lz.common.utils.StringUtil;
|
||||||
import com.lz.modules.app.entity.StaffEntity;
|
import com.lz.modules.app.entity.StaffEntity;
|
||||||
import com.lz.modules.app.service.StaffService;
|
import com.lz.modules.app.service.StaffService;
|
||||||
@ -124,23 +125,28 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int saveOrUpdateResultTask(ResultUpdateTaskReq req) {
|
public R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId) {
|
||||||
Long tasklId = req.getTaskId();
|
Long tasklId = req.getTaskId();
|
||||||
Long detailId = req.getDetailId();
|
Long detailId = req.getDetailId();
|
||||||
if(tasklId == null && detailId == null){
|
if(tasklId == null && detailId == null){
|
||||||
log.error("任务保存或更新失败:tasklId, detailId都为空");
|
log.error("任务保存或更新失败:tasklId, detailId都为空");
|
||||||
return -1;
|
return R.error();
|
||||||
}
|
}
|
||||||
ResultTask resultTask;
|
ResultTask resultTask;
|
||||||
if(tasklId == null){
|
if(tasklId == null){
|
||||||
log.info("绩效任务新增操作。。。");
|
log.info("绩效任务新增操作。。。");
|
||||||
|
ResultDetail resultDetail = resultDetailService.selectResultDetailById(req.getDetailId());
|
||||||
|
if(!userId.equals(resultDetail.getStaffId())){
|
||||||
|
log.info("非本人任务不能添加");
|
||||||
|
return R.error("非本人任务不能添加");
|
||||||
|
}
|
||||||
resultTask = new ResultTask();
|
resultTask = new ResultTask();
|
||||||
BeanUtils.copyProperties(req,resultTask);
|
BeanUtils.copyProperties(req,resultTask);
|
||||||
resultTask.setDetailId(detailId);
|
resultTask.setDetailId(detailId);
|
||||||
resultTaskMapper.insertResultTask(resultTask);
|
resultTaskMapper.insertResultTask(resultTask);
|
||||||
//将插入的id传递过去
|
//将插入的id传递过去
|
||||||
req.setTaskId(resultTask.getId());
|
req.setTaskId(resultTask.getId());
|
||||||
int i = changeTaskProcess(null, req,null);
|
changeTaskProcess(null, req,null);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
@ -163,7 +169,8 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
|
|||||||
}
|
}
|
||||||
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
|
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
|
||||||
resultDetail.setProcessRate(BigDecimal.valueOf(caclateResultDetailProcess(detailId)));
|
resultDetail.setProcessRate(BigDecimal.valueOf(caclateResultDetailProcess(detailId)));
|
||||||
return resultDetailService.updateResultDetailById(resultDetail);
|
resultDetailService.updateResultDetailById(resultDetail);
|
||||||
|
return R.ok();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user