ReliabilitySimulation.git

			@@ -4,7 +4,6 @@
			import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
			import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
			import com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel;
			import org.apache.ibatis.annotations.MapKey;
			import org.apache.ibatis.annotations.Mapper;


			@@ -23,7 +22,7 @@

			List<OperatConditModel> getList(Map<String, Object> params);

			List<ModelRbd> getModelList(Long productId);
			List<ModelRbd> getModelList(Map<String, Object> productId);

			List<ModelNodes> getModelNodes(Long shipId);

			@@ -15,6 +15,7 @@
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;


			/**
			@@ -34,9 +35,12 @@
			*/
			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.getProductId());
			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 TreeUtils2.build(list);
			}

			@@ -23,20 +23,8 @@
			ON b.product_id = a.id
			AND b.operat_condit_id = ${operatConditId}
			LEFT JOIN model_rbd c ON c.id = b.model_id
			WHERE a.id in (
			SELECT DATA.id
			FROM (
			SELECT @ids as ids,
			(SELECT @ids := GROUP_CONCAT(id)
			FROM product_model
			WHERE FIND_IN_SET(pid, @ids)
			) as cids
			FROM product_model
			WHERE @ids IS NOT NULL AND @ids := ${productId}
			) id,
			product_model DATA
			WHERE FIND_IN_SET(DATA.id, ID.ids)
			)
			Where
			a.ship_id = ${productId}
			and a.product_type in (4, 3, 2, 10)
			AND a.is_delete = 0
			ORDER BY a.product_type, a.sort
			@@ -44,7 +32,7 @@
			<select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
			select *
			from model_rbd
			where product_id = ${productId}
			where ship_id = ${productId}
			and is_delete = 0
			</select>
			<select id="getModelNodes" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNodes">

	modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史