隐患第三方维修标识

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

@@ -205,6 +205,10 @@ public class TDanger extends BaseEntity
     @Excel(name="表号")
     private String meterNumRecord;
 
+    /** 是否为第三方施工：0否, 1是 */
+    @Excel(name = "是否为第三方施工：0否, 1是",readConverterExp = "0=否,1=是")
+    private String isThird;
+
     public String getBranch() {
         return branch;
     }
@@ -658,6 +662,14 @@ public class TDanger extends BaseEntity
         this.meterNumRecord = meterNumRecord;
     }
 
+    public String getIsThird() {
+        return isThird;
+    }
+
+    public void setIsThird(String isThird) {
+        this.isThird = isThird;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approvalStatus"    column="approval_status"    />
         <result property="contact"    column="contact"    />
         <result property="meterNumRecord"    column="meter_num_record"    />
+        <result property="isThird"    column="is_third"    />
     </resultMap>
 
     <sql id="selectTDangerVo">
@@ -96,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             danger.approval_status,
             danger.contact,
             danger.meter_num_record,
+            danger.is_third,
             (SELECT nick_name FROM sys_user where user_id = danger.file_id) as fileName,
             (
                 case type
@@ -158,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params != null and params.approvalCondition != null and params.approvalCondition != ''">${params.approvalCondition}</if>
             <if test="reformName != null  and reformName != ''"> and ref.nick_name like concat('%',#{reformName},'%')</if>
             <if test="params != null and params.queryType != null and params.queryType != '' and params.queryType == 1">and danger.type not in (9,10)</if>
+            <if test="isThird != null  and isThird != ''"> and danger.is_third = #{isThird}</if>
         </where>
         ORDER BY create_time DESC
     </select>
@@ -212,6 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalStatus != null">approval_status,</if>
             <if test="contact != null">contact,</if>
             <if test="meterNumRecord != null">meter_num_record,</if>
+            <if test="isThird != null">is_third,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -256,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalStatus != null"> #{approvalStatus},</if>
             <if test="contact != null">#{contact},</if>
             <if test="meterNumRecord != null">#{meterNumRecord},</if>
+            <if test="isThird != null">#{isThird},</if>
          </trim>
     </insert>
 
@@ -304,6 +309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
             <if test="contact != null">contact = #{contact},</if>
             <if test="meterNumRecord != null">meter_num_record = #{meterNumRecord},</if>
+            <if test="isThird != null">is_third = #{isThird},</if>
         </trim>
         where id = #{id}
     </update>
@@ -383,6 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             danger.approval_status,
             danger.contact,
             danger.meter_num_record,
+            danger.is_third,
             (SELECT nick_name FROM sys_user where user_id = danger.file_id) as fileName,
             (
                 <if test="type == 1">
@@ -450,6 +457,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="type == 1 and village != null "> and com.id = #{village} </if>
             <if test="adminId != null and reformId != null"> and (danger.admin_id = #{adminId} or danger.reform_id = #{reformId})</if>
+            <if test="isThird != null  and isThird != ''"> and danger.is_third = #{isThird}</if>
         </where>
         ORDER BY create_time DESC
     </select>

huaxin-web/src/views/checktask/customerServiceDanger/components/DangerDetail.vue

@@ -192,6 +192,14 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="12">
+                  <el-form-item label="是否为第三方维修">
+                    <span v-if="dangerDetailInfo.isThird == '0'">否</span>
+                    <span v-else-if="dangerDetailInfo.isThird == '1'">是</span>
+                    <span v-else>-</span>
+                  </el-form-item>
+                </el-col>
+
                 <!--<el-col :span="12">
                   <el-form-item label="归档人">
                     <span v-if="dangerDetailInfo.fileName">{{

huaxin-web/src/views/checktask/danger/components/DangerDetail.vue

@@ -178,6 +178,14 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="12">
+                  <el-form-item label="是否为第三方维修">
+                    <span v-if="dangerDetailInfo.isThird == '0'">否</span>
+                    <span v-else-if="dangerDetailInfo.isThird == '1'">是</span>
+                    <span v-else>-</span>
+                  </el-form-item>
+                </el-col>
+
                 <!--<el-col :span="12">
                   <el-form-item label="归档人">
                     <span v-if="dangerDetailInfo.fileName">{{

huaxin-web/src/views/checktask/pendingApprovaldanger/components/DangerDetail.vue

@@ -178,6 +178,14 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="12">
+                  <el-form-item label="是否为第三方维修">
+                    <span v-if="dangerDetailInfo.isThird == '0'">否</span>
+                    <span v-else-if="dangerDetailInfo.isThird == '1'">是</span>
+                    <span v-else>-</span>
+                  </el-form-item>
+                </el-col>
+
                 <!--<el-col :span="12">
                   <el-form-item label="归档人">
                     <span v-if="dangerDetailInfo.fileName">{{

huaxin-web/src/views/checktask/superviseDanger/components/DangerDetail.vue

@@ -162,6 +162,14 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="12">
+                  <el-form-item label="是否为第三方维修">
+                    <span v-if="dangerDetailInfo.isThird == '0'">否</span>
+                    <span v-else-if="dangerDetailInfo.isThird == '1'">是</span>
+                    <span v-else>-</span>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="12" v-if="dangerDetailInfo.type == '8'">
                   <el-form-item label="治理的标准要求">
                     <span v-if="dangerDetailInfo.governanceStandards">