diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java index f437367a..4a8f2fa3 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java @@ -52,4 +52,5 @@ public interface EvaluationGroupMapper extends BaseMapper { EvaluationGroup selectEvaluationGroupByCopyId(@Param("copyId")Long copyId,@Param("startId")Long startId); + List selectEvaluationGroupByCopyIds(@Param("ids") List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index f3dc5de4..2273d93b 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java @@ -59,4 +59,6 @@ public interface EvaluationGroupService extends IService { String getEvaluationCopyIdsByEvaluationIds(String evaluationIds,Long startId); EvaluationGroup selectEvaluationGroupByCopyId(Long copyId, Long startId); + + List selectEvaluationGroupByCopyIds(List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 6e23020f..c22f227a 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -424,4 +424,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl selectEvaluationGroupByCopyIds(List ids){ + return evaluationGroupMapper.selectEvaluationGroupByCopyIds(ids); + } } diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 9653d943..3bcd6df2 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -206,16 +206,33 @@ public class FlowStartServiceImpl extends ServiceImpl newIds = new ArrayList<>(); FlowStart flowStart1 = selectFlowStartByName(flowStart.getName()); if(flowStart1 == null){ insertFlowStart(flowStart); + flowStart1 = flowStart; }else{ - List ids1= Arrays.stream(flowStart1.getGroupIds().split(",")).map(new Function() { + + //因为保存的时拷贝后的组,所以这里查询原来的组 + List lIds= Arrays.stream(flowStart1.getGroupIds().split(",")).map(new Function() { @Override - public String apply(String s) { - return s; + public Long apply(String s) { + newIds.add(s); + return Long.valueOf(s); } }).collect(Collectors.toList()); + List evaluationGroups = evaluationGroupService.selectEvaluationGroupByCopyIds(lIds); + + List ids1= evaluationGroups.stream().map(new Function() { + @Override + public String apply(EvaluationGroup evaluationGroup) { + return evaluationGroup.getId().toString(); + } + }).collect(Collectors.toList()); + //查询拷贝后的 + + + Map maps = ids1.stream().collect(Collectors.toMap(e->e, e->e)); //求差集发起,但是历史记录怎么搞 @@ -234,9 +251,6 @@ public class FlowStartServiceImpl extends ServiceImpl select * from lz_evaluation_group where is_delete = 0 and copy_id = #{copyId} and start_id = #{startId} limit 1 + +