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-11 15:38:43 +08:00
parent a627dbb971
commit 1ff27fe078
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java
View File

@ -35,6 +35,8 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
List<ResultTaskDto> selectResultTaskDtosByDetailId(@Param("detailId") Long detailId); List<ResultTaskDto> selectResultTaskDtosByDetailId(@Param("detailId") Long detailId);
List<ResultTaskDto> selectAllResultTaskDtosByDetailId(@Param("detailId") Long detailId);
List<ResultTask> selectResultTasksByDetailId(@Param("detailId") Long detailId); List<ResultTask> selectResultTasksByDetailId(@Param("detailId") Long detailId);
int deleteResultTasksByDetailId(Long detailId); int deleteResultTasksByDetailId(Long detailId);

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

@ -189,7 +189,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
if(before == null){ if(before == null){
taskProcessRecord.setType(ProcessRecordEnum.ADD.getType()); taskProcessRecord.setType(ProcessRecordEnum.ADD.getType());
taskProcessRecord.setDetailId(after.getDetailId()); taskProcessRecord.setDetailId(after.getDetailId());
taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100)).setScale(2) + "%"); taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + ";进度：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100)).setScale(2) + "%");
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue(); return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
} }
taskProcessRecord.setTaskId(before.getId()); taskProcessRecord.setTaskId(before.getId());

5
src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.lz.modules.app.entity.StaffOccupationEntity;
import com.lz.modules.app.model.TaskModel; import com.lz.modules.app.model.TaskModel;
import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.app.service.StaffOccupationService;
import com.lz.modules.app.service.StaffService; import com.lz.modules.app.service.StaffService;
import com.lz.modules.performance.dao.ResultTaskMapper;
import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.dao.TaskProcessRecordMapper;
import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.dto.ResultTaskDto;
import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.dto.TaskProcessRecordDto;
@ -57,6 +58,8 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
private StaffService staffService; private StaffService staffService;
@Autowired @Autowired
private StaffOccupationService staffOccupationService; private StaffOccupationService staffOccupationService;
@Autowired
private ResultTaskMapper resultTaskMapper;
@ -99,7 +102,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
Long detailId = req.getDetailId(); Long detailId = req.getDetailId();
PageUtils pageUtils = new PageUtils(); PageUtils pageUtils = new PageUtils();
if(detailId!=null){ if(detailId!=null){
List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(detailId); List<ResultTaskDto> resultTaskDtos = resultTaskMapper.selectAllResultTaskDtosByDetailId(detailId);
if(CollectionUtils.isNotEmpty(resultTaskDtos)){ if(CollectionUtils.isNotEmpty(resultTaskDtos)){
List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList());
pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(

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

@ -95,5 +95,9 @@
<select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" > <select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0 select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0
</select> </select>
<select id="selectAllResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId}
</select>
</mapper> </mapper>