diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 3fc77f65..4f513ef3 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -696,7 +696,6 @@ public class DingtalkBusiness { m++; } } - return "OK"; } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index 33ab6f1b..fe99d0fb 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -44,7 +44,7 @@ public class ResultTaskController { @PostMapping("/result/changeTask") - @ApiOperation("任务修改") + @ApiOperation("任务新增或修改") @ApiResponses({@ApiResponse(code = 200,message = "成功")}) public R changeTask(@RequestBody ResultUpdateTaskReq req){ int i = resultTaskService.saveOrUpdateResultTask(req); diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 6d8c1923..13b02ae7 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -31,13 +31,13 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordById(@Param("id") Long id); - List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId); + List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId,@Param("useType") int useType); int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); - List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds); + List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") int useType); List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java index a27cf643..ef88ac54 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -35,7 +35,10 @@ public class ResultTaskDto { //姓名 @ApiModelProperty(value = "姓名", name = "staffName") private String staffName; - //标签 + /* //标签 @ApiModelProperty(value = "标签", name = "label") - private String label; + private String label;*/ + //标签 + @ApiModelProperty(value = "类型", name = "描述") + private String typeDesc; } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java index caa598b3..22b05175 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -31,4 +31,7 @@ public class TaskProcessRecordDto { @ApiModelProperty(value = "头像", name = "avatar") private String avatar; + //标签 + @ApiModelProperty(value = "类型", name = "描述") + private String typeDesc; } diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java index 8a50ea22..455106f5 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -20,4 +20,7 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="详情id（二选一）",name = "detailId") private Long detailId; + + @ApiModelProperty(value="0:不包含评论，1包含评论",name = "type") + private int useType; } diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 83b9e5db..38eb67af 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -111,8 +111,9 @@ public class ResultTaskServiceImpl extends ServiceImpl { TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); if(taskProcessRecordDto != null){ + //resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); - Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setLabel(byType.getDesc())); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc())); if(finalStaffEntity !=null){ resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); resultTaskDto.setStaffName(finalStaffEntity.getName()); diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 48a09143..5327af7b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -19,7 +19,6 @@ import com.lz.modules.sys.service.app.ResultDetailService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import sun.jvm.hotspot.oops.TypeArrayKlass; import java.util.List; import java.util.Optional; @@ -97,14 +96,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( - page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect) + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect,req.getUseType()) ); } } else { pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( - page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId(),req.getUseType()) ); } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 920320d0..66ddb0d8 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -129,7 +129,7 @@ @@ -142,9 +142,8 @@