党员关系转移记录 - 搜索栏

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchMemTransfer.java

@@ -54,7 +54,19 @@ public class TBranchMemTransfer extends BaseEntity
     @Excel(name = "部门id")
     private Long deptId;
 
-    public void setTransferId(Long transferId) 
+    /** 用户昵称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public void setTransferId(Long transferId)
     {
         this.transferId = transferId;
     }

ruoyi-system/src/main/resources/mapper/branch/TBranchMemTransferMapper.xml

@@ -18,10 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectTBranchMemTransferVo">
-        select u.transfer_id, u.user_id, u.old_dept_id, u.new_dept_id, u.transfer_time, u.dues_paid_to, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id from t_branch_mem_transfer u left join sys_dept d on u.dept_id = d.dept_id
+        select u.transfer_id, u.user_id, u.old_dept_id, u.new_dept_id, u.transfer_time, u.dues_paid_to, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
+        us.NICK_NAME
+        from t_branch_mem_transfer u
+          left join sys_dept d on u.dept_id = d.dept_id
+          left join SYS_USER us on us.user_id = u.user_id
     </sql>
 
     <select id="selectTBranchMemTransferList" parameterType="TBranchMemTransfer" resultMap="TBranchMemTransferResult">
@@ -33,8 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="newDeptId != null "> and u.new_dept_id = #{newDeptId}</if>
             <if test="transferTime != null "> and u.transfer_time = #{transferTime}</if>
             <if test="duesPaidTo != null "> and u.dues_paid_to = #{duesPaidTo}</if>
-            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</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>
+            <if test="nickName != null  and nickName != ''"> and us.nick_name like concat(concat('%', #{nickName}), '%')</if>
             and u.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ruoyi-ui/src/views/branch/transfer/index.vue

@@ -1,53 +1,36 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px" label-position="right">
+      <el-form-item label="姓名" prop="nickName">
+        <el-input v-model="queryParams.nickName" placeholder="请输入姓名" />
       </el-form-item>
-      <el-form-item label="原支部id" prop="oldDeptId">
-        <el-input
-          v-model="queryParams.oldDeptId"
-          placeholder="请输入原支部id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="原支部" prop="oldDeptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.oldDeptId" :options="deptOptions" :show-count="true" placeholder="请选择原支部" />
       </el-form-item>
-      <el-form-item label="转入支部id" prop="newDeptId">
-        <el-input
-          v-model="queryParams.newDeptId"
-          placeholder="请输入转入支部id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="转入支部" prop="newDeptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.newDeptId" :options="deptOptions" :show-count="true" placeholder="请选择转入支部" />
       </el-form-item>
       <el-form-item label="调转日期" prop="transferTime">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.transferTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择调转日期">
+                        v-model="queryParams.transferTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择调转日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="党费交至日期" prop="duesPaidTo">
+      <el-form-item label="党费交至日期" prop="duesPaidTo" label-width="102px">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.duesPaidTo"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择党费交至日期">
+                        v-model="queryParams.duesPaidTo"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择党费交至日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <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>