diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoHistoryService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoHistoryService.java index 45686c8..04c7a17 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoHistoryService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoHistoryService.java @@ -2,16 +2,18 @@ package com.easy.admin.modules.huzhou.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfoHistory; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.vo.HuzhouPlaninfoOV; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import java.util.ArrayList; +import java.util.List; public interface IHuzhouPlaninfoHistoryService extends IService { - void savePlanInfoToHistory(String projectid); + void savePlanInfoToHistory(List planinfoHistory); Page getPlanInfoHistoryPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize); Page getSinglePlanInfoHistoryPageList(String projectid, Integer pageNo, Integer pageSize); ArrayList queryPlanInfoHistoryGroupList(HuzhouPlaninfoHistory planinfoHistory); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java index 055bdba..a2f2a97 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java @@ -27,15 +27,12 @@ import java.util.stream.Collectors; @Service public class HuzhouPlaninfoHistoryServiceImpl extends ServiceImpl implements IHuzhouPlaninfoHistoryService { - @Autowired - private IHuzhouPlaninfoService planinfoService; @Autowired private HuzhouPlaninfoHistoryMapper planinfoHistoryMapper; @Autowired private HuzhouSubProjectinfoMapper subProjectinfoMapper; @Override - public void savePlanInfoToHistory(String projectid) { - List planinfoHistory = planinfoService.getListByProjectId(projectid); + public void savePlanInfoToHistory(List planinfoHistory) { List planinfoHistorylist = Lists.transform(planinfoHistory, entity->{ HuzhouPlaninfoHistory huzhouPlaninfoHistory = new HuzhouPlaninfoHistory(); BeanUtils.copyProperties(entity,huzhouPlaninfoHistory); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index 784c529..e7f7465 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.HuzhouPlaninfofileMapper; import com.easy.admin.modules.huzhou.dao.HuzhouProcessinfoMapper; import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; +import com.google.common.collect.Lists; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -600,7 +602,8 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl planinfoHistory = getListByProjectId(projectid); + planinfoHistoryService.savePlanInfoToHistory(planinfoHistory); //删除原纪录 removeByProjectId(projectid); saveBatch(huzhouPlaninfoArrayList); @@ -635,7 +638,8 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl planinfoHistory = getListByProjectId(projectid); + planinfoHistoryService.savePlanInfoToHistory(planinfoHistory); //删除未开始的项目计划,保零六已完成或审批中的 removeByProjectId(projectid); //将之前的分组id修改为最新的分组id @@ -791,4 +795,5 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl