人员新增类型

jfb-lib/src/main/java/data/recruit/Objective.java

@@ -46,4 +46,23 @@ public class Objective extends IdentityObj {
     @TableField("person_id")
     private String personId;
 
+
+    /**
+     * 行业
+     **/
+    @TableField("industry_id")
+    private String industryId;
+
+    /**
+     * 行业
+     **/
+    @TableField("industry_name")
+    private String industryName;
+
+
+    /**
+     * 行业
+     **/
+    @TableField(exist = false)
+    private Person person;
 }

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

@@ -9,13 +9,16 @@ import com.github.pagehelper.PageHelper;
 import com.jfb.recruit.bean.auth.UserContext;
 import com.jfb.recruit.mapper.ObjectiveMapper;
 import com.jfb.recruit.service.ObjectiveService;
+import com.jfb.recruit.service.PersonService;
 import com.jfb.recruit.util.auth.UserUtils;
 import com.jfb.recruit.xsnowflake.SnowFlakeFactory;
 import data.recruit.Objective;
+import data.recruit.Person;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -31,6 +34,9 @@ public class ObjectiveServiceImpl extends ServiceImpl<ObjectiveMapper, Objective
     @Autowired
     SnowFlakeFactory snowFlakeFactory;
 
+    @Resource
+    private PersonService personService;
+
     /**
      * @description: 获取求职意向列表
      * @author: wangmenglong
@@ -47,8 +53,15 @@ public class ObjectiveServiceImpl extends ServiceImpl<ObjectiveMapper, Objective
         qw.eq(Objective::getDel,false)
                 .eq(StringUtils.isNotBlank(objective.getBaseCode()),Objective::getBaseCode, objective.getBaseCode())
                 .eq(StringUtils.isNotBlank(objective.getPersonId()),Objective::getPersonId, objective.getPersonId())
+                .eq(StringUtils.isNotBlank(objective.getIndustryId()), Objective::getIndustryId, objective.getIndustryId())
+                .like(StringUtils.isNotBlank(objective.getIndustryName()),Objective::getIndustryName, objective.getIndustryName())
                 .orderByDesc(Objective::getCreateTime);
         List<Objective> objectiveList = super.list(qw);
+
+        objectiveList.stream().forEach(objective1 -> {
+            objective1.setPerson(personService.getDetails(objective1.getPersonId()));
+        });
+
         //返回查询结果
         return objectiveList;
     }