From 65c56f6bf68afec9e29b9e27c974cd399a9d1902 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 11 三月 2024 13:54:25 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java | 7 ++++++-
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 11 +++++++----
web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue | 4 ++--
web/src/views/modules/taskReliability/ModelRbd.vue | 1 +
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
index bdd0552..637a9ce 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.taskReliability.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
@@ -25,7 +26,7 @@
private Long pid;
@ApiModelProperty(value = "")
- private Long modelTag;
+ private String modelTag;
@ApiModelProperty(value = "妯″瀷鍚嶇О")
private String modelName;
@@ -39,4 +40,8 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "妯″瀷鐘舵��")
+ private String modelState;
+
}
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index 67e8be8..2cd456b 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -4,8 +4,14 @@
<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelRbdDao">
<select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
- select a.*
+ select a.*,
+ CASE
+ WHEN b.end =1 THEN '宸叉姤绉�'
+ WHEN c.num >0 THEN '姝ｅ湪缂栬緫'
+ ELSE '鏈紪杈�' END AS modelState
from model_rbd a
+ left join (select model_id,1 as end from algorithm where model_type = 'end' ) b on b.model_id = a.id
+ left join (select model_id, count(1) as num from algorithm group by model_id ) c on c.model_id = a.id
<where>
a.is_delete = 0
<if test="productId!=null and productId!=''">
@@ -15,9 +21,6 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
</select>
<select id="getDiagram" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
select a.*
diff --git a/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue b/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue
index 3b0b4a1..0914dfb 100644
--- a/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue
@@ -5,7 +5,7 @@
<el-input v-model="dataForm.modelName"></el-input>
</zt-form-item>
<zt-form-item label="妯″瀷鏍囪瘑" prop="modelName">
- <el-input v-model="dataForm.modelSign"></el-input>
+ <el-input v-model="dataForm.modelTag"></el-input>
</zt-form-item>
<zt-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark"></el-input>
@@ -24,7 +24,7 @@
modelId: '',
modelName: '',
productId: '',
- modelSign:'',
+ modelTag:'',
content: '',
remark: ''
}
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 61520e2..7f4dcb1 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -58,6 +58,7 @@
dialogVisible2: false,
dataForm: {
modelName: '',
+ modelState:'',
productId: '',
}
}
--
Gitblit v1.9.1