Merge remote-tracking branch 'origin/master'

wente

2024-12-05 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.zt.common.service.BaseService;
import com.zt.common.utils.TreeUtils;
import com.zt.common.utils.TreeUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.OperatConditModelDao;
import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
@@ -14,6 +15,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;


/**
@@ -33,11 +35,14 @@
     */
    public List<OperatConditModel> page(QueryFilter queryFilter) {
        List<OperatConditModel> list = baseDao.getList(queryFilter.getQueryParams());
        List<ModelRbd> modelList = baseDao.getModelList(queryFilter.getQueryParams());
        for (OperatConditModel conditModel : list) {
            List<ModelRbd> modelList = baseDao.getModelList(conditModel.getId());
            conditModel.setModelList(modelList);
            //List<ModelRbd> modelList = baseDao.getModelList(conditModel.getProductId());
            List<ModelRbd> myList = modelList.stream().filter(item ->
                    item.getProductId().equals(conditModel.getProductId())).collect(Collectors.toList());
            conditModel.setModelList(myList);
        }
        return TreeUtils.build(list);
        return TreeUtils2.build(list);
    }