增加查询条件

jfb-recruit/src/main/java/com/jfb/recruit/controller/SignRecordController.java

@@ -59,7 +59,8 @@ public class SignRecordController extends BaseController {
         String personIdno = req.getParameter("personIdno");
         String personName = req.getParameter("personName");
         String name = req.getParameter("name");
-        List<Recruit> list = recruitService.listBySignRecordAdmin(pageNum,pageSize,personIdno,personName,name);
+        String userName = req.getParameter("userName");
+        List<Recruit> list = recruitService.listBySignRecordAdmin(pageNum,pageSize,personIdno,personName,name,userName);
         PageInfo<Recruit> pageInfo = new PageInfo<Recruit>(list);
         return BaseResult.success(pageInfo);
     }

jfb-recruit/src/main/java/com/jfb/recruit/mapper/RecruitMapper.java

@@ -36,6 +36,9 @@ public interface RecruitMapper extends BaseMapper<Recruit> {
             "<if test='name != null and name != \"\"'>" +
             "  AND r.name like CONCAT('%', #{name}, '%')" +
             "</if>" +
+            "<if test='userName != null and userName != \"\"'>" +
+            "  AND r.user_name like CONCAT('%', #{userName}, '%')" +
+            "</if>" +
             "<if test='personId != null and personId != \"\"'>" +
             "  AND rt.person_id = #{personId}" +
             "</if>" +
@@ -51,6 +54,6 @@ public interface RecruitMapper extends BaseMapper<Recruit> {
             "ORDER BY rt.create_time DESC" +
             "</script>")
     List<Recruit> listBySignRecord(@Param("personId") String personId,@Param("personIdno") String personIdno,@Param("personName") String personName
-            ,@Param("name") String name,@Param("adminType") String adminType,@Param("adminId") String adminId);
+            ,@Param("name") String name,@Param("adminType") String adminType,@Param("adminId") String adminId,@Param("userName") String userName);
 
 }

jfb-recruit/src/main/java/com/jfb/recruit/service/RecruitService.java

@@ -17,7 +17,7 @@ public interface RecruitService {
 
     List<Recruit> listBySignRecord(int pageNum, int pageSize, String personId);
 
-    List<Recruit> listBySignRecordAdmin(int pageNum, int pageSize,String personIdno,String personName,String name);
+    List<Recruit> listBySignRecordAdmin(int pageNum, int pageSize,String personIdno,String personName,String name,String userName);
 
     List<Recruit> list(int pageNum, int pageSize, Recruit recruit);
 

jfb-recruit/src/main/java/com/jfb/recruit/service/impl/RecruitServiceImpl.java

@@ -65,7 +65,7 @@ public class RecruitServiceImpl extends ServiceImpl<RecruitMapper, Recruit> impl
      * @return: java.util.List<data.recruit.Recruit>
      **/
     @Override
-    public List<Recruit> listBySignRecordAdmin(int pageNum, int pageSize,String personIdno,String personName,String name) {
+    public List<Recruit> listBySignRecordAdmin(int pageNum, int pageSize,String personIdno,String personName,String name,String userName) {
         //启动分页工具
         PageHelper.startPage(pageNum, pageSize);
 
@@ -76,7 +76,7 @@ public class RecruitServiceImpl extends ServiceImpl<RecruitMapper, Recruit> impl
             adminType = userContext.getType();
         }
 
-        List<Recruit> orgList = recruitMapper.listBySignRecord(null,personIdno,personName,name,adminType,userContext.getUserId());
+        List<Recruit> orgList = recruitMapper.listBySignRecord(null,personIdno,personName,name,adminType,userContext.getUserId(),userName);
 
         orgList.stream().forEach(recruit -> {
             recruit.setPerson(personService.getDetails(recruit.getPersonId()));
@@ -99,7 +99,7 @@ public class RecruitServiceImpl extends ServiceImpl<RecruitMapper, Recruit> impl
     public List<Recruit> listBySignRecord(int pageNum, int pageSize, String personId) {
         //启动分页工具
         PageHelper.startPage(pageNum, pageSize);
-        List<Recruit> orgList = recruitMapper.listBySignRecord(personId,null,null,null,null,null);
+        List<Recruit> orgList = recruitMapper.listBySignRecord(personId,null,null,null,null,null,null);
 
         orgList.stream().forEach(returnRecruit -> {
             returnRecruit.setOrg(orgService.getDetails(returnRecruit.getOrgId()));