feat: 求职人员模块增加查询条件

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -36,20 +36,28 @@ public class JobHuntController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                    @RequestParam(required = false) List<String> jobHuntIDList,
-                                    @RequestParam(required = false) String jobUserID,
-                                    @RequestParam(required = false) String jobUserName,
-                                    @RequestParam(required = false) String professionName,
-                                    @RequestParam(required = false) Integer minWorkYear,
-                                    @RequestParam(required = false) Integer maxWorkYear,
-                                    @RequestParam(required = false) Integer jobHuntTypeID,
-                                    @RequestParam(required = false) Integer jobUserTypeID,
-                                    @RequestParam(required = false) BigDecimal minSalary,
-                                    @RequestParam(required = false) BigDecimal maxSalary,
-                                    @RequestParam(required = false) Integer isAccomplish,
-                                    @RequestParam(required = false) String loginUserID) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
-
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish,loginUserID);
+                                @RequestParam(required = false) List<String> jobHuntIDList,
+                                @RequestParam(required = false) String jobUserID,
+                                @RequestParam(required = false) String jobUserName,
+                                @RequestParam(required = false) String professionName,
+                                @RequestParam(required = false) Integer minWorkYear,
+                                @RequestParam(required = false) Integer maxWorkYear,
+                                @RequestParam(required = false) Integer jobHuntTypeID,
+                                @RequestParam(required = false) Integer jobUserTypeID,
+                                @RequestParam(required = false) BigDecimal minSalary,
+                                @RequestParam(required = false) BigDecimal maxSalary,
+                                @RequestParam(required = false) Integer isAccomplish,
+                                @RequestParam(required = false) String loginUserID,
+                                @RequestParam(required = false) String siteID,
+                                @RequestParam(required = false) String regionCode,
+                                @RequestParam(required = false) Date startDate,
+                                @RequestParam(required = false) Date endDate) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
+
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize, jobHuntIDList, jobUserID,
+                jobUserName, professionName, minWorkYear, maxWorkYear,
+                jobHuntTypeID, jobUserTypeID, minSalary, maxSalary,
+                isAccomplish, loginUserID, siteID, regionCode,
+                startDate, endDate);
         return RespGenerstor.success(result);
     }
 
@@ -104,13 +112,18 @@ public class JobHuntController {
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                @RequestParam(required = false) List<String> jobHuntIDList, @RequestParam(required = false) String jobUserID,
-                               @RequestParam(required = false) String jobUserName,@RequestParam(required = false) String workName,
-                               @RequestParam(required = false) Integer minWorkYear,@RequestParam(required = false) Integer maxWorkYear,
-                               @RequestParam(required = false) Integer jobHuntTypeID,@RequestParam(required = false) Integer jobUserTypeID,
+                               @RequestParam(required = false) String jobUserName, @RequestParam(required = false) String workName,
+                               @RequestParam(required = false) Integer minWorkYear, @RequestParam(required = false) Integer maxWorkYear,
+                               @RequestParam(required = false) Integer jobHuntTypeID, @RequestParam(required = false) Integer jobUserTypeID,
                                @RequestParam(required = false) BigDecimal minSalary, @RequestParam(required = false) BigDecimal maxSalary,
-                               @RequestParam(required = false) Integer isAccomplish) throws Exception{
-
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish,null);
+                               @RequestParam(required = false) Integer isAccomplish, @RequestParam(required = false) String siteID,
+                               @RequestParam(required = false) String regionCode, @RequestParam(required = false) Date startDate,
+                               @RequestParam(required = false) Date endDate) throws Exception {
+
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize, jobHuntIDList, jobUserID,
+                jobUserName, workName, minWorkYear, maxWorkYear,
+                jobHuntTypeID, jobUserTypeID, minSalary, maxSalary,
+                isAccomplish, null, siteID, regionCode, startDate, endDate);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "希望工作地区", "可到职日期", "工作年限", "求职类型", "求职岗位", "人才类型", "月薪要求"}));
         int i = 0;

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -20,10 +20,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.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/jobUserService/jobUser")
@@ -51,9 +48,10 @@ public class JobUserController {
                                 @RequestParam(required = false) String jobStatus, @RequestParam(required = false) Integer sexId,
                                 @RequestParam(required = false) Integer educationTypeId, @RequestParam(required = false) Integer emphasisTypeId,
                                 @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime,
-                                @RequestParam(required = false) String loginUserID) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
+                                @RequestParam(required = false) String loginUserID, @RequestParam(required = false) String regionCode,
+                                @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime,loginUserID);
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, loginUserID, regionCode, startDate, endDate);
         return RespGenerstor.success(result);
     }
 
@@ -157,8 +155,9 @@ public class JobUserController {
                                @RequestParam(required = false) List<String> jobUserIDList,
                                @RequestParam(required = false) String name, @RequestParam(required = false) String siteId, @RequestParam(required = false) String jobStatus,
                                @RequestParam(required = false) Integer sexId, @RequestParam(required = false) Integer educationTypeId,
-                               @RequestParam(required = false) Integer emphasisTypeId) throws Exception {
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null,null);
+                               @RequestParam(required = false) Integer emphasisTypeId, @RequestParam(required = false) String regionCode,
+                               @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate) throws Exception {
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null, null, regionCode, startDate, endDate);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);

src/main/java/com/hz/employmentsite/controller/jobUserManager/RecommendMgtController.java

@@ -10,6 +10,7 @@ import com.hz.employmentsite.vo.jobUserManager.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -26,9 +27,11 @@ public class RecommendMgtController {
                                 @RequestParam(required = false) String name, @RequestParam(required = false) String companyName,
                                 @RequestParam(required = false) Integer recommendType, @RequestParam(required = false) Integer entryState,
                                 @RequestParam(required = false) String pushName, @RequestParam(required = false) String qzProfessionName,
-                                @RequestParam(required = false) String zpProfessionName) {
+                                @RequestParam(required = false) String zpProfessionName, @RequestParam(required = false) String siteID,
+                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) Date startDate,
+                                @RequestParam(required = false) Date endDate) {
 
-        PageInfo<RecommendMgtVo> result = recommendMgtService.getList(pageIndex, pageSize, name, companyName, recommendType, entryState, pushName, qzProfessionName, zpProfessionName);
+        PageInfo<RecommendMgtVo> result = recommendMgtService.getList(pageIndex, pageSize, name, companyName, recommendType, entryState, pushName, qzProfessionName, zpProfessionName, siteID, regionCode, startDate, endDate);
         return RespGenerstor.success(result);
     }
 

src/main/java/com/hz/employmentsite/mapper/cquery/JobHuntCQuery.java

@@ -2,14 +2,18 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
 import org.apache.ibatis.annotations.Param;
+
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 public interface JobHuntCQuery {
-    List<JobHuntVo> getJobHuntList(@Param("jobHuntIDList") String jobHuntIDList,@Param("jobUserID") String jobUserID,
-                                      @Param("jobUserName") String jobUserName,@Param("professionName") String professionName,
-                                      @Param("minWorkYear")Integer minWorkYear,@Param("maxWorkYear")Integer maxWorkYear,
-                                      @Param("jobHuntTypeID")Integer jobHuntTypeID, @Param("jobUserTypeID")Integer jobUserTypeID,
-                                      @Param("minSalary")BigDecimal minSalary, @Param("maxSalary")BigDecimal maxSalary,
-                                      @Param("isAccomplish")Integer isAccomplish,@Param("curLoginUserSiteJobUserIDs")String curLoginUserSiteJobUserIDs);
+    List<JobHuntVo> getJobHuntList(@Param("jobHuntIDList") String jobHuntIDList, @Param("jobUserID") String jobUserID,
+                                   @Param("jobUserName") String jobUserName, @Param("professionName") String professionName,
+                                   @Param("minWorkYear") Integer minWorkYear, @Param("maxWorkYear") Integer maxWorkYear,
+                                   @Param("jobHuntTypeID") Integer jobHuntTypeID, @Param("jobUserTypeID") Integer jobUserTypeID,
+                                   @Param("minSalary") BigDecimal minSalary, @Param("maxSalary") BigDecimal maxSalary,
+                                   @Param("isAccomplish") Integer isAccomplish, @Param("curLoginUserSiteJobUserIDs") String curLoginUserSiteJobUserIDs,
+                                   @Param("siteID") String siteID, @Param("regionCode") String regionCode,
+                                   @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 }

src/main/java/com/hz/employmentsite/mapper/cquery/JobUserCQuery.java

@@ -3,6 +3,7 @@ package com.hz.employmentsite.mapper.cquery;
 import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface JobUserCQuery {
@@ -10,5 +11,7 @@ public interface JobUserCQuery {
                                       @Param("siteId") String siteId, @Param("jobStatus") String jobStatus,
                                       @Param("sexId") Integer sexId, @Param("educationTypeId") Integer educationTypeId,
                                       @Param("emphasisTypeId") Integer emphasisTypeId, @Param("createUserId") String createUserId,
-                                      @Param("workTime") String workTime,@Param("curLoginUserSiteID") String curLoginUserSiteID);
+                                      @Param("workTime") String workTime, @Param("curLoginUserSiteID") String curLoginUserSiteID,
+                                      @Param("regionCode") String regionCode, @Param("startDate") Date startDate,
+                                      @Param("endDate") Date endDate);
 }

src/main/java/com/hz/employmentsite/mapper/cquery/RecommendMgtCQuery.java

@@ -3,6 +3,7 @@ package com.hz.employmentsite.mapper.cquery;
 import com.hz.employmentsite.vo.jobUserManager.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -14,7 +15,11 @@ public interface RecommendMgtCQuery {
                                              @Param("entryState") Integer entryState,
                                              @Param("pushName") String pushName,
                                              @Param("qzProfessionName") String qzProfessionName,
-                                             @Param("zpProfessionName") String zpProfessionName);
+                                             @Param("zpProfessionName") String zpProfessionName,
+                                             @Param("siteID") String siteID,
+                                             @Param("regionCode") String regionCode,
+                                             @Param("startDate") Date startDate,
+                                             @Param("endDate") Date endDate);
 
     /**
      * 获取推荐岗位信息

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -48,23 +48,28 @@ public class JobHuntServiceImpl implements JobHuntService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList,String jobUserID, String jobUserName, String professionName,
+    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                        Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
-                                       BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish,String loginUserID) {
+                                       BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID,
+                                       String siteID, String regionCode, Date startDate, Date endDate) {
         PageHelper.startPage(pageIndex, pageSize);
         List<String> curLoginUserSiteJobUserIDs = new ArrayList<>();
-        if(!stringUtils.IsNullOrEmpty(loginUserID)){
+        if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             siteUserExp.or().andUserIDEqualTo(loginUserID);
             var curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
             PcJobuserExample jobUserExp = new PcJobuserExample();
             jobUserExp.or().andSiteIDEqualTo(curLoginUserSiteID);
             var curLoginUserSiteJobUserList = pcJobuserMapper.selectByExample(jobUserExp).stream().toList();
-            for(PcJobuser curLoginUserSiteJobUser : curLoginUserSiteJobUserList){
+            for (PcJobuser curLoginUserSiteJobUser : curLoginUserSiteJobUserList) {
                 curLoginUserSiteJobUserIDs.add(curLoginUserSiteJobUser.getJobuserID());
             }
         }
-        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList),jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish,stringUtils.ListToInSql(curLoginUserSiteJobUserIDs));
+        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList), jobUserID, jobUserName,
+                professionName, minWorkYear, maxWorkYear,
+                jobHuntTypeID, jobUserTypeID, minSalary,
+                maxSalary, isAccomplish, stringUtils.ListToInSql(curLoginUserSiteJobUserIDs),
+                siteID, regionCode, startDate, endDate);
 
         PageInfo<JobHuntVo> result = new PageInfo(list);
 
@@ -79,8 +84,8 @@ public class JobHuntServiceImpl implements JobHuntService {
         }else{
             ids.add(jobHuntId);
         }
-        JobHuntVo model = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(ids),null,null,null,null,null,
-                null,null,null,null,null,null).stream().findFirst().orElse(null);
+        JobHuntVo model = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(ids), null, null, null, null, null,
+                null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
         return model;
     }
 

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -48,7 +48,9 @@ public class JobUserServiceImpl implements JobUserService {
                                        String siteId, String jobStatus,
                                        Integer sexId, Integer educationTypeId,
                                        Integer emphasisTypeId, String createUserId,
-                                       String workTime,String loginUserID) {
+                                       String workTime, String loginUserID,
+                                       String regionCode, Date startDate,
+                                       Date endDate) {
         PageHelper.startPage(pageIndex, pageSize);
         String curLoginUserSiteID = "";
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
@@ -56,7 +58,7 @@ public class JobUserServiceImpl implements JobUserService {
             siteUserExp.or().andUserIDEqualTo(loginUserID);
             curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
         }
-        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, curLoginUserSiteID);
+        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, curLoginUserSiteID, regionCode, startDate, endDate);
         // 身份证脱敏
         list.forEach(item -> {
             item.setAge(dateUtils.getAgeForIdCard(item.getIdentityNumber()));
@@ -69,7 +71,7 @@ public class JobUserServiceImpl implements JobUserService {
 
     @Override
     public List<SelectProps> getDataList() {
-        var dataList = getList(1, 99999, null, null, null, null, null, null, null, null, null,null).getList();
+        var dataList = getList(1, 99999, null, null, null, null, null, null, null, null, null, null, null, null, null).getList();
         List<SelectProps> dataResult = new ArrayList<>();
         for (var item: dataList) {
             SelectProps  itemResult = new SelectProps();
@@ -88,7 +90,7 @@ public class JobUserServiceImpl implements JobUserService {
         }else{
             ids.add(id);
         }
-        return jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null,null).stream().findFirst().orElse(null);
+        return jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
     }
 
     @Override

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/RecommendMgtServiceImpl.java

@@ -13,7 +13,6 @@ import com.hz.employmentsite.services.service.jobUserManager.RecommendMgtService
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.jobUserManager.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,10 +33,14 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
     private WechatService wechatService;
 
     @Override
-    public PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String qzProfessionName, String zpProfessionName) {
+    public PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name,
+                                            String companyName, Integer recommendType, Integer entryState,
+                                            String pushName, String qzProfessionName, String zpProfessionName,
+                                            String siteID, String regionCode, Date startDate,
+                                            Date endDate) {
         PageHelper.startPage(page, rows);
 
-        List<RecommendMgtVo> list = recommendMgtCQuery.getRecommendMgtList(null, name, companyName, recommendType, entryState, pushName, qzProfessionName, zpProfessionName);
+        List<RecommendMgtVo> list = recommendMgtCQuery.getRecommendMgtList(null, name, companyName, recommendType, entryState, pushName, qzProfessionName, zpProfessionName, siteID, regionCode, startDate, endDate);
 
         PageInfo<RecommendMgtVo> result = new PageInfo(list);
 
@@ -46,7 +49,7 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
 
     @Override
     public RecommendMgtVo getListById(String recommendMgtID) {
-        RecommendMgtVo data = recommendMgtCQuery.getRecommendMgtList(recommendMgtID,null,null,null,null,null,null, null).stream().findFirst().orElse(null);
+        RecommendMgtVo data = recommendMgtCQuery.getRecommendMgtList(recommendMgtID, null, null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
         if(data==null){
             throw new BaseException("500","未查询到数据");
         }

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobHuntService.java

@@ -2,14 +2,17 @@ package com.hz.employmentsite.services.service.jobUserManager;
 
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
+
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 public interface JobHuntService {
 
-    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize,List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
+    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                 Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
-                                BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID);
+                                BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID,
+                                String siteID, String regionCode, Date startDate, Date endDate);
 
     JobHuntVo get(String jobHuntId);
 

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobUserService.java

@@ -7,6 +7,7 @@ import com.hz.employmentsite.model.PcPost;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 
+import java.util.Date;
 import java.util.List;
 
 public interface JobUserService {
@@ -15,7 +16,9 @@ public interface JobUserService {
                                 String siteId, String jobStatus,
                                 Integer sexId, Integer educationTypeId,
                                 Integer emphasisTypeId, String createUserId,
-                                String workTime,String loginUserID);
+                                String workTime, String loginUserID,
+                                String regionCode, Date startDate,
+                                Date endDate);
 
     JobUserVo getDataById(String id);
 

src/main/java/com/hz/employmentsite/services/service/jobUserManager/RecommendMgtService.java

@@ -3,18 +3,22 @@ package com.hz.employmentsite.services.service.jobUserManager;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.model.PcRecommendMgt;
 import com.hz.employmentsite.vo.jobUserManager.*;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Date;
 import java.util.List;
 
 public interface RecommendMgtService {
-    PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String qzProfessionName, String zpProfessionName);
+    PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name,
+                                     String companyName, Integer recommendType, Integer entryState,
+                                     String pushName, String qzProfessionName, String zpProfessionName,
+                                     String siteID, String regionCode, Date startDate,
+                                     Date endDate);
 
     RecommendMgtVo getListById(String recommendMgtID);
 
     /**
      * 修改入职状态
+     *
      * @param id
      * @param state 入职状态
      */

src/main/resources/mapping/cquery/JobHuntCQuery.xml

@@ -62,6 +62,22 @@
         <if test="isAccomplish != '' and isAccomplish != null">
             and rmgt.EntryState = #{isAccomplish}
         </if>
+        <if test="siteID != null and siteID != ''">
+            and jobuser.siteId = #{siteID}
+        </if>
+        <if test="regionCode != '' and regionCode != null">
+            and jobuser.RegionCode = #{regionCode}
+        </if>
+        <if test="startDate != null and endDate == null">
+            and jobHunt.CreateTime <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null and startDate == null">
+            and jobHunt.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and jobHunt.CreateTime <![CDATA[ >= ]]> #{startDate}
+            and jobHunt.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
         group by jobHunt.JobHuntID, jobHunt.JobUserID, jobHunt.ProfessionID, jobHunt.WorkCode, jobHunt.WorkName,
         jobHunt.AreaWork, jobHunt.InDate, jobHunt.WorkYear, jobHunt.JobHuntType, jobHunt.JobUserType, jobHunt.MinSalary,
         jobHunt.MaxSalary, jobHunt.CreateUserID, jobHunt.CreateTime, jobHunt.ModifyUserID, jobHunt.ModifyTime,

src/main/resources/mapping/cquery/JobUserCQuery.xml

@@ -80,7 +80,19 @@
         <if test="workTime!='' and workTime!=null">
             and Date(jobuser.CreateTime) = Date(#{workTime})
         </if>
-
+        <if test="regionCode != '' and regionCode != null">
+            and jobuser.RegionCode = #{regionCode}
+        </if>
+        <if test="startDate != null and endDate == null">
+            and jobuser.CreateTime <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null and startDate == null">
+            and jobuser.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and jobuser.CreateTime <![CDATA[ >= ]]> #{startDate}
+            and jobuser.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
         order by jobuser.CreateTime desc
     </select>
 </mapper>

src/main/resources/mapping/cquery/RecommendMgtCQuery.xml

@@ -57,6 +57,22 @@
             <if test="zpProfessionName != '' and zpProfessionName != null">
                 and f.ProfessionName like Concat('%',#{zpProfessionName},'%')
             </if>
+            <if test="siteID != null and siteID != ''">
+                and e.siteId = #{siteID}
+            </if>
+            <if test="regionCode != '' and regionCode != null">
+                and e.RegionCode = #{regionCode}
+            </if>
+            <if test="startDate != null and endDate == null">
+                and a.CreateTime <![CDATA[ >= ]]> #{startDate}
+            </if>
+            <if test="endDate != null and startDate == null">
+                and a.CreateTime <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test="startDate != null and endDate != null">
+                and a.CreateTime <![CDATA[ >= ]]> #{startDate}
+                and a.CreateTime <![CDATA[ <= ]]> #{endDate}
+            </if>
         </where>
         order by a.createtime desc
     </select>

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -101,9 +101,43 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="6"></a-col>
-        <a-col :span="8"></a-col>
-        <a-col :span="4" style="text-align: left"></a-col>
+        <a-col :span="6">
+          <a-form-item label="所属驿站" :label-col="{ span: 8 }" name="siteID">
+            <a-select
+              ref="select"
+              v-model:value="searchParamsState.siteID"
+              :options="siteList"
+              :field-names="{ label: 'siteName', value: 'siteID' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="所属县区" :label-col="{span:8}" name="regionCode">
+            <a-select
+              ref="select"
+              v-model:value="searchParamsState.regionCode"
+              :options="regionList"
+              :field-names="{ label: 'name', value: 'code' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="登记时间" :label-col="{ span: 8 }" name="isAccomplish">
+            <a-date-picker v-model:value="searchParamsState.startDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 115px;"/>
+            <label style="margin:10px;">-</label>
+            <a-date-picker v-model:value="searchParamsState.endDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 115px"/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
@@ -160,6 +194,8 @@ import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
 import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps";
 import {useTabsViewStore} from "@/store/modules/tabsView";
 import Recommend from "@/views/jobUserManager/jobhunt/recommend.vue";
+import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {get} from "@/api/common";
 
 export default defineComponent({
   name: 'JobHuntList',
@@ -180,7 +216,11 @@ export default defineComponent({
       jobUserTypeID: null,
       minSalary: null,
       maxSalary: null,
-      isAccomplish: null
+      isAccomplish: null,
+      siteID: null,
+      regionCode: null,
+      startDate: null,
+      endDate: null
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {
@@ -256,6 +296,8 @@ export default defineComponent({
     const jobHuntTypeList = ref<SelectProps['options']>();
     const jobUserTypeList = ref<SelectProps['options']>();
     const isAccomplishList = ref<SelectProps['options']>();
+    const siteList = ref<Array<any>>([]);
+    const regionList = ref<SelectProps['options']>();
     const showSalary = (minSalary: any, maxSalary: any) => {
       if (minSalary != null) {
         if (maxSalary != null) {
@@ -317,6 +359,18 @@ export default defineComponent({
       });
     };
 
+    function getAllSites() {
+      getSiteList({pageIndex: 1, pageSize: 9999}).then((result: any) => {
+        siteList.value = result.list;
+      })
+    }
+
+    function getAllRegion() {
+      get('system/area/getCityList', {}).then(data => {
+        regionList.value = data;
+      });
+    }
+
     const loadData = async function () {
       formState.loading = true;
       getJobHuntTypeList();
@@ -396,10 +450,16 @@ export default defineComponent({
       getJobHuntTypeList,
       getJobUserTypeList,
       getIsAccomplishList,
-      onDetail
+      onDetail,
+      getAllSites,
+      getAllRegion,
+      siteList,
+      regionList
     };
   },
   created() {
+    this.getAllSites();
+    this.getAllRegion();
     this.loadData();
   },
   activated() {

vue/src/views/jobUserManager/jobuser/index.vue

@@ -100,6 +100,30 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="所属县区" :label-col="{span:8}" name="regionCode">
+            <a-select
+                ref="select"
+                v-model:value="searchParamsState.regionCode"
+                :options="regionList"
+                :field-names="{ label: 'name', value: 'code' }"
+                :allow-clear="true"
+                @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="登记时间" :label-col="{ span: 8 }">
+            <a-date-picker v-model:value="searchParamsState.startDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 115px;"/>
+            <label style="margin:10px;">-</label>
+            <a-date-picker v-model:value="searchParamsState.endDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 115px"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01030102">新增</a-button>
@@ -146,6 +170,7 @@ import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from "@ant-design/i
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import BImportExcel from "@/components/basic/excel/importExcel/importExcel.vue";
 import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {get} from "@/api/common";
 
 export default defineComponent({
   name: 'JobUserList',
@@ -163,7 +188,10 @@ export default defineComponent({
       jobStatus: null,
       sexId: null,
       educationTypeId: null,
-      emphasisTypeId: null
+      emphasisTypeId: null,
+      startDate: "",
+      endDate: "",
+      regionCode: ""
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {
@@ -212,6 +240,7 @@ export default defineComponent({
     const sexTypeList = ref<SelectProps['options']>();
     const educationTypeList = ref<SelectProps['options']>();
     const emphasisTypeList = ref<SelectProps['options']>();
+    const regionList = ref<SelectProps['options']>();
 
     const onSelectChange = (selectedRowKeys: any) => {
       formState.selectedRowKeys = selectedRowKeys;
@@ -230,6 +259,10 @@ export default defineComponent({
       loadData();
     };
 
+    get('system/area/getCityList', {}).then(data => {
+      regionList.value = data;
+    });
+
     const loadData = async function () {
       formState.loading = true;
       getAllSites();
@@ -337,7 +370,8 @@ export default defineComponent({
       getEmphasisTypeList,
       onVitae,
       expand,
-      exportSearchParams
+      exportSearchParams,
+      regionList
     };
   },
   created() {

vue/src/views/jobUserManager/recommendMgt/index.vue

@@ -84,6 +84,45 @@
             <a-input v-model:value="searchParamsState.pushName" placeholder=""/>
           </a-form-item>
         </a-col>
+        <a-col :span="6">
+          <a-form-item label="所属驿站" :label-col="{ span: 8 }" name="siteID">
+            <a-select
+              ref="select"
+              v-model:value="searchParamsState.siteID"
+              :options="siteList"
+              :field-names="{ label: 'siteName', value: 'siteID' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="所属县区" :label-col="{span:8}" name="regionCode">
+            <a-select
+              ref="select"
+              v-model:value="searchParamsState.regionCode"
+              :options="regionList"
+              :field-names="{ label: 'name', value: 'code' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="登记时间" :label-col="{ span: 8 }" name="isAccomplish">
+            <a-date-picker v-model:value="searchParamsState.startDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 115px;"/>
+            <label style="margin:10px;">-</label>
+            <a-date-picker v-model:value="searchParamsState.endDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 115px"/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right"></a-col>
@@ -125,6 +164,8 @@ import {getList, setEntryState} from '@/api/jobUserManager/recommendMgt';
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getPaginationTotalTitle} from '@/utils/common';
 import dayjs from "dayjs";
+import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {get} from "@/api/common";
 
 export default defineComponent({
   name: 'recommendMgtList',
@@ -143,7 +184,11 @@ export default defineComponent({
       entryState: null,
       pushName: '',
       zpProfessionName: '',
-      qzProfessionName: ''
+      qzProfessionName: '',
+      siteID: null,
+      regionCode: null,
+      startDate: null,
+      endDate: null
     });
     const formState = reactive({
       total: 0,
@@ -174,6 +219,8 @@ export default defineComponent({
       },
       {title: '操作', key: 'operation', width: 100, align: 'center'},
     ];
+    const siteList = ref<Array<any>>([]);
+    const regionList = ref<SelectProps['options']>();
     const pagination = computed(() => ({
       total: formState.total,
       current: searchParamsState.pageIndex,
@@ -203,6 +250,18 @@ export default defineComponent({
       loadData();
     };
 
+    function getAllSites() {
+      getSiteList({pageIndex: 1, pageSize: 9999}).then((result: any) => {
+        siteList.value = result.list;
+      })
+    }
+
+    function getAllRegion() {
+      get('system/area/getCityList', {}).then(data => {
+        regionList.value = data;
+      });
+    }
+
     const loadData = async function () {
       formState.loading = true;
       const result: any = await getList(searchParamsState);
@@ -248,13 +307,19 @@ export default defineComponent({
       onFinish,
       getRecommendTypeList,
       getEntryStateList,
-      expand
+      expand,
+      siteList,
+      regionList,
+      getAllSites,
+      getAllRegion,
     };
   },
   created() {
     this.loadData();
     this.getRecommendTypeList();
     this.getEntryStateList();
+    this.getAllSites();
+    this.getAllRegion();
   },
   activated() {
     if (history.state.params?.reload) this.loadData();