整改方式

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

@@ -109,6 +109,10 @@ public class TDanger extends BaseEntity
     @Excel(name = "整改结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
+    /** 整改方式 */
+    @Excel(name = "整改方式",readConverterExp = "1=用户自行整改，2=用户出资公司整改，3=通知厂家上门维修检查，4=公司出资整改")
+    private String dealMethod;
+
     /** 隐患状态，0待处理，1待复核，2已处理 */
     @Excel(name = "隐患状态",readConverterExp = "0=待处理,1=拒绝整改,2=待复核,3=已处理,4=已归档")
     private Integer status;
@@ -533,6 +537,14 @@ public class TDanger extends BaseEntity
         this.tTaskInspect = tTaskInspect;
     }
 
+    public String getDealMethod() {
+        return dealMethod;
+    }
+
+    public void setDealMethod(String dealMethod) {
+        this.dealMethod = dealMethod;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="governanceMethod"    column="governance_method"    />
         <result property="fundsMaterials"    column="funds_materials"    />
         <result property="safetyEmergencyPlan"    column="safety_emergency_plan"    />
+        <result property="dealMethod"    column="deal_method"    />
     </resultMap>
 
     <sql id="selectTDangerVo">
@@ -86,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             governance_method,
             funds_materials,
             safety_emergency_plan,
+            deal_method,
             (SELECT nick_name FROM sys_user where user_id = file_id) as fileName,
             (
                 case type
@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status == null "> and status not in (-1)</if>
             <if test="flag != null and adminId != null"> and (flag = #{flag} or admin_id = #{adminId})</if>
             <if test="isVisitor != null  and isVisitor != ''"> and is_visitor = #{isVisitor}</if>
+            <if test="dealMethod != null  and dealMethod != ''"> and deal_method = #{dealMethod}</if>
         </where>
         ORDER BY create_time DESC
     </select>
@@ -182,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="governanceMethod != null">governance_method,</if>
             <if test="fundsMaterials != null">funds_materials,</if>
             <if test="safetyEmergencyPlan != null">safety_emergency_plan,</if>
+            <if test="dealMethod != null">deal_method,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -221,6 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="governanceMethod != null">#{governanceMethod},</if>
             <if test="fundsMaterials != null">#{fundsMaterials},</if>
             <if test="safetyEmergencyPlan != null">#{safetyEmergencyPlan},</if>
+            <if test="dealMethod != null">#{dealMethod},</if>
          </trim>
     </insert>
 
@@ -264,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="governanceMethod != null">governance_method = #{governanceMethod},</if>
             <if test="fundsMaterials != null">funds_materials = #{fundsMaterials},</if>
             <if test="safetyEmergencyPlan != null">safety_emergency_plan = #{safetyEmergencyPlan},</if>
+            <if test="dealMethod != null">deal_method = #{dealMethod},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -162,6 +162,16 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="12">
+                  <el-form-item label="整改方式">
+                    <span v-if="dangerDetailInfo.dealMethod == '1'">用户自行整改</span>
+                    <span v-else-if="dangerDetailInfo.dealMethod == '2'">用户出资公司整改</span>
+                    <span v-else-if="dangerDetailInfo.dealMethod == '3'">通知厂家上门维修检查</span>
+                    <span v-else-if="dangerDetailInfo.dealMethod == '4'">公司出资整改</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/fault/components/FaultDetail.vue

@@ -139,6 +139,16 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="12">
+                  <el-form-item label="整改方式">
+                    <span v-if="dangerDetailInfo.dealMethod == '1'">用户自行整改</span>
+                    <span v-else-if="dangerDetailInfo.dealMethod == '2'">用户出资公司整改</span>
+                    <span v-else-if="dangerDetailInfo.dealMethod == '3'">通知厂家上门维修检查</span>
+                    <span v-else-if="dangerDetailInfo.dealMethod == '4'">公司出资整改</span>
+                    <span v-else>-</span>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="24">
                   <el-form-item label="备注">
                   <span v-if="dangerDetailInfo.remark">{{