|
@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.easy.admin.common.core.exception.EasyException; |
|
|
import com.easy.admin.common.core.exception.EasyException; |
|
|
|
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoHistoryMapper; |
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper; |
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper; |
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper; |
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper; |
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouProcessinfoMapper; |
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouProcessinfoMapper; |
|
|
import com.easy.admin.modules.huzhou.entity.*; |
|
|
import com.easy.admin.modules.huzhou.entity.*; |
|
|
import com.easy.admin.modules.huzhou.service.*; |
|
|
import com.easy.admin.modules.huzhou.service.*; |
|
|
import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; |
|
|
import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; |
|
|
|
|
|
import com.google.common.collect.Lists; |
|
|
import org.activiti.engine.HistoryService; |
|
|
import org.activiti.engine.HistoryService; |
|
|
import org.activiti.engine.RuntimeService; |
|
|
import org.activiti.engine.RuntimeService; |
|
|
import org.activiti.engine.TaskService; |
|
|
import org.activiti.engine.TaskService; |
|
@ -600,7 +602,8 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper, |
|
|
throw new EasyException(isAllow); |
|
|
throw new EasyException(isAllow); |
|
|
} |
|
|
} |
|
|
//保存历史记录
|
|
|
//保存历史记录
|
|
|
planinfoHistoryService.savePlanInfoToHistory(projectid); |
|
|
List<HuzhouPlaninfo> planinfoHistory = getListByProjectId(projectid); |
|
|
|
|
|
planinfoHistoryService.savePlanInfoToHistory(planinfoHistory); |
|
|
//删除原纪录
|
|
|
//删除原纪录
|
|
|
removeByProjectId(projectid); |
|
|
removeByProjectId(projectid); |
|
|
saveBatch(huzhouPlaninfoArrayList); |
|
|
saveBatch(huzhouPlaninfoArrayList); |
|
@ -635,7 +638,8 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper, |
|
|
WorkFlow workFlow = workflowService.createFlow("createPlaninfo",projectid); |
|
|
WorkFlow workFlow = workflowService.createFlow("createPlaninfo",projectid); |
|
|
projectinfoService.modifyStageById(projectid,"4"); |
|
|
projectinfoService.modifyStageById(projectid,"4"); |
|
|
//保存历史记录
|
|
|
//保存历史记录
|
|
|
planinfoHistoryService.savePlanInfoToHistory(projectid); |
|
|
List<HuzhouPlaninfo> planinfoHistory = getListByProjectId(projectid); |
|
|
|
|
|
planinfoHistoryService.savePlanInfoToHistory(planinfoHistory); |
|
|
//删除未开始的项目计划,保零六已完成或审批中的
|
|
|
//删除未开始的项目计划,保零六已完成或审批中的
|
|
|
removeByProjectId(projectid); |
|
|
removeByProjectId(projectid); |
|
|
//将之前的分组id修改为最新的分组id
|
|
|
//将之前的分组id修改为最新的分组id
|
|
@ -791,4 +795,5 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper, |
|
|
} |
|
|
} |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|