|
@@ -319,6 +319,13 @@ public class PsiCollectService {
|
|
|
info.setUpdateById(userDTO.getId());
|
|
info.setUpdateById(userDTO.getId());
|
|
|
info.setHandledBy(dto.getHandledById());
|
|
info.setHandledBy(dto.getHandledById());
|
|
|
info.setUpdateTime(new Date());
|
|
info.setUpdateTime(new Date());
|
|
|
|
|
+ if(StringUtils.isNotBlank(info.getProcInsId()) && StringUtils.isBlank(info.getProcessDefinitionId())){
|
|
|
|
|
+ Map flowMap = flowTaskService.getByNameForFen("进销存-领用申请");
|
|
|
|
|
+ Object idObj = flowMap.get("id");
|
|
|
|
|
+ if (idObj != null && idObj instanceof String) {
|
|
|
|
|
+ info.setProcessDefinitionId((String)idObj) ;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
basicMapper.updateById(info);
|
|
basicMapper.updateById(info);
|
|
|
// 修改报销详情列表信息
|
|
// 修改报销详情列表信息
|
|
|
// 删除原有数据
|
|
// 删除原有数据
|
|
@@ -494,7 +501,7 @@ public class PsiCollectService {
|
|
|
Map<String ,String > map = new HashMap<>();
|
|
Map<String ,String > map = new HashMap<>();
|
|
|
map.put("taskId",dto.getProcInsId());
|
|
map.put("taskId",dto.getProcInsId());
|
|
|
map.put("title",title);
|
|
map.put("title",title);
|
|
|
- map.put("defId",dto.getProcessDefinitionId());
|
|
|
|
|
|
|
+ map.put("defId",info.getProcessDefinitionId());
|
|
|
map.put("taskName","领用申请审批通过");
|
|
map.put("taskName","领用申请审批通过");
|
|
|
map.put("createUser","管理员");
|
|
map.put("createUser","管理员");
|
|
|
map.put("createTime",day);
|
|
map.put("createTime",day);
|