燃气事故台账增加 是否人员伤亡、受伤人数、死亡人数 字段

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTroubleStandingBook.java

@@ -47,6 +47,18 @@ public class TTroubleStandingBook extends BaseEntity
     @Excel(name = "事故原因")
     private String troubleReason;
 
+    /** 是否人员伤亡 */
+    @Excel(name = "是否人员伤亡")
+    private String isCasualties;
+
+    /** 受伤人数 */
+    @Excel(name = "受伤人数")
+    private int injuryNum;
+
+    /** 死亡人数 */
+    @Excel(name = "死亡人数")
+    private int deathNum;
+
     /** 责任单位 */
     @Excel(name = "责任单位")
     private String responsibleUnit;
@@ -148,7 +160,32 @@ public class TTroubleStandingBook extends BaseEntity
     {
         return troubleReason;
     }
-    public void setResponsibleUnit(String responsibleUnit) 
+
+    public String getIsCasualties() {
+        return isCasualties;
+    }
+
+    public void setIsCasualties(String isCasualties) {
+        this.isCasualties = isCasualties;
+    }
+
+    public int getInjuryNum() {
+        return injuryNum;
+    }
+
+    public void setInjuryNum(int injuryNum) {
+        this.injuryNum = injuryNum;
+    }
+
+    public int getDeathNum() {
+        return deathNum;
+    }
+
+    public void setDeathNum(int deathNum) {
+        this.deathNum = deathNum;
+    }
+
+    public void setResponsibleUnit(String responsibleUnit)
     {
         this.responsibleUnit = responsibleUnit;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTroubleStandingBookServiceImpl.java

@@ -67,6 +67,11 @@ public class TTroubleStandingBookServiceImpl implements ITTroubleStandingBookSer
     @Override
     public int updateTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook)
     {
+        // 是否人员伤亡：2否，受伤人数和死亡人数改为0
+        if(tTroubleStandingBook.getIsCasualties().equals("2")){
+            tTroubleStandingBook.setInjuryNum(0);
+            tTroubleStandingBook.setDeathNum(0);
+        }
         tTroubleStandingBook.setUpdateTime(DateUtils.getNowDate());
         return tTroubleStandingBookMapper.updateTTroubleStandingBook(tTroubleStandingBook);
     }

gassafetyprogress-system/src/main/resources/mapper/system/TTroubleStandingBookMapper.xml

@@ -13,6 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="troubleType"    column="trouble_type"    />
         <result property="briefProcess"    column="brief_process"    />
         <result property="troubleReason"    column="trouble_reason"    />
+        <result property="isCasualties"    column="is_casualties"    />
+        <result property="injuryNum"    column="injury_num"    />
+        <result property="deathNum"    column="death_num"    />
         <result property="responsibleUnit"    column="responsible_unit"    />
         <result property="responsiblePeople"    column="responsible_people"    />
         <result property="isDeal"    column="is_deal"    />
@@ -27,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTroubleStandingBookVo">
-        select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
+        select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, is_casualties, injury_num, death_num, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
     </sql>
 
     <select id="selectTTroubleStandingBookList" parameterType="TTroubleStandingBookForm" resultMap="TTroubleStandingBookResult">
@@ -58,6 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleType != null">trouble_type,</if>
             <if test="briefProcess != null">brief_process,</if>
             <if test="troubleReason != null">trouble_reason,</if>
+            <if test="isCasualties != null">is_casualties,</if>
+            <if test="injuryNum != null">injury_num,</if>
+            <if test="deathNum != null">death_num,</if>
             <if test="responsibleUnit != null">responsible_unit,</if>
             <if test="responsiblePeople != null">responsible_people,</if>
             <if test="isDeal != null">is_deal,</if>
@@ -78,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleType != null">#{troubleType},</if>
             <if test="briefProcess != null">#{briefProcess},</if>
             <if test="troubleReason != null">#{troubleReason},</if>
+            <if test="isCasualties != null">#{isCasualties},</if>
+            <if test="injuryNum != null">#{injuryNum},</if>
+            <if test="deathNum != null">#{deathNum},</if>
             <if test="responsibleUnit != null">#{responsibleUnit},</if>
             <if test="responsiblePeople != null">#{responsiblePeople},</if>
             <if test="isDeal != null">#{isDeal},</if>
@@ -102,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleType != null">trouble_type = #{troubleType},</if>
             <if test="briefProcess != null">brief_process = #{briefProcess},</if>
             <if test="troubleReason != null">trouble_reason = #{troubleReason},</if>
+            <if test="isCasualties != null">is_casualties = #{isCasualties},</if>
+            <if test="injuryNum != null">injury_num = #{injuryNum},</if>
+            <if test="deathNum != null">death_num = #{deathNum},</if>
             <if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if>
             <if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if>
             <if test="isDeal != null">is_deal = #{isDeal},</if>

gassafetyprogress-web/src/views/standingBook/trouble/index.vue

@@ -85,7 +85,13 @@
       </el-table-column>
       <el-table-column label="事故地点" align="center" prop="troubleLocation" width="300px"/>
       <el-table-column label="事故发生时间" align="center" prop="happenDate" width="150px"/>
-      <el-table-column label="责任单位" align="center" prop="responsibleUnit"/>
+      <el-table-column label="是否人员伤亡" align="center" prop="isCasualties" width="150px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isCasualties == 1">是</span>
+          <span v-if="scope.row.isCasualties == 2">否</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任单位" align="center" prop="responsibleUnit" width="150px"/>
       <el-table-column label="责任人员" align="center" prop="responsiblePeople"/>
       <el-table-column label="是否处理" align="center" prop="isDeal">
         <template slot-scope="scope">
@@ -194,6 +200,28 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="是否人员伤亡" prop="isCasualties">
+              <el-select v-model="form.isCasualties" placeholder="请选择是否人员伤亡">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.isCasualties == '1'">
+          <el-col :span="11">
+            <el-form-item label="受伤人数" prop="injuryNum">
+              <el-input v-model.number="form.injuryNum" placeholder="请输入受伤人数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="死亡人数" prop="deathNum">
+              <el-input v-model.number="form.deathNum" placeholder="请输入死亡人数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item label="责任单位" prop="responsibleUnit">
@@ -258,6 +286,10 @@
                   <font v-if="detailForm.responsibleUnit != '' && detailForm.responsibleUnit != null">{{detailForm.responsibleUnit}}</font>
                   <font v-else> - </font>
                 </el-form-item>
+                <el-form-item label="是否人员伤亡:">
+                  <font v-if="detailForm.isCasualties == '1'">是</font>
+                  <font v-if="detailForm.isCasualties == '2'">否</font>
+                </el-form-item>
               </el-col>
               <el-col :span="13">
                 <el-form-item label="事故类型:">
@@ -271,27 +303,36 @@
                   <font v-if="detailForm.responsiblePeople != '' && detailForm.responsiblePeople != null">{{detailForm.responsiblePeople}}</font>
                   <font v-else> - </font>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-form-item label="简要经过:">
-                <font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
-                <font v-else> - </font>
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
                 <el-form-item label="是否处理:">
                   <font v-if="detailForm.isDeal == '1'">已处理</font>
                   <font v-if="detailForm.isDeal == '2'">未处理</font>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row v-if="detailForm.isCasualties == '1'">
+              <el-col :span="11">
+                <el-form-item label="受伤人数:">
+                  <font>{{detailForm.injuryNum}}</font>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
-                <el-form-item label="处理完成时间:">
-                  <font>{{detailForm.dealDate}}</font>
+                <el-form-item label="死亡人数:">
+                  <font>{{detailForm.deathNum}}</font>
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-form-item label="处理完成时间:">
+                <font v-if="detailForm.dealDate != '' && detailForm.dealDate != null">{{detailForm.dealDate}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="简要经过:">
+                <font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-row>
             <el-row>
               <el-form-item label="备注信息:">
                 <font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
@@ -396,12 +437,18 @@ export default {
         troubleReason: [
           { required: true, message: "请输入事故原因", trigger: "blur" },
         ],
+        isCasualties: [
+          { required: true, message: "请选择是否人员伤亡", trigger: "change" },
+        ],
         responsibleUnit: [
           { required: true, message: "请输入责任单位", trigger: "blur" },
         ],
         responsiblePeople: [
           { required: true, message: "请输入责任人员", trigger: "blur" },
         ],
+        isDeal: [
+          { required: true, message: "请选择是否已处理", trigger: "change" },
+        ],
       }
     };
   },
@@ -445,6 +492,9 @@ export default {
         troubleType: null,
         briefProcess: null,
         troubleReason: null,
+        isCasualties: null,
+        injuryNum: null,
+        deathNum: null,
         responsibleUnit: null,
         responsiblePeople: null,
         isDeal: null,
@@ -470,6 +520,9 @@ export default {
         troubleType: null,
         briefProcess: null,
         troubleReason: null,
+        isCasualties: null,
+        injuryNum: null,
+        deathNum: null,
         responsibleUnit: null,
         responsiblePeople: null,
         isDeal: null,