|
@ -155,13 +155,16 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil |
|
|
taskName=StrUtil.trim(taskName); |
|
|
taskName=StrUtil.trim(taskName); |
|
|
// 校验参数
|
|
|
// 校验参数
|
|
|
checkVariable(contractMoneyFieldsValue, contractList, planinfo, taskName); |
|
|
checkVariable(contractMoneyFieldsValue, contractList, planinfo, taskName); |
|
|
|
|
|
|
|
|
|
|
|
String projectId = planinfoService.getById(planinfoid).getProjectId(); |
|
|
|
|
|
HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId); |
|
|
// 提交试运行阶段的时候自动创建 计划
|
|
|
// 提交试运行阶段的时候自动创建 计划
|
|
|
if("试运行阶段".equals(taskName)){ |
|
|
if("试运行阶段".equals(taskName)){ |
|
|
LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfo.getProjectId()); |
|
|
queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfo.getProjectId()); |
|
|
queryWrapper.eq(HuzhouPlaninfo::getTaskName,"试运行阶段"); |
|
|
queryWrapper.eq(HuzhouPlaninfo::getTaskName,"试运行阶段"); |
|
|
HuzhouPlaninfo source = planinfoMapper.selectOne(queryWrapper); |
|
|
HuzhouPlaninfo source = planinfoMapper.selectOne(queryWrapper); |
|
|
if (source != null && source.getIsfinish().equals("0")) { |
|
|
if (source != null && huzhouProjectinfo.getAdminDivision().equals("市本级") ) { |
|
|
HuzhouPlaninfo target = new HuzhouPlaninfo(); |
|
|
HuzhouPlaninfo target = new HuzhouPlaninfo(); |
|
|
BeanUtils.copyProperties(source,target,"id","actualStartTime","actualEndTime"); |
|
|
BeanUtils.copyProperties(source,target,"id","actualStartTime","actualEndTime"); |
|
|
target.setTaskName("提交终验申请"); |
|
|
target.setTaskName("提交终验申请"); |
|
@ -176,8 +179,6 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil |
|
|
planinfoMapper.insert(target); |
|
|
planinfoMapper.insert(target); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
String projectId = planinfoService.getById(planinfoid).getProjectId(); |
|
|
|
|
|
HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId); |
|
|
|
|
|
|
|
|
|
|
|
String superLeader = ""; |
|
|
String superLeader = ""; |
|
|
String adminDivision=""; |
|
|
String adminDivision=""; |
|
|