From 595d363f3736e10354ffe5133a63e67602fa3119 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
index 58a53dc..eb69acb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
@@ -1,11 +1,10 @@
package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.mainPart.taskReliability.dto.ModelDto;
import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
-import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
-import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
-import com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram;
+import com.zt.life.modules.mainPart.taskReliability.dto.WeakDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.verifyDto;
+import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.apache.ibatis.annotations.Mapper;
@@ -22,7 +21,7 @@
@Mapper
public interface SimulatAssessDao extends BaseDao<SimulatAssess> {
- List<SimulatAssess> getList(Long productId, Long taskModelId);
+ List<SimulatAssess> getList(Long taskModelId);
Integer getNumById(Long productId, Long taskModelId);
@@ -36,4 +35,16 @@
List<TimeDiagram> getTimeDiagram(Map<String, Object> params);
List<SimulatAssessTaskPhaseModel> getModelList(Long productId, Long fzId);
+
+ ModelRbd getModelByProductGk(Long gkId, Long productId);
+
+ List<WeakDto> getProductList(Long taskId, Long productId);
+
+ SimulatAssess getByTaskId(Long taskModelId);
+
+ List<OperatConditModel> getModel(Long taskId);
+
+ List<verifyDto> getNode(Long modelId);
+
+ Integer getVoteNum(Long id);
}
--
Gitblit v1.9.1