|
|
|
@ -560,19 +560,6 @@ public class TaskController {
|
|
|
|
|
return Result.success(res);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
|
static class TaskDataParam {
|
|
|
|
|
@NotNull(message = "id不能为空")
|
|
|
|
|
@Min(value = 1, message = "id最小值为1")
|
|
|
|
|
@Schema(title = "任务id")
|
|
|
|
|
private Integer id;
|
|
|
|
|
@Schema(title = "用户名称")
|
|
|
|
|
private String userName;
|
|
|
|
|
@Schema(title = "部门名称")
|
|
|
|
|
private String departmentName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Operation(summary = "任务传播数据")
|
|
|
|
|
@PostMapping("taskEffect")
|
|
|
|
|
@AdminTokenValid
|
|
|
|
@ -595,6 +582,20 @@ public class TaskController {
|
|
|
|
|
return Result.success(map);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
|
static class TaskDataParam {
|
|
|
|
|
private Integer pageNum;
|
|
|
|
|
private Integer pageSize;
|
|
|
|
|
@NotNull(message = "id不能为空")
|
|
|
|
|
@Min(value = 1, message = "id最小值为1")
|
|
|
|
|
@Schema(title = "任务id")
|
|
|
|
|
private Integer id;
|
|
|
|
|
@Schema(title = "用户名称")
|
|
|
|
|
private String userName;
|
|
|
|
|
@Schema(title = "部门名称")
|
|
|
|
|
private String departmentName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Operation(summary = "任务传播数据")
|
|
|
|
|
@PostMapping("taskEffectData")
|
|
|
|
|
@AdminTokenValid
|
|
|
|
@ -603,7 +604,7 @@ public class TaskController {
|
|
|
|
|
qw.eq("t2.id", param.getId()).groupBy("t1.userId");
|
|
|
|
|
qw.like(param.getUserName() != null, "t3.name", param.getUserName());
|
|
|
|
|
qw.like(param.getDepartmentName() != null, "t4.name", param.getDepartmentName());
|
|
|
|
|
return Result.success( taskService.taskEffectData(qw));
|
|
|
|
|
return Result.success( taskService.taskEffectDataPage(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),qw));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
|