Ver código fonte

支部会议管理、支部党课学习 - 搜索栏

Wang Zi Wen 2 anos atrás
pai
commit
6ee91d3169

+ 5 - 7
ruoyi-system/src/main/resources/mapper/branch/TBranchMeetingMapper.xml

@@ -55,18 +55,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="meetingId != null "> and u.meeting_id = #{meetingId}</if>
             <if test="meetingType != null  and meetingType != ''"> and u.meeting_type = #{meetingType}</if>
             <if test="meetingTime != null "> and u.meeting_time = #{meetingTime}</if>
-            <if test="meetingVenue != null  and meetingVenue != ''"> and u.meeting_venue = #{meetingVenue}</if>
+            <if test="meetingVenue != null  and meetingVenue != ''"> and u.meeting_venue like concat(concat('%', #{meetingVenue}), '%')</if>
             <if test="host != null  and host != ''"> and u.host = #{host}</if>
             <if test="recorder != null  and recorder != ''"> and u.recorder = #{recorder}</if>
             <if test="participants != null  and participants != ''"> and u.participants = #{participants}</if>
             <if test="absentees != null  and absentees != ''"> and u.absentees = #{absentees}</if>
             <if test="attendees != null  and attendees != ''"> and u.attendees = #{attendees}</if>
-            <if test="mainTopics != null  and mainTopics != ''"> and u.main_topics = #{mainTopics}</if>
-            <if test="resolutionsFormed != null  and resolutionsFormed != ''"> and u.resolutions_formed = #{resolutionsFormed}</if>
-            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
-            <if test="deptId != null and deptId != 0">
-                AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) <![CDATA[ <> ]]> 0 )))
-            </if>
+            <if test="mainTopics != null  and mainTopics != ''"> and u.main_topics like concat(concat('%', #{mainTopics}), '%')</if>
+            <if test="resolutionsFormed != null  and resolutionsFormed != ''"> and u.resolutions_formed like concat(concat('%', #{resolutionsFormed}), '%')</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks like concat(concat('%', #{remarks}), '%')</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
             and u.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 4 - 6
ruoyi-system/src/main/resources/mapper/branch/TBranchStudyMapper.xml

@@ -50,16 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="studyId != null "> and u.study_id = #{studyId}</if>
             <if test="studyTime != null "> and u.study_time = #{studyTime}</if>
-            <if test="studyVenue != null  and studyVenue != ''"> and u.study_venue = #{studyVenue}</if>
+            <if test="studyVenue != null  and studyVenue != ''"> and u.study_venue like concat(concat('%', #{studyVenue}), '%')</if>
             <if test="lecturer != null  and lecturer != ''"> and u.lecturer = #{lecturer}</if>
             <if test="recorder != null  and recorder != ''"> and u.recorder = #{recorder}</if>
             <if test="participants != null  and participants != ''"> and u.participants = #{participants}</if>
             <if test="absentees != null  and absentees != ''"> and u.absentees = #{absentees}</if>
-            <if test="contents != null  and contents != ''"> and u.contents = #{contents}</if>
-            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
-            <if test="deptId != null and deptId != 0">
-                AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) <![CDATA[ <> ]]> 0 )))
-            </if>
+            <if test="contents != null  and contents != ''"> and u.contents like concat(concat('%', #{contents}), '%')</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks like concat(concat('%', #{remarks}), '%')</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
             and u.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 33 - 1
ruoyi-ui/src/views/branch/meeting/index.vue

@@ -1,7 +1,39 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="会议类型" prop="meetingType">
+        <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型">
+          <el-option
+            v-for="dict in meetingTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间" prop="meetingTime">
+        <el-date-picker clearable
+                        v-model="queryParams.meetingTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地点" prop="meetingVenue">
+        <el-input v-model="queryParams.meetingVenue" placeholder="请输入地点" />
+      </el-form-item>
+      <el-form-item label="主要议题" prop="mainTopics">
+        <el-input v-model="queryParams.mainTopics" placeholder="请输入主要议题" />
+      </el-form-item>
+      <el-form-item label="形成决议" prop="resolutionsFormed">
+        <el-input v-model="queryParams.resolutionsFormed" placeholder="请输入形成决议" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="queryParams.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </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>

+ 20 - 1
ruoyi-ui/src/views/branch/study/index.vue

@@ -1,7 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="时间" prop="studyTime">
+        <el-date-picker clearable
+                        v-model="queryParams.studyTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地点" prop="studyVenue">
+        <el-input v-model="queryParams.studyVenue" placeholder="请输入地点" />
+      </el-form-item>
+      <el-form-item label="内容" prop="contents">
+        <el-input v-model="queryParams.contents" placeholder="请输入内容" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="queryParams.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </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>