东北大学预案列表新增学院名称字段

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabRiskPlanAbnormalGroup.java

@@ -1,5 +1,6 @@
 package com.zd.laboratory.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -67,6 +68,9 @@ public class LabRiskPlanAbnormalGroup extends BaseEntity {
     @Excel(name = "是否查看预案 0否 1是")
     private Integer ifCheck;
 
+    @ApiModelProperty(value = "学院名称")
+    @TableField(exist = false)
+    private String deptName;
 
     public Long getId() {
         return id;
@@ -131,4 +135,14 @@ public class LabRiskPlanAbnormalGroup extends BaseEntity {
     public void setIfCheck(Integer ifCheck) {
         this.ifCheck = ifCheck;
     }
+
+    @Override
+    public String getDeptName() {
+        return deptName;
+    }
+
+    @Override
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalGroupMapper.xml

@@ -158,7 +158,7 @@
 
     <!-- 批量查询实验室预警 -->
     <select id="queryRiskExeRecordList" parameterType="com.zd.laboratory.domain.LabRiskPlanAbnormalGroup" resultType="com.zd.laboratory.domain.LabRiskPlanAbnormalGroup">
-        SELECT g.id, g.group_name, g.subject_id, CONCAT(s.name,s.room) AS subject_name, g.risk_attribute, g.STATUS, g.create_time, g.create_by, g.update_time
+        SELECT g.id, g.group_name, g.subject_id, s.dept_name, CONCAT(s.name,s.room) AS subject_name, g.risk_attribute, g.STATUS, g.create_time, g.create_by, g.update_time
         FROM lab_risk_plan_abnormal_group g
         LEFT JOIN lab_subject s ON s.id = g.subject_id
         <where>