|
@@ -444,20 +444,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
|
|
|
planYearsMapper.insertPlanYears(ofYears);
|
|
|
byId.setPlanYearId(ofYears.getPlanYearId());
|
|
|
}
|
|
|
- // 添加审核附件
|
|
|
- if (!ObjectUtils.isEmpty(provisionalPlanVo.getSysFileRefs())) {
|
|
|
- provisionalPlanVo.getSysFileRefs().stream().forEach(fr -> {
|
|
|
- SysFileRef sysFileRef = new SysFileRef();
|
|
|
- sysFileRef.setFileId(fr.getFileId());
|
|
|
- sysFileRef.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
|
|
|
- sysFileRef.setRedId(byId.getPlanPracticalId());
|
|
|
- sysFileRef.setCreated(provisionalPlanVo.getUpdated());
|
|
|
- sysFileRef.setUpdated(sysFileRef.getCreated());
|
|
|
- sysFileRef.setCreateTime(new Date());
|
|
|
- sysFileRef.setUpdateTime(sysFileRef.getCreateTime());
|
|
|
- sysFileRefMapper.insert(sysFileRef);
|
|
|
- });
|
|
|
- }
|
|
|
PmDemand demand = new PmDemand();
|
|
|
BeanUtils.copyProperties(byId, demand);
|
|
|
demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
|
|
@@ -485,7 +471,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
|
|
|
sysFileRefMapper.insert(ref);
|
|
|
}
|
|
|
}
|
|
|
- byId.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
+ provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
|
|
|
//上传审核文件并赋予计划审核通过
|
|
|
return review(provisionalPlanVo);
|
|
|
}
|