|
@@ -10,10 +10,13 @@ import com.usky.common.core.exception.BusinessException;
|
|
|
import com.usky.common.security.utils.SecurityUtils;
|
|
|
import com.usky.oa.domain.OaApproval;
|
|
|
import com.usky.oa.domain.OaDocument;
|
|
|
+import com.usky.oa.domain.OaFormDefinition;
|
|
|
import com.usky.oa.mapper.OaApprovalMapper;
|
|
|
import com.usky.oa.mapper.OaDocumentMapper;
|
|
|
+import com.usky.oa.mapper.OaFormDefinitionMapper;
|
|
|
import com.usky.oa.service.OaApprovalService;
|
|
|
import com.usky.common.mybatis.core.AbstractCrudService;
|
|
|
+import com.usky.oa.service.utils.OaProcessAnalysis;
|
|
|
import com.usky.oa.service.utils.OaSendMessageCenter;
|
|
|
import com.usky.oa.service.vo.OaApprovalCountVO;
|
|
|
import com.usky.system.domain.SysUser;
|
|
@@ -51,6 +54,12 @@ public class OaApprovalServiceImpl extends AbstractCrudService<OaApprovalMapper,
|
|
|
@Autowired
|
|
|
private OaSendMessageCenter oaSendMessageCenter;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private OaProcessAnalysis oaProcessAnalysis;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private OaFormDefinitionMapper oaFormDefinitionMapper;
|
|
|
+
|
|
|
|
|
|
// 我的申请-待处理、已处理、我发起、我收到-统计(暂时统计近一年数据)
|
|
|
@Override
|
|
@@ -154,6 +163,14 @@ public class OaApprovalServiceImpl extends AbstractCrudService<OaApprovalMapper,
|
|
|
oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), Long.valueOf(oaApproval.getProposer()), oaApproval.getId(), receivers, isPass);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void analysisTest(Integer id) {
|
|
|
+ LambdaQueryWrapper<OaFormDefinition> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper.eq(OaFormDefinition::getId, id);
|
|
|
+ String flowInfo = oaFormDefinitionMapper.selectOne(queryWrapper).getFlowInfo();
|
|
|
+ oaProcessAnalysis.processAnalysis(flowInfo);
|
|
|
+ }
|
|
|
+
|
|
|
// 待处理
|
|
|
private List<OaApproval> getPendingSum(Integer tenantId, Long userId, LocalDateTime oneYearAgo, LocalDateTime now) {
|
|
|
LambdaQueryWrapper<OaApproval> queryWrapper = Wrappers.lambdaQuery();
|