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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-12-09 18:33:12 +08:00
commit 1f2d90857a
5 changed files with 11 additions and 3 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

@ -562,7 +562,8 @@ public class ResultRecordController extends AbstractController {
) {
//下面设置计算公式
dto.setCalculate(setCalculateValue(calculateModels1, dto)) ;
List<ResultTask> resultTasks = resultTaskService.selectResultTasksByDetailId(dto.getId());
List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(dto.getId());
dto.setTaskDtos(resultTaskDtos);
weight = weight.add(dto.getCheckWeight());
if(scoreDtos.size() > 0){
//获取评分详细

1
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -646,6 +646,7 @@ public class DingtalkBusiness {
}
public String sendTaskNoticeMsg(Long detailId, Long taskId) {
return "OK";
}
public String sendNoticeMsg(ResultRecord lzResultRecord, List<StaffEntity> staffs) {

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

@ -44,4 +44,5 @@ public interface ResultTaskService extends IService<ResultTask> {
List<ResultTask> selectResultTasksByDetailId(Long detailId);
void deleteTask(Long taskId);
List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId);
}

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

@ -150,7 +150,6 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
//记录变更记录
private int changeTaskProcess(ResultTask before,ResultUpdateTaskReq after){
TaskProcessRecord taskProcessRecord = new TaskProcessRecord();
taskProcessRecord.setTaskId(before.getId());
BeanUtils.copyProperties(after,taskProcessRecord);
//新增操作
if(before == null){
@ -158,6 +157,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + after.getProcessRate());
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
}
taskProcessRecord.setTaskId(before.getId());
//判断修改了名称或进度
if(before.getName().equals(after.getName())){
if(before.getProcessRate().equals(after.getProcessRate())){
@ -206,4 +206,9 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
taskProcessRecord.setLabel("将" +resultTask.getName() + "任务删除");
taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
}
@Override
public List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId){
return resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
}
}

2
src/main/resources/mapper/performance/ResultTaskMapper.xml
View File

@ -93,7 +93,7 @@
</update>
<select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
select name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
</select>
</mapper>