|
|
|
@ -31,10 +31,7 @@ import org.springframework.validation.annotation.Validated;
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
|
@ -259,9 +256,13 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
|
|
|
|
|
Map<String, List<ProjectOrderSubDO>> nameGroups = lastSnapshotSubDOList.stream().collect(Collectors.groupingBy(ProjectOrderSubDO::getName));
|
|
|
|
|
projectOrderSubDOList.forEach(projectOrderSubDO -> {
|
|
|
|
|
List<ProjectOrderSubDO> lastSnapshotSubs = nameGroups.get(projectOrderSubDO.getName());
|
|
|
|
|
if(lastSnapshotSubs == null || lastSnapshotSubs.isEmpty()) return;
|
|
|
|
|
if(lastSnapshotSubs == null || lastSnapshotSubs.isEmpty()){
|
|
|
|
|
// 如为新增行 则整行标记
|
|
|
|
|
projectOrderSubDO.setAlterFieldNames(new HashSet<String>(1){{add("NEW");}});
|
|
|
|
|
}else{
|
|
|
|
|
List<FieldInfo> diffFields = FIELD_EQUATOR.getDiffFields(projectOrderSubDO, lastSnapshotSubs.get(0));
|
|
|
|
|
projectOrderSubDO.setAlterFieldNames(diffFields.stream().map(FieldInfo::getFieldName).collect(Collectors.toSet()));
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|