化工巡检

danger-manage-system/src/main/java/com/zehong/system/domain/TNfcRecord.java

@@ -73,6 +73,36 @@ public class TNfcRecord extends BaseEntity {
     /**巡检区域*/
     private String dictLabel;
 
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkStartTime;
+
+    /**
+     * 结束时间
+     * @return
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkEndTime;
+
+
+    public String getApplyWorkStartTime() {
+        return applyWorkStartTime;
+    }
+
+    public void setApplyWorkStartTime(String applyWorkStartTime) {
+        this.applyWorkStartTime = applyWorkStartTime;
+    }
+
+    public String getApplyWorkEndTime() {
+        return applyWorkEndTime;
+    }
+
+    public void setApplyWorkEndTime(String applyWorkEndTime) {
+        this.applyWorkEndTime = applyWorkEndTime;
+    }
+
     public String getDictLabel() {
         return dictLabel;
     }

danger-manage-system/src/main/java/com/zehong/system/domain/TNfcSetting.java

 package com.zehong.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * setting对象 t_nfc_setting
  *
@@ -51,8 +51,37 @@ public class TNfcSetting extends BaseEntity
      */
     private String nickName;
 
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkStartTime;
+
+    /**
+     * 结束时间
+     * @return
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkEndTime;
+
 
 
+    public String getApplyWorkStartTime() {
+        return applyWorkStartTime;
+    }
+
+    public void setApplyWorkStartTime(String applyWorkStartTime) {
+        this.applyWorkStartTime = applyWorkStartTime;
+    }
+
+    public String getApplyWorkEndTime() {
+        return applyWorkEndTime;
+    }
+
+    public void setApplyWorkEndTime(String applyWorkEndTime) {
+        this.applyWorkEndTime = applyWorkEndTime;
+    }
+
     public String getNickName() {
         return nickName;
     }
@@ -149,6 +178,8 @@ public class TNfcSetting extends BaseEntity
                 ", isDel=" + isDel +
                 ", region='" + region + '\'' +
                 ", nickName='" + nickName + '\'' +
+                ", applyWorkStartTime=" + applyWorkStartTime +
+                ", applyWorkEndTime=" + applyWorkEndTime +
                 '}';
     }
 }

danger-manage-system/src/main/resources/mapper/system/TNfcRecordMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TNfcRecordMapper">
-    
+
     <resultMap type="TNfcRecord" id="TNfcRecordResult">
         <result property="recordId"    column="record_id"    />
         <result property="nfcId"    column="nfc_id"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ns.`patrol_address` ,ns.`patrol_coment`,ns.`patrol_frequency`
         FROM t_nfc_record nr LEFT JOIN t_nfc_setting ns ON ns.`nfc_id` = nr.`nfc_id`
         LEFT JOIN sys_user u ON u.user_id = nr.create_user
-        <where>  
+        <where>
             <if test="nfcId != null "> and nr.nfc_id = #{nfcId}</if>
             <if test="isNormal != null "> and nr.is_normal = #{isNormal}</if>
             <if test="picture != null  and picture != ''"> and nr.picture = #{picture}</if>
@@ -39,12 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order By nr.create_time desc
     </select>
-    
+
     <select id="selectTNfcRecordById" parameterType="Long" resultMap="TNfcRecordResult">
         <include refid="selectTNfcRecordVo"/>
         where record_id = #{recordId}
     </select>
-        
+
     <insert id="insertTNfcRecord" parameterType="TNfcRecord" useGeneratedKeys="true" keyProperty="recordId">
         insert into t_nfc_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -83,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTNfcRecordByIds" parameterType="String">
-        delete from t_nfc_record where record_id in 
+        delete from t_nfc_record where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>

danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml

@@ -28,6 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null  and region != ''"> and  region = #{region}</if>
             <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address = #{patrolAddress}</if>
             <if test="nfcNum != null  and nfcNum != ''"> and nfc_num = #{nfcNum}</if>
+            <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
+                and a.create_time &gt;= #{applyWorkStartTime}
+            </if>
+            <if test="applyWorkEndTime!=null and applyWorkEndTime!=''">
+               and a.create_time &lt;= #{applyWorkEndTime}
+            </if>
         </where>
         order  by patrol_sort
     </select>
@@ -107,6 +113,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null and region != ''">
                 and b.region=#{region}
             </if>
+            <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
+                and a.create_time &gt;= #{applyWorkStartTime}
+            </if>
+            <if test="applyWorkEndTime!=null and applyWorkEndTime!=''">
+                and a.create_time &lt;= #{applyWorkEndTime}
+            </if>
         </where>
 			group by a.create_time desc
     </select>

danger-manage-web/src/views/system/statistics/index.vue

@@ -20,6 +20,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="开始时间" prop="applyWorkStartTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.applyWorkStartTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="applyWorkEndTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.applyWorkEndTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择结束时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -185,6 +201,8 @@ export default {
         patrolAddress: null,
         nfcNum: null,
         region:null,
+        applyWorkStartTime:null,
+        applyWorkEndTime:null
       },
       // 表单参数
       form: {},

danger-manage-web/src/views/system/tNfcSetting/index.vue

@@ -29,6 +29,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="开始时间" prop="applyWorkStartTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.applyWorkStartTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="applyWorkEndTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.applyWorkEndTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择结束时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -98,7 +114,8 @@
       <el-table-column label="nfc编号" align="center" prop="nfcNum" >
         <span slot-scope="scope" v-if="scope.row.nfcNum">{{scope.row.nfcNum}}</span>
         <span v-else>-</span>
-      </el-table-column>>
+      </el-table-column>
+      <el-table-column label="创建时间" width="170" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -128,7 +145,7 @@
     />
 
     <!-- 添加或修改setting对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" style="height: 150%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="排序" prop="patrolSort">
           <el-input v-model="form.patrolSort" placeholder="请输入排序" />
@@ -152,8 +169,8 @@
         <el-form-item label="nfc编号" prop="nfcNum">
           <el-input v-model="form.nfcNum" placeholder="请输入nfc编号" />
         </el-form-item>
-        <el-form-item label="巡检内容" prop="patrolComent" >
-          <el-input v-model="form.patrolComent" type="textarea" placeholder="请输入内容" height="100px"/>
+        <el-form-item label="巡检内容"   prop="patrolComent" >
+          <el-input v-model="form.patrolComent"  :autosize="{ minRows: 9, maxRows: 14}" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -203,6 +220,8 @@ export default {
         patrolAddress: null,
         nfcNum: null,
         region:null,
+        applyWorkStartTime:null,
+        applyWorkEndTime:null
       },
       // 表单参数
       form: {},