|
@@ -616,22 +616,12 @@ public class DeptAssessmentDeclarationController {
|
|
|
*/
|
|
|
@GetMapping(value = "/participantsNumber/{id}")
|
|
|
public R participantsNumber(@PathVariable String id) {
|
|
|
- /*QueryWrapper<DeptAssessmentDeclarationComplete> qwComplete = new QueryWrapper<>();
|
|
|
+ QueryWrapper<DeptAssessmentDeclarationContent> qwContent = new QueryWrapper<>();
|
|
|
if (StringUtils.isNotEmpty(id)) {
|
|
|
- qwComplete.lambda().eq(DeptAssessmentDeclarationComplete::getAssessmentDeclarationId, id);
|
|
|
+ qwContent.lambda().eq(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, id);
|
|
|
}
|
|
|
- int countComplete = deptAssessmentDeclarationCompleteService.list(qwComplete).size();
|
|
|
- if (countComplete > 0) {
|
|
|
- QueryWrapper<DeptAssessmentDeclarationContent> qwContent = new QueryWrapper<>();
|
|
|
- if (StringUtils.isNotEmpty(id)) {
|
|
|
- qwContent.lambda().eq(DeptAssessmentDeclarationContent::getAssessmentDeclarationId, id);
|
|
|
- }
|
|
|
- int countContent = deptAssessmentDeclarationContentService.list(qwContent).size();
|
|
|
- return R.ok().data(countContent);
|
|
|
- } else {
|
|
|
- return R.error("未添加工作完成情况!");
|
|
|
- }*/
|
|
|
- return R.ok();
|
|
|
+ int countContent = deptAssessmentDeclarationContentService.list(qwContent).size();
|
|
|
+ return R.ok().data(countContent);
|
|
|
}
|
|
|
|
|
|
/**
|