燃气事故台账增加字段事故发生时间，用户安全装置台账修改字段安装时间类型

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

@@ -41,8 +41,8 @@ public class TSafeEquipmentStandingBook extends BaseEntity
     private String linkMobile;
 
     /** 安装时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installTime;
 
     /** 品牌名称 */

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

@@ -59,6 +59,11 @@ public class TTroubleStandingBook extends BaseEntity
     @Excel(name = "是否处理：1.已处理 2.未处理")
     private String isDeal;
 
+    /** 事故发生时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "事故发生时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date happenDate;
+
     /** 处理完成时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "处理完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -170,6 +175,15 @@ public class TTroubleStandingBook extends BaseEntity
     {
         return isDeal;
     }
+
+    public Date getHappenDate() {
+        return happenDate;
+    }
+
+    public void setHappenDate(Date happenDate) {
+        this.happenDate = happenDate;
+    }
+
     public void setDealDate(Date dealDate)
     {
         this.dealDate = dealDate;

gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/TTroubleStandingBookForm.java

@@ -28,6 +28,14 @@ public class TTroubleStandingBookForm
     /** 是否处理：1.已处理 2.未处理 */
     private String isDeal;
 
+    /** 事故发生起始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date happenDateStart;
+
+    /** 事故发生截止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date happenDateEnd;
+
     /** 处理完成起始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dealDateStart;

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

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="responsibleUnit"    column="responsible_unit"    />
         <result property="responsiblePeople"    column="responsible_people"    />
         <result property="isDeal"    column="is_deal"    />
+        <result property="happenDate"    column="happen_date"    />
         <result property="dealDate"    column="deal_date"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -26,7 +27,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, 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, 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">
@@ -35,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleName != null  and troubleName != ''"> and trouble_name like concat('%', #{troubleName}, '%')</if>
             <if test="troubleType != null  and troubleType != ''"> and trouble_type = #{troubleType}</if>
             <if test="isDeal != null  and isDeal != ''"> and is_deal = #{isDeal}</if>
+            <if test="happenDateStart != null "> and happen_date &gt;= #{happenDateStart}</if>
+            <if test="happenDateEnd != null "> and happen_date &lt;= #{happenDateEnd}</if>
             <if test="dealDateStart != null "> and deal_date &gt;= #{dealDateStart}</if>
             <if test="dealDateEnd != null "> and deal_date &lt;= #{dealDateEnd}</if>
         </where>
@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="responsibleUnit != null">responsible_unit,</if>
             <if test="responsiblePeople != null">responsible_people,</if>
             <if test="isDeal != null">is_deal,</if>
+            <if test="happenDate != null">happen_date,</if>
             <if test="dealDate != null">deal_date,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -77,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="responsibleUnit != null">#{responsibleUnit},</if>
             <if test="responsiblePeople != null">#{responsiblePeople},</if>
             <if test="isDeal != null">#{isDeal},</if>
+            <if test="happenDate != null">#{happenDate},</if>
             <if test="dealDate != null">#{dealDate},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if>
             <if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if>
             <if test="isDeal != null">is_deal = #{isDeal},</if>
+            <if test="happenDate != null">happen_date = #{happenDate},</if>
             <if test="dealDate != null">deal_date = #{dealDate},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

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

@@ -31,14 +31,14 @@
       <el-form-item label="安装时间" prop="installTime">
         <el-date-picker clearable size="small"
                         v-model="queryParams.installTimeStart"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
+                        type="date"
+                        value-format="yyyy-MM-dd"
                         placeholder="请选择起始时间">
         </el-date-picker><span style="color: #bebfc3"> - </span>
         <el-date-picker clearable size="small"
                         v-model="queryParams.installTimeEnd"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
+                        type="date"
+                        value-format="yyyy-MM-dd"
                         placeholder="请选择截止时间">
         </el-date-picker>
       </el-form-item>
@@ -159,8 +159,8 @@
             <el-form-item label="安装时间" prop="installTime">
               <el-date-picker clearable size="small"
                               v-model="form.installTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
+                              type="date"
+                              value-format="yyyy-MM-dd"
                               placeholder="请选择安装时间"
                               style="width: 100%">
               </el-date-picker>

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

@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="是否处理" prop="isDeal">
-        <el-select v-model="queryParams.isDeal" placeholder="请选择事故类型" clearable size="small">
+        <el-select v-model="queryParams.isDeal" placeholder="请选择是否处理" clearable size="small">
           <el-option
             v-for="dict in isDealOptions"
             :key="dict.dictValue"
@@ -30,15 +30,15 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="处理完成时间" prop="dealDate">
+      <el-form-item label="事故发生时间" prop="happenDate">
         <el-date-picker clearable size="small"
-                        v-model="queryParams.dealDateStart"
+                        v-model="queryParams.happenDateStart"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="请选择起始时间">
         </el-date-picker><span style="color: #bebfc3"> - </span>
         <el-date-picker clearable size="small"
-                        v-model="queryParams.dealDateEnd"
+                        v-model="queryParams.happenDateEnd"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="请选择截止时间">
@@ -84,15 +84,16 @@
         </template>
       </el-table-column>
       <el-table-column label="事故地点" align="center" prop="troubleLocation" width="300px"/>
-      <el-table-column label="责任单位" align="center" prop="responsibleUnit" />
-      <el-table-column label="责任人员" align="center" prop="responsiblePeople" />
+      <el-table-column label="事故发生时间" align="center" prop="happenDate" width="180px"/>
+      <el-table-column label="责任单位" align="center" prop="responsibleUnit" width="150px"/>
+      <el-table-column label="责任人员" align="center" prop="responsiblePeople" width="150px"/>
       <el-table-column label="是否处理" align="center" prop="isDeal" width="120px">
         <template slot-scope="scope">
           <span v-if="scope.row.isDeal == 1">已处理</span>
           <span v-if="scope.row.isDeal == 2">未处理</span>
         </template>
       </el-table-column>
-      <el-table-column label="处理完成时间" align="center" prop="dealDate" width="180px"/>
+<!--      <el-table-column label="处理完成时间" align="center" prop="dealDate" width="180px"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -156,7 +157,6 @@
         <el-row>
           <el-col :span="23">
             <el-form-item label="经纬度坐标" prop="longitude">
-              <el-row>
               <el-col :span="9">
                 <el-input v-model="form.longitude" placeholder="请输入经度" />
               </el-col>
@@ -166,16 +166,26 @@
               <el-col :span="3" style="margin-left: 30px">
                 <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
               </el-col>
-              </el-row>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="23">
+          <el-col :span="11">
             <el-form-item label="事故原因" prop="troubleReason">
               <el-input v-model="form.troubleReason" placeholder="请输入事故原因" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="事故发生时间" prop="happenDate">
+              <el-date-picker clearable size="small"
+                              v-model="form.happenDate"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="选择处理完成时间"
+                              style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="23">
@@ -287,6 +297,8 @@ export default {
         troubleName: null,
         troubleType: null,
         isDeal: null,
+        happenDateStart: null,
+        happenDateEnd: null,
         dealDateStart: null,
         dealDateEnd: null
       },
@@ -306,6 +318,9 @@ export default {
         longitude: [
           { required: true, message: "请输入经纬度", trigger: "blur" },
         ],
+        happenDate: [
+          { required: true, message: "请输入经纬度", trigger: "blur" },
+        ],
         troubleReason: [
           { required: true, message: "请输入事故原因", trigger: "blur" },
         ],
@@ -355,6 +370,7 @@ export default {
         responsibleUnit: null,
         responsiblePeople: null,
         isDeal: null,
+        happenDate: null,
         dealDate: null,
         createBy: null,
         createTime: null,