|
|
@@ -35,6 +35,9 @@ import com.xjrsoft.module.base.service.IBaseClassService;
|
|
|
import com.xjrsoft.module.base.service.IBaseGradeService;
|
|
|
import com.xjrsoft.module.base.service.IWhitelistManagementService;
|
|
|
import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
|
+import com.xjrsoft.module.oa.dto.OfficialDocumentReceivedHandlePageDto;
|
|
|
+import com.xjrsoft.module.oa.service.IOfficialDocumentReceivedHandleService;
|
|
|
+import com.xjrsoft.module.oa.vo.OfficialDocumentReceivedHandlePageVo;
|
|
|
import com.xjrsoft.module.organization.dto.*;
|
|
|
import com.xjrsoft.module.organization.entity.*;
|
|
|
import com.xjrsoft.module.organization.service.*;
|
|
|
@@ -125,6 +128,7 @@ public class UserController {
|
|
|
private final IBaseNewStudentService baseNewStudentService;
|
|
|
|
|
|
private final IWorkflowExtraService workflowExtraService;
|
|
|
+ private final IOfficialDocumentReceivedHandleService documentReceivedHandleService;
|
|
|
|
|
|
@GetMapping(value = "/list")
|
|
|
@ApiOperation(value = "用户列表(不分页)")
|
|
|
@@ -462,6 +466,14 @@ public class UserController {
|
|
|
.leftJoin(WorkflowSchema.class, WorkflowSchema::getId, WorkflowCirculated::getSchemaId)
|
|
|
);
|
|
|
pendingCountDto.setCirculatedCount(circulatedCount);
|
|
|
+
|
|
|
+ //增加查询收文承办数量
|
|
|
+ OfficialDocumentReceivedHandlePageDto dto = new OfficialDocumentReceivedHandlePageDto();
|
|
|
+ dto.setLoginUserId(StpUtil.getLoginIdAsLong());
|
|
|
+ dto.setIsHandle(0);
|
|
|
+ Page<OfficialDocumentReceivedHandlePageVo> page = documentReceivedHandleService.getPage(new Page<>(1, 15), dto);
|
|
|
+ pendingCountDto.setDocumentReceivedHandleCount(page.getTotal());
|
|
|
+
|
|
|
return RT.ok(pendingCountDto);
|
|
|
}
|
|
|
|