|
|
|
|
@ -1,23 +1,46 @@
|
|
|
|
|
package org.dromara.oa.erp.service.impl;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.github.yulichang.toolkit.JoinWrappers;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
|
|
import org.apache.seata.spring.annotation.GlobalTransactional;
|
|
|
|
|
import org.dromara.common.core.enums.BusinessStatusEnum;
|
|
|
|
|
import org.dromara.common.core.enums.OAStatusEnum;
|
|
|
|
|
import org.dromara.common.core.exception.ServiceException;
|
|
|
|
|
import org.dromara.common.core.utils.MapstructUtils;
|
|
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
import org.dromara.common.tenant.helper.TenantHelper;
|
|
|
|
|
import org.dromara.oa.erp.domain.ErpContractInfo;
|
|
|
|
|
import org.dromara.oa.erp.domain.ErpProjectReport;
|
|
|
|
|
import org.dromara.oa.erp.domain.ErpProjectReportDetail;
|
|
|
|
|
import org.dromara.oa.erp.domain.bo.ErpContractInfoBo;
|
|
|
|
|
import org.dromara.oa.erp.domain.bo.ErpProjectReportBo;
|
|
|
|
|
import org.dromara.oa.erp.domain.bo.ErpProjectReportDetailBo;
|
|
|
|
|
import org.dromara.oa.erp.domain.bo.ProjectReportAndDetailWrapperBo;
|
|
|
|
|
import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
|
|
|
|
|
import org.dromara.oa.erp.domain.vo.ErpProjectReportDetailVo;
|
|
|
|
|
import org.dromara.oa.erp.domain.vo.ErpProjectReportVo;
|
|
|
|
|
import org.dromara.oa.erp.mapper.ErpProjectReportDetailMapper;
|
|
|
|
|
import org.dromara.oa.erp.mapper.ErpProjectReportMapper;
|
|
|
|
|
import org.dromara.oa.erp.service.IErpProjectReportDetailService;
|
|
|
|
|
import org.dromara.oa.erp.service.IErpProjectReportService;
|
|
|
|
|
import org.dromara.workflow.api.RemoteWorkflowService;
|
|
|
|
|
import org.dromara.workflow.api.domain.RemoteStartProcess;
|
|
|
|
|
import org.dromara.workflow.api.event.ProcessEvent;
|
|
|
|
|
import org.springframework.context.event.EventListener;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 项目周报明细Service业务层处理
|
|
|
|
|
@ -27,10 +50,17 @@ import java.util.Map;
|
|
|
|
|
*/
|
|
|
|
|
@RequiredArgsConstructor
|
|
|
|
|
@Service
|
|
|
|
|
@Slf4j
|
|
|
|
|
public class ErpProjectReportDetailServiceImpl implements IErpProjectReportDetailService {
|
|
|
|
|
|
|
|
|
|
private final IErpProjectReportService erpProjectReportService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final ErpProjectReportDetailMapper baseMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@DubboReference(timeout = 30000)
|
|
|
|
|
private RemoteWorkflowService remoteWorkflowService;
|
|
|
|
|
/**
|
|
|
|
|
* 查询项目周报明细
|
|
|
|
|
*
|
|
|
|
|
@ -146,4 +176,77 @@ public class ErpProjectReportDetailServiceImpl implements IErpProjectReportDetai
|
|
|
|
|
}
|
|
|
|
|
return baseMapper.deleteByIds(ids) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 提交项目周报信息并提交流程
|
|
|
|
|
* @param projectReport
|
|
|
|
|
* @param projectDetailReport
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public ErpProjectReportDetailVo projectReportSubmitAndFlowStart(ErpProjectReportBo projectReport, ErpProjectReportDetailBo projectDetailReport) {
|
|
|
|
|
if (projectReport.getReportId() != null) {
|
|
|
|
|
ErpProjectReportVo existingReport = erpProjectReportService.queryById(projectReport.getReportId());
|
|
|
|
|
if (existingReport != null) {
|
|
|
|
|
erpProjectReportService.updateByBo(projectReport);
|
|
|
|
|
} else {
|
|
|
|
|
erpProjectReportService.insertByBo(projectReport);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
erpProjectReportService.insertByBo(projectReport);
|
|
|
|
|
}
|
|
|
|
|
ErpProjectReportDetail erpProjectReportDetail = MapstructUtils.convert(projectDetailReport, ErpProjectReportDetail.class);
|
|
|
|
|
validEntityBeforeSave(erpProjectReportDetail);
|
|
|
|
|
if (StringUtils.isNull(projectDetailReport.getReportDetailId())) {
|
|
|
|
|
this.insertByBo(projectDetailReport);
|
|
|
|
|
} else {
|
|
|
|
|
this.updateByBo(projectDetailReport);
|
|
|
|
|
}
|
|
|
|
|
// 后端发起需要忽略权限
|
|
|
|
|
projectDetailReport.getVariables().put("ignore", true);
|
|
|
|
|
RemoteStartProcess startProcess = new RemoteStartProcess();
|
|
|
|
|
startProcess.setBusinessId(projectDetailReport.getReportDetailId().toString());
|
|
|
|
|
startProcess.setFlowCode(projectDetailReport.getFlowCode());
|
|
|
|
|
startProcess.setVariables(projectDetailReport.getVariables());
|
|
|
|
|
startProcess.setBizExt(projectDetailReport.getBizExt());
|
|
|
|
|
projectDetailReport.getBizExt().setBusinessId(startProcess.getBusinessId());
|
|
|
|
|
boolean flagOne = remoteWorkflowService.startCompleteTask(startProcess);
|
|
|
|
|
if (!flagOne) {
|
|
|
|
|
throw new ServiceException("流程发起异常");
|
|
|
|
|
}
|
|
|
|
|
return MapstructUtils.convert(erpProjectReportDetail, ErpProjectReportDetailVo.class);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成等)
|
|
|
|
|
*
|
|
|
|
|
* @param processEvent 参数
|
|
|
|
|
*/
|
|
|
|
|
@EventListener(condition = "#processEvent.flowCode =='XMZB'")
|
|
|
|
|
public void processHandler(ProcessEvent processEvent) {
|
|
|
|
|
TenantHelper.dynamic(processEvent.getTenantId(), () -> {
|
|
|
|
|
log.info("当前任务执行了{}", processEvent.toString());
|
|
|
|
|
ErpProjectReportDetail projectReportDetail = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
|
|
|
|
|
projectReportDetail.setFlowStatus(processEvent.getStatus());
|
|
|
|
|
Map<String, Object> params = processEvent.getParams();
|
|
|
|
|
if (MapUtil.isNotEmpty(params)) {
|
|
|
|
|
// 办理人
|
|
|
|
|
String handler = Convert.toStr(params.get("handler"));
|
|
|
|
|
}
|
|
|
|
|
if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.WAITING.getStatus())) {
|
|
|
|
|
projectReportDetail.setProjectReportStatus(OAStatusEnum.APPROVING.getStatus());
|
|
|
|
|
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) {
|
|
|
|
|
projectReportDetail.setProjectReportStatus(OAStatusEnum.COMPLETED.getStatus());
|
|
|
|
|
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())
|
|
|
|
|
|| Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) {
|
|
|
|
|
projectReportDetail.setProjectReportStatus(OAStatusEnum.INVALID.getStatus());
|
|
|
|
|
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())
|
|
|
|
|
|| Objects.equals(processEvent.getStatus(), BusinessStatusEnum.CANCEL.getStatus())) {
|
|
|
|
|
projectReportDetail.setProjectReportStatus(OAStatusEnum.DRAFT.getStatus());
|
|
|
|
|
}
|
|
|
|
|
baseMapper.updateById(projectReportDetail);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
lh
2 weeks ago