|
|
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/performanceApply")
|
|
|
@@ -122,7 +123,10 @@ public class PerformanceApplyController extends BaseController {
|
|
|
@ApiOperation("获取当前活动列表")
|
|
|
@PostMapping("/relatedByPer")
|
|
|
public List<PerformanceApply> relatedByPer(@RequestParam Long performanceId) {
|
|
|
- return performanceApplyRepo.findAllByStatusAndPerformanceId(ApplyStatus.PASS, performanceId);
|
|
|
+ return performanceApplyRepo.findAllByStatusAndPerformanceId(ApplyStatus.PASS, performanceId)
|
|
|
+ .stream()
|
|
|
+ .filter(apply -> ObjectUtil.isNotNull(apply.getSignInAt()) && ObjectUtil.isNotNull(apply.getSignInBy()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
}
|
|
|
}
|
|
|
|
