执法记录工单管理增加筛选条件

lawenforcement-ui/src/views/lawenforcement/record/index.vue

@@ -1,19 +1,140 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="任务名称" prop="jobName">
-        <el-input
-          v-model="queryParams.jobName"
-          placeholder="请输入任务名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </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>
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px" @submit.native.prevent class="form-style">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="任务名称" prop="jobName">
+            <el-input
+              v-model="queryParams.jobName"
+              placeholder="请输入任务名称"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="任务类型" prop="jobType"  class="form-style">
+            <el-select v-model="queryParams.jobType" placeholder="请选择任务类型" clearable size="small" >
+              <el-option
+                v-for="dict in dict.type.lawenforcement_jobType"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="creatorName">
+            <el-input
+              v-model="queryParams.creatorName"
+              placeholder="请输入创建人"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建部门" prop="deptName">
+            <el-input
+              v-model="queryParams.deptName"
+              placeholder="请输入创建部门"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="检查对象代码" prop="checkObjectCode">
+            <el-input
+              v-model="queryParams.checkObjectCode"
+              placeholder="请输入检查对象代码"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="检查对象名称" prop="checkObjectName">
+            <el-input
+              v-model="queryParams.checkObjectName"
+              placeholder="请输入检查对象名称"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="检查开始时间" prop="checkStartTime">
+            <el-date-picker
+              clearable
+              v-model="formattedQueryCheckStartTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择检查开始时间"
+              @change="handleDateChange('checkStartTime', 1)"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="检查结束时间" prop="checkEndTime">
+            <el-date-picker
+              clearable
+              v-model="formattedQueryCheckEndTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择检查结束时间"
+              @change="handleDateChange('checkEndTime', 1)"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="任务状态" prop="recordStatus" class="form-style">
+            <el-select v-model="queryParams.recordStatus" placeholder="请选择任务状态" clearable size="small">
+              <el-option
+                v-for="dict in dict.type.lawenforcement_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建方式" prop="createMethod" class="form-style">
+            <el-select v-model="queryParams.createMethod" placeholder="请选择创建方式" clearable size="small">
+              <el-option value="1" label="平台对接">平台对接</el-option>
+              <el-option value="2" label="API对接">API对接</el-option>
+              <el-option value="3" label="数据同步">数据同步</el-option>
+              <el-option value="4" label="自建">自建</el-option>
+              <el-option value="5" label="未知方式">未知方式</el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="是否立案" prop="isRegisterRecord" v-if="queryParams.isRegister !== '1'">
+            <el-select v-model="queryParams.isRegisterRecord" placeholder="请选择是否立案" clearable size="small">
+              <el-option value="3" label="是">是</el-option>
+              <el-option value="0" label="否">否</el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <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>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -444,6 +565,16 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobName: null,
+        jobType: null,
+        creatorName: null,
+        deptName: null,
+        gender: null,
+        checkObjectCode: null,
+        checkObjectName: null,
+        checkStartTime: null,
+        checkEndTime: null,
+        createMethod: null,
+        isRegisterRecord: null,
       },
       // 表单参数
       form: {
@@ -524,6 +655,38 @@ export default {
         this.form.checkEndTime = new Date(value).getTime();
       },
     },
+    formattedQueryCheckStartTime: {
+      get() {
+        const timestamp = this.queryParams.checkStartTime;
+        return timestamp ? new Date(timestamp).toISOString().split("T")[0] : '';
+      },
+      set(value) {
+        // 创建一个新的 Date 对象
+        let date = new Date(value);
+
+        // 设置时间为当天的 00:00:00
+        // date.setHours(0, 0, 0, 1);
+
+        // 将日期转换为时间戳
+        this.queryParams.checkStartTime = date.getTime();
+      },
+    },
+    formattedQueryCheckEndTime: {
+      get() {
+        const timestamp = this.queryParams.checkEndTime;
+        return timestamp ? new Date(timestamp).toISOString().split("T")[0] : '';
+      },
+      set(value) {
+        // 创建一个新的 Date 对象
+        let date = new Date(value);
+
+        // 设置时间为当天的 00:00:00
+        // date.setHours(0, 0, 0, 0);
+
+        // 将日期转换为时间戳
+        this.queryParams.checkEndTime = date.getTime();
+      },
+    },
   },
   methods: {
     /** 获取部门列表 页面初始化执行 */
@@ -632,6 +795,8 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.createMethod = 4
+      debugger
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.title === "修改任务数据") {
@@ -676,9 +841,9 @@ export default {
       return '';
     },
     //新增修改时间格式处理
-    handleDateChange(prop) {
+    handleDateChange(prop, type) {
       // 验证日期是否合法
-      const value = this.form[prop];
+      const value = type ? this.queryParams[prop] : this.form[prop];
       if (value) {
         const date = new Date(value);
         if (isNaN(date.getTime())) {

src/main/java/com/sooka/sponest/lawenforcement/record/controller/LawenforcementRecordController.java

@@ -26,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -68,6 +65,13 @@ public class LawenforcementRecordController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(LawenforcementRecord lawenforcementRecord) {
         startPage();
+        Long time = 8 * 60 * 60 * 1000L;
+        if (lawenforcementRecord.getCheckStartTime() != null) {
+            lawenforcementRecord.setCheckStartTime(lawenforcementRecord.getCheckStartTime() - time);
+        }
+        if (lawenforcementRecord.getCheckEndTime() != null) {
+            lawenforcementRecord.setCheckEndTime(lawenforcementRecord.getCheckEndTime() - time);
+        }
         List<LawenforcementRecord> list = lawenforcementRecordService.selectLawenforcementRecordList(lawenforcementRecord);
         return getDataTable(list);
     }
@@ -216,24 +220,24 @@ public class LawenforcementRecordController extends BaseController {
     }
 
     /*
-    * 新增备忘录
-    *
-    * @author 韩福成
-    * @date 2024/11/9 上午10:17
-    */
+     * 新增备忘录
+     *
+     * @author 韩福成
+     * @date 2024/11/9 上午10:17
+     */
     @PostMapping("/addMemorandum")
-    public AjaxResult addMemorandum(@RequestBody LawenforcementMemorandum memorandum){
+    public AjaxResult addMemorandum(@RequestBody LawenforcementMemorandum memorandum) {
         return toAjax(lawenforcementRecordService.addMemorandum(memorandum));
     }
 
     /*
-    * 按执法记录id查询备忘录
-    *
-    * @author 韩福成
-    * @date 2024/11/9 上午11:21
-    */
+     * 按执法记录id查询备忘录
+     *
+     * @author 韩福成
+     * @date 2024/11/9 上午11:21
+     */
     @GetMapping("/getMemorandum")
-    public AjaxResult getMemorandum(LawenforcementMemorandum memorandum){
+    public AjaxResult getMemorandum(LawenforcementMemorandum memorandum) {
         return AjaxResult.success(lawenforcementRecordService.getMemorandum(memorandum));
     }
 }

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecord.java

@@ -275,6 +275,7 @@ public class LawenforcementRecord{
     private List<LawenforcementUser> personList;
 
     private String isRegister;//是否立案填报（1：立案；2：填报）
+    private String isRegisterRecord;//是否立案填报（1：立案；2：填报）
 
 
     @Override

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -290,16 +290,33 @@
         </foreach>
     </insert>
 
-
     <select id="selectLawenforcementRecordList" parameterType="LawenforcementRecord"
             resultMap="LawenforcementRecordResult">
         <include refid="selectLawenforcementRecordVo"/>
         <where>
             <if test="jobName != null  and jobName != ''">and job_name like concat('%', #{jobName}, '%')</if>
+            <if test="jobType != null  and jobType != ''">and job_type like concat('%', #{jobType}, '%')</if>
+            <if test="creatorName != null  and creatorName != ''">and creator_name like concat('%', #{creatorName}, '%')</if>
+            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="checkObjectCode != null  and checkObjectCode != ''">and check_object_code like concat('%', #{checkObjectCode}, '%')</if>
+            <if test="checkObjectName != null  and checkObjectName != ''">and check_object_name like concat('%', #{checkObjectName}, '%')</if>
+            <if test="checkStartTime != null  and checkStartTime != ''">and check_start_time &gt;= #{checkStartTime}</if>
+            <if test="checkEndTime != null  and checkEndTime != ''">and check_end_time &lt;= #{checkEndTime}</if>
+            <if test="createMethod != null  and createMethod != ''">and create_method like concat('%', #{createMethod}, '%')</if>
             <if test="recordStatus != null and recordStatus != ''">
                 and record_status = #{recordStatus}
             </if>
-            <if test="isRegister != null  and isRegister != ''">and is_register = #{isRegister}</if>
+            <if test="isRegister != null  and isRegister != ''">and is_register= #{isRegister}</if>
+            <if test="isRegisterRecord != null  and isRegisterRecord != ''">
+                <choose>
+                    <when test="isRegisterRecord == 3">
+                        and is_register != '0'
+                    </when>
+                    <otherwise>
+                        and is_register = #{isRegisterRecord}
+                    </otherwise>
+                </choose>
+            </if>
         </where>
         order by create_time desc
     </select>