|
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa.stamp;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import cn.iocoder.yudao.framework.common.enums.InfoSourceEnum;
|
|
|
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
@@ -18,10 +19,12 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveR
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.stamp.OaStampDO;
|
|
|
+import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampinfo.OaStampInfoDO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.mysql.oa.stamp.OaStampMapper;
|
|
|
import cn.iocoder.yudao.module.bpm.enums.DictDataConstants;
|
|
|
import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants;
|
|
|
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmConstants;
|
|
|
+import cn.iocoder.yudao.module.bpm.service.stamp.stampinfo.OaStampInfoService;
|
|
|
import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
|
|
|
import cn.iocoder.yudao.module.employee.api.EmployeeApi;
|
|
|
import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
|
|
@@ -73,6 +76,9 @@ public class OaStampServiceImpl implements OaStampService {
|
|
|
@Resource
|
|
|
private TaskService taskService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private OaStampInfoService oaStampInfoService;
|
|
|
+
|
|
|
@Resource
|
|
|
private FileApi fileApi;
|
|
|
|
|
@@ -289,11 +295,25 @@ public class OaStampServiceImpl implements OaStampService {
|
|
|
.setCurrentAuditEmployeeName(null)
|
|
|
.setFinalAuditDate(LocalDateTime.now())
|
|
|
.setId(oaStamp.getId());
|
|
|
-
|
|
|
- // TODO 复制业务单据信息到业务模块单据表
|
|
|
-
|
|
|
}
|
|
|
oaStampMapper.updateById(oaStampDO);
|
|
|
+ // 复制业务单据信息到业务模块单据表
|
|
|
+ if(Objects.isNull(nextTask)) {
|
|
|
+ // 查询申请单
|
|
|
+ OaStampDO stamp = oaStampMapper.selectById(oaStampDO.getId());
|
|
|
+
|
|
|
+ // 转换
|
|
|
+ OaStampInfoDO stampInfoDO = BeanUtils.toBean(stamp, OaStampInfoDO.class);
|
|
|
+ stampInfoDO.setId(null);
|
|
|
+ stampInfoDO.setCreateTime(null);
|
|
|
+ stampInfoDO.setUpdater(null);
|
|
|
+ stampInfoDO.setUpdateTime(null);
|
|
|
+ stampInfoDO.setStatus("0");
|
|
|
+ stampInfoDO.setInfoSource(InfoSourceEnum.FLOW.getSource());
|
|
|
+
|
|
|
+ // 保存单据信息
|
|
|
+ oaStampInfoService.createStampInfoAfterAudit(stampInfoDO);
|
|
|
+ }
|
|
|
// 发送通知
|
|
|
|
|
|
// 返回
|