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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-12-10 10:24:26 +08:00
commit fb1e6480e7
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
View File

@ -40,4 +40,7 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId);
TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId);
List<TaskProcessRecordDto> selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List<Long> taskIds);
}

5
src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java
View File

@ -15,6 +15,9 @@ import lombok.Data;
@ApiModel("任务变更记录")
public class ChangeTaskListReq extends BasePage {
@ApiModelProperty(value="任务id",name = "taskId")
@ApiModelProperty(value="任务id（二选一）",name = "taskId")
private Long taskId;
@ApiModelProperty(value="详情id（二选一）",name = "detailId")
private Long detailId;
}

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

@ -5,6 +5,7 @@ import com.lz.common.utils.PageUtils;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.service.StaffService;
import com.lz.modules.performance.dao.TaskProcessRecordMapper;
import com.lz.modules.performance.dto.ResultTaskDto;
import com.lz.modules.performance.dto.TaskProcessRecordDto;
import com.lz.modules.performance.entity.ResultTask;
import com.lz.modules.performance.entity.TaskProcessRecord;
@ -18,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* <p>
@ -81,9 +84,23 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
@Override
public PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req) {
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId())
);
PageUtils pageUtils = new PageUtils();
if(req.getDetailId()!=null){
List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId());
if(CollectionUtils.isNotEmpty(resultTaskDtos)){
List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList());
pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect)
);
}
}
else {
pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId())
);
}
List list = pageUtils.getList();
if(CollectionUtils.isNotEmpty(list)){
Long taskId = req.getTaskId();

10
src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
View File

@ -107,5 +107,15 @@
</select>
<select id="selectTaskProcessRecordsByTaskIds" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
select gmt_create,remark,label,type from lz_task_process_record where is_delete = 0
and
task_id in
<foreach collection="taskIds" item="taskId"separator="," open="(" close=")">
#{taskId}
</foreach>
order by gmt_create desc
</select>
</mapper>