|
|
|
|
@ -18,7 +18,6 @@ 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.satoken.utils.LoginHelper;
|
|
|
|
|
import org.dromara.common.tenant.helper.TenantHelper;
|
|
|
|
|
import org.dromara.oa.erp.constant.ProjectCategoryConstant;
|
|
|
|
|
import org.dromara.oa.erp.domain.ErpProjectContracts;
|
|
|
|
|
@ -291,6 +290,10 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
|
|
|
|
|
TenantHelper.dynamic(processEvent.getTenantId(), () -> {
|
|
|
|
|
log.info("当前任务执行了{}", processEvent.toString());
|
|
|
|
|
ErpProjectInfo projectInfo = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
|
|
|
|
|
if (projectInfo == null) {
|
|
|
|
|
log.warn("项目不存在,businessId: {}", processEvent.getBusinessId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
projectInfo.setFlowStatus(processEvent.getStatus());
|
|
|
|
|
Map<String, Object> params = processEvent.getParams();
|
|
|
|
|
if (MapUtil.isNotEmpty(params)) {
|
|
|
|
|
@ -408,9 +411,10 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
|
|
|
|
|
draft.setDetails(buildShippingDraftDetails(contractInfo.getContractMaterialList()));
|
|
|
|
|
|
|
|
|
|
//显示填充租户、创建人、创建时间
|
|
|
|
|
draft.setTenantId(TenantHelper.getTenantId());
|
|
|
|
|
draft.setCreateBy(LoginHelper.getUserId());
|
|
|
|
|
draft.setTenantId(projectInfo.getTenantId());
|
|
|
|
|
draft.setCreateBy(projectInfo.getCreateBy());
|
|
|
|
|
draft.setCreateTime(new Date());
|
|
|
|
|
draft.setCreateDept(projectInfo.getDeptId());
|
|
|
|
|
|
|
|
|
|
return draft;
|
|
|
|
|
}
|
|
|
|
|
|