居民安检查询调整

huaxin-system/src/main/java/com/zehong/system/domain/vo/UserTaskInspect.java

@@ -54,6 +54,14 @@ public class UserTaskInspect {
 
     private Long village;
 
+    /** 安检开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date beginDate;
+
+    /** 安检结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+
     public String getNickName() {
         return nickName;
     }
@@ -237,4 +245,20 @@ public class UserTaskInspect {
     public void setMeternum(String meternum) {
         this.meternum = meternum;
     }
+
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Date beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

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

@@ -132,6 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="village == null ">
                 and u.village in (SELECT re.relation_id FROM t_task_relation_info re WHERE re.task_id = #{taskId} and re.type = '1' )
             </if>
+            <if test="beginDate != null and endDate != null">
+                and inspect.create_time BETWEEN #{beginDate} AND #{endDate}
+            </if>
         </where>
         order by inspect.create_time desc
     </select>
@@ -161,6 +164,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="village == null ">
                 and u.village in (SELECT re.relation_id FROM t_task_relation_info re WHERE re.task_id = #{taskId} and re.type = '1' )
             </if>
+            <if test="beginDate != null and endDate != null">
+                and inspect.create_time BETWEEN #{beginDate} AND #{endDate}
+            </if>
         </where>
         order by inspect.create_time desc
     </select>

huaxin-web/src/views/checktask/inspect/index.vue

@@ -170,6 +170,20 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="安检时间" prop="inspectTimeRange">
+        <el-date-picker
+          v-model="inspectTimeRange"
+          type="datetimerange"
+          size="small"
+          :clearable="false"
+          value-format="yyyy-MM-dd HH:mm"
+          @change="timeChange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button
           type="primary"
@@ -383,7 +397,9 @@ export default {
         satisfy: "",
         inspectStatus: "",
         nickName: null,
-        village: null
+        village: null,
+        beginDate: null,
+        endDate : null
       },
       satisfyOptions: [
         {
@@ -476,7 +492,8 @@ export default {
       ],
       taskDetailData:{},
       taskInspectDangerDetailData:{},
-      communityInfos: []
+      communityInfos: [],
+      inspectTimeRange: []
     };
   },
   created() {
@@ -544,6 +561,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.inspectTimeRange = [];
+      this.queryParams.beginDate = null;
+      this.queryParams.endDate = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -706,7 +726,11 @@ export default {
     },
     handleBatchInspectExport(){
       this.$refs.exportInspect.init(this.queryParams);
-    }
+    },
+    timeChange(val){
+      this.queryParams.beginDate = val[0];
+      this.queryParams.endDate = val[1];
+    },
   },
 };
 </script>