隐患整改调整

huaxin-system/src/main/java/com/zehong/system/domain/TDanger.java

@@ -181,6 +181,9 @@ public class TDanger extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 
+    @Excel(name = "表具编号")
+    private String meterNum;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -570,6 +573,14 @@ public class TDanger extends BaseEntity
         this.endDate = endDate;
     }
 
+    public String getMeterNum() {
+        return meterNum;
+    }
+
+    public void setMeterNum(String meterNum) {
+        this.meterNum = meterNum;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

huaxin-system/src/main/resources/mapper/system/TDangerMapper.xml

@@ -99,6 +99,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     else '-'
                 end
             ) as receiveName,
+            (
+                case type
+                    when '1' then (select tu.meternum from t_user tu where tu.id = danger.receive_id)
+                    else '-'
+                end
+            ) as meterNum,
             (select nick_name from sys_user where user_id = danger.reform_id) as reformName,
             us.nick_name as reportName,
             (select nick_name from sys_user where user_id = danger.check_id) as checkName

huaxin-web/src/views/checktask/danger/index.vue

@@ -114,6 +114,7 @@
         </template>
       </el-table-column>
       <el-table-column label="隐患来源" align="center" prop="type" :formatter="typeFormatter"/>
+      <el-table-column label="表具编号" align="center" prop="meterNum" />
       <el-table-column label="责任归属" align="center" prop="flag">
         <template slot-scope="scope">
           <span v-if="scope.row.flag == 1">安全管理部</span>
@@ -122,12 +123,12 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="隐患级别" align="center" prop="level">
+      <!--<el-table-column label="隐患级别" align="center" prop="level">
         <template slot-scope="scope">
           <span v-if="scope.row.level == 1">重大</span>
           <span v-if="scope.row.level == 2">一般</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="隐患地址" align="center" prop="address" width="150" :show-overflow-tooltip="true"/>
       <el-table-column label="隐患状态" align="center" prop="status">
         <template slot-scope="scope">