1、接口细节对接

admin-hanhai-vue/src/views/employAhthenticationCompany/EmployAhthenticationCompanyList.vue

@@ -4,6 +4,26 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="企业名称">
+              <a-input placeholder="请输入企业名称" v-model="queryParam.companyName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="审核状态">
+              <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.status" dictCode="employ_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -16,7 +36,7 @@
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
-      <!-- 高级查询区域 -->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
 <!--        <a-menu slot="overlay">-->
@@ -148,6 +168,11 @@
             dataIndex: 'businessLicense',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'招聘者职位',
+            align:"center",
+            dataIndex: 'career'
+          },
           {
             title:'审核状态',
             align:"center",
@@ -202,6 +227,7 @@
         fieldList.push({type:'string',value:'legalPerson',text:'企业法人',dictCode:''})
         fieldList.push({type:'string',value:'socialCode',text:'社会统一信用代码',dictCode:''})
         fieldList.push({type:'string',value:'businessLicense',text:'工商营业执照',dictCode:''})
+        fieldList.push({type:'string',value:'career',text:'招聘者职位',dictCode:''})
         fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'employ_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''})

admin-hanhai-vue/src/views/employAhthenticationCompany/modules/EmployAhthenticationCompanyForm.vue

@@ -28,6 +28,11 @@
               <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招聘者职位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="career">
+              <a-input v-model="model.career" placeholder="请输入招聘者职位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
               <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择审核状态" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 企业信息实名认证表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-29
  * @Version: V1.0
  */
 @Data
@@ -67,6 +67,10 @@ public class EmployAhthenticationCompany implements Serializable {
 	@Excel(name = "工商营业执照", width = 15)
     @ApiModelProperty(value = "工商营业执照")
     private java.lang.String businessLicense;
+	/**招聘者职位*/
+	@Excel(name = "招聘者职位", width = 15)
+    @ApiModelProperty(value = "招聘者职位")
+    private java.lang.String career;
 	/**审核状态*/
 	@Excel(name = "审核状态", width = 15, dicCode = "employ_status")
 	@Dict(dicCode = "employ_status")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 企业信息实名认证表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-29
  * @Version: V1.0
  */
 public interface EmployAhthenticationCompanyMapper extends BaseMapper<EmployAhthenticationCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue

@@ -4,6 +4,26 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="企业名称">
+              <a-input placeholder="请输入企业名称" v-model="queryParam.companyName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="审核状态">
+              <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.status" dictCode="employ_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -148,6 +168,11 @@
             dataIndex: 'businessLicense',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'招聘者职位',
+            align:"center",
+            dataIndex: 'career'
+          },
           {
             title:'审核状态',
             align:"center",
@@ -202,6 +227,7 @@
         fieldList.push({type:'string',value:'legalPerson',text:'企业法人',dictCode:''})
         fieldList.push({type:'string',value:'socialCode',text:'社会统一信用代码',dictCode:''})
         fieldList.push({type:'string',value:'businessLicense',text:'工商营业执照',dictCode:''})
+        fieldList.push({type:'string',value:'career',text:'招聘者职位',dictCode:''})
         fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'employ_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue

@@ -28,6 +28,11 @@
               <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招聘者职位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="career">
+              <a-input v-model="model.career" placeholder="请输入招聘者职位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
               <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择审核状态" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts

@@ -30,6 +30,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'businessLicense',
     customRender:render.renderAvatar,
    },
+   {
+    title: '招聘者职位',
+    align:"center",
+    dataIndex: 'career'
+   },
    {
     title: '审核状态',
     align:"center",
@@ -48,6 +53,21 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "企业名称",
+      field: "companyName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "审核状态",
+      field: "status",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_status"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -78,6 +98,11 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '招聘者职位',
+    field: 'career',
+    component: 'Input',
+  },
   {
     label: '审核状态',
     field: 'status',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/entity/EmployResume.java

@@ -134,4 +134,19 @@ public class EmployResume implements Serializable {
     //实名信息
     @TableField(exist = false)
     EmployAuthenticationPerson employAuthenticationPerson;
+
+
+    //期望工作地点
+    @TableField(exist = false)
+    String expectAddressName;
+
+    //工作性质
+    @TableField(exist = false)
+    String natureId_dictText;
+
+    //工作性质
+    @TableField(exist = false)
+    String typeId_dictText;
+
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -206,6 +207,14 @@ public class HanHaiMember implements Serializable {
     @TableField(exist = false)
     List<EmployJob> employJobList;
 
+    //工作数量
+    @TableField(exist = false)
+    int jobNum;
+
+    //企业实名信息
+    @TableField(exist = false)
+    EmployAhthenticationCompany employAhthenticationCompany;
+
     //简历信息
     @TableField(exist = false)
     EmployResume employResume;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CompanyController.java

@@ -4,27 +4,36 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiService.CompanyService;
+import org.jeecg.modules.apiService.JobService;
 import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 @Api(tags="企业信息相关接口")
 @RestController
 @RequestMapping("/employ/company")
 @Slf4j
 public class CompanyController {
+    //工作信息
+    @Resource
+    private CompanyService companyService;
 
     @ApiOperation(value="查看企业信息", notes="查看企业信息")
     @RequestMapping(value = "/queryCompany", method = {RequestMethod.GET})
-    public Result<?> queryCompany(String token){
-        return null;
+    public Result<?> queryCompany(String token, String companyId){
+        return companyService.queryCompany(token, companyId);
     }
 
     @ApiOperation(value="修改企业信息", notes="修改企业信息")
     @RequestMapping(value = "/updateCompany", method = {RequestMethod.POST})
-    public Result<?> updateCompany(String token, EmployAhthenticationCompany company){
-        return null;
+    public Result<?> updateCompany(String token, EmployCompany company){
+        return companyService.updateCompany(token,company);
     }
 
 }
+

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/JobController.java

@@ -26,39 +26,45 @@ public class JobController {
     private JobService jobService;
     /******************************************************************************************************************/
     //查看工作列表
-    @ApiOperation(value="首页-查询工作信息列表", notes="首页-查询工作信息列表")
+    @ApiOperation(value="工作信息-查询工作信息列表", notes="工作信息-查询工作信息列表")
     @RequestMapping(value = "/queryJobList", method = {RequestMethod.GET})
     public Result<?> queryJobList(EmployJob employJob, PageBean pageBean){
         return jobService.queryJobList(employJob, pageBean);
     }
 
-    //首页-根据Id查看工作详情
-    @ApiOperation(value="首页-根据Id查看工作详情", notes="首页-根据Id查看工作详情")
+    //工作信息-根据Id查看工作详情
+    @ApiOperation(value="工作信息-根据Id查看工作详情", notes="工作信息-根据Id查看工作详情")
     @RequestMapping(value = "/queryJobById", method = {RequestMethod.GET})
     public Result<?> queryJobById(String token, String jobId){
         return jobService.queryJobById(token, jobId);
     }
 
-    //会员中心-我的招工
-    @ApiOperation(value="会员中心-我的招工", notes="会员中心-我的招工")
+    //工作信息-我的招工
+    @ApiOperation(value="工作信息-我的招工", notes="工作信息-我的招工")
     @RequestMapping(value = "/queryJobListByUserId", method = {RequestMethod.GET})
     public Result<?> queryJobListByUserId(@RequestHeader("X-Access-Token")String token, PageBean pageBean){
         return jobService.queryJobListByUserId(token, pageBean);
     }
 
-    //添加工作信息
-    @ApiOperation(value="首页-添加工作信息", notes="首页-添加工作信息")
+    //工作信息-添加工作信息
+    @ApiOperation(value="工作信息-添加工作信息", notes="工作信息-添加工作信息")
     @RequestMapping(value = "/addJob", method = {RequestMethod.POST})
     public Result<?> addJob(@RequestHeader("X-Access-Token")String token, EmployJob employJob){
         return jobService.addJob(token, employJob);
     }
 
-    //修改工作信息
-    @ApiOperation(value="首页-修改工作信息", notes="首页-修改工作信息")
+    //工作信息-修改工作信息
+    @ApiOperation(value="工作信息-修改工作信息", notes="工作信息-修改工作信息")
     @RequestMapping(value = "/updateJob", method = {RequestMethod.POST})
     public Result<?> updateJob(@RequestHeader("X-Access-Token")String token, EmployJob employJob){
         return jobService.updateJob(token, employJob);
     }
 
+    //工作信息-删除工作信息
+    @ApiOperation(value="工作信息-删除工作信息", notes="工作信息-删除工作信息")
+    @RequestMapping(value = "/deleteJob", method = {RequestMethod.POST})
+    public Result<?> deleteJob(@RequestHeader("X-Access-Token")String token, String jobId){
+        return jobService.deleteJob(token, jobId);
+    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java

@@ -52,15 +52,15 @@ public class NotebookController {
     //个人记工-全年收支
     @ApiOperation(value="记工记账-全年收支", notes="记工记账-全年收支")
     @RequestMapping(value = "/queryBill", method = {RequestMethod.GET})
-    public Result<?> queryBill(@RequestHeader("X-Access-Token") String token, String employNoteBookId, PageBean pageBean){
-        return notebookService.queryBill(token, employNoteBookId, pageBean);
+    public Result<?> queryBill(@RequestHeader("X-Access-Token") String token, String employNoteBookId, String year, PageBean pageBean){
+        return notebookService.queryBill(token, employNoteBookId, year, pageBean);
     }
 
     //个人记工-全年收支金额
     @ApiOperation(value="记工记账-全年收支金额", notes="记工记账-全年收支金额")
     @RequestMapping(value = "/queryBillAmount", method = {RequestMethod.GET})
-    public Result<?> queryBillAmount(@RequestHeader("X-Access-Token") String token, String employNoteBookId){
-        return notebookService.queryBillAmount(token, employNoteBookId);
+    public Result<?> queryBillAmount(@RequestHeader("X-Access-Token") String token, String employNoteBookId, String year){
+        return notebookService.queryBillAmount(token, employNoteBookId, year);
     }
 
     //个人记工-技工问题

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java

@@ -45,4 +45,11 @@ public class UserController {
     	return userInfoService.getUserCenterData(token);
     }
 
+    //获取个人相关信息
+    @ApiOperation(value="获取个人相关信息", notes="获取个人相关信息")
+    @RequestMapping(value = "/getDataByUserId", method = {RequestMethod.GET})
+    public Result<?> getDataByUserId(@RequestHeader("X-Access-Token") String token){
+        return userInfoService.getDataByUserId(token);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.apiService;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -12,12 +13,12 @@ public interface CompanyService {
      * 查看企业信息
      * @return
      */
-    public Result<?> queryCompany(String token);
+    public Result<?> queryCompany(String token, String companyId);
 
     /**
      * 修改企业信息
      * @return
      */
-    public Result<?> updateCompany(String token, EmployAhthenticationCompany company);
+    public Result<?> updateCompany(String token, EmployCompany company);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java

@@ -47,4 +47,12 @@ public interface JobService {
      */
     public Result<?> updateJob(String token, EmployJob employJob);
 
+    /**
+     * 删除工作信息
+     * @param token
+     * @param jobId
+     * @return
+     */
+    public Result<?> deleteJob(String token, String jobId);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java

@@ -16,10 +16,10 @@ public interface NotebookService {
     public Result<?> updateNoteBook(String token, EmployNotebook employNotebook);
 
     //个人记工-全年收支
-    public Result<?> queryBill(String token, String employNoteBookId, PageBean pageBean);
+    public Result<?> queryBill(String token, String employNoteBookId, String year, PageBean pageBean);
 
     //个人记工-全年收支金额
-    public Result<?> queryBillAmount(String token, String employNoteBookId);
+    public Result<?> queryBillAmount(String token, String employNoteBookId, String year);
 
     //个人记工-技工问题
     public Result<?> addQuestion(String toke, EmployFeedback employFeedback);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java

@@ -17,4 +17,7 @@ public interface UserInfoService {
 
     //lzx：获取个人中心基础数据信息
     Result<?> getUserCenterData(String token);
+
+    //根据userId查询个人相关信息
+    public Result<?> getDataByUserId(String token);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java

@@ -5,12 +5,20 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.CheckService;
+import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
+import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService;
+import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
+import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employCheckJob.entity.EmployCheckJob;
 import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService;
 import org.jeecg.modules.employCheckResume.entity.EmployCheckResume;
 import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employJob.service.IEmployJobService;
+import org.jeecg.modules.employJobType.entity.EmployJobType;
+import org.jeecg.modules.employJobType.service.IEmployJobTypeService;
+import org.jeecg.modules.employNature.entity.EmployNature;
+import org.jeecg.modules.employNature.service.IEmployNatureService;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.employResume.service.IEmployResumeService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -18,7 +26,10 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CheckServiceImpl implements CheckService {
@@ -32,6 +43,14 @@ public class CheckServiceImpl implements CheckService {
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
 
+    //工作性质表
+    @Resource
+    private IEmployNatureService employNatureService;
+
+    //工种信息表
+    @Resource
+    private IEmployJobTypeService employJobTypeService;
+
     //简历信息表
     @Resource
     private IEmployResumeService employResumeService;
@@ -47,6 +66,14 @@ public class CheckServiceImpl implements CheckService {
     //工作查看表
     @Resource
     private IEmployCheckJobService employCheckJobService;
+
+    //企业实名信息表
+    @Resource
+    private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
+
+    //个人实名信息表
+    @Resource
+    private IEmployAuthenticationPersonService employAuthenticationPersonService;
     /******************************************************************************************************************/
 
     //会员中心-联系记录-我看过谁
@@ -67,6 +94,22 @@ public class CheckServiceImpl implements CheckService {
             for (EmployCheckResume record : pageList.getRecords()) {
                 //获取简历信息
                 EmployResume employResume = employResumeService.getById(record.getResumeId());
+                //获取用户信息
+                HanHaiMember member = hanHaiMemberService.getById(employResume.getUserId());
+                employResume.setHanHaiMember(member);
+                //获取个人实名信息
+                EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService
+                        .lambdaQuery()
+                        .eq(EmployAuthenticationPerson::getUserId, employResume.getUserId())
+                        .one();
+                employResume.setEmployAuthenticationPerson(ahthenticationPerson);
+                //获取工作性质信息
+                EmployNature nature = employNatureService.getById(employResume.getNatureId());
+                employResume.setNatureId_dictText(nature.getName());
+                //获取工种信息
+                EmployJobType jobType = employJobTypeService.getById(employResume.getTypeId());
+                employResume.setTypeId_dictText(jobType.getName());
+
                 //将简历信息添加到查看记录中
                 record.setEmployResume(employResume);
             }
@@ -130,15 +173,33 @@ public class CheckServiceImpl implements CheckService {
                     .page(page);
 
             //根据求职者id查询求职者简历
+            List<EmployResume> resumeList = new ArrayList<>();
             for (HanHaiMember record : hanHaiMemberList.getRecords()) {
                 EmployResume resume = employResumeService
                         .lambdaQuery()
                         .eq(EmployResume::getUserId, record.getId())
                         .one();
-                record.setEmployResume(resume);
+
+                //添加用户信息
+                resume.setHanHaiMember(record);
+                //添加个人实名信息
+                EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService
+                        .lambdaQuery()
+                        .eq(EmployAuthenticationPerson::getUserId, record.getId())
+                        .one();
+                resume.setEmployAuthenticationPerson(ahthenticationPerson);
+                //添加工作性质信息
+                EmployNature nature = employNatureService.getById(resume.getNatureId());
+                resume.setNatureId_dictText(nature.getName());
+                //添加工种信息
+                EmployJobType jobType = employJobTypeService.getById(resume.getTypeId());
+                resume.setTypeId_dictText(jobType.getName());
+
+                resumeList.add(resume);
+                //record.setEmployResume(resume);
             }
 
-            return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList);
+            return Result.OK("谁看过我(谁看过我的招工)列表", resumeList);
         }catch (Exception e){
             e.printStackTrace();
             return Result.error("谁看过我(谁看过我的招工)列表查询失败");
@@ -177,6 +238,8 @@ public class CheckServiceImpl implements CheckService {
     //会员中心-联系记录-谁看过我(谁看过我的简历)
     @Override
     public Result<?> queryWatchMeEmployee(String token, PageBean pageBean) {
+        //返回数据
+        Map<String, Object> map = new HashMap<>();
 
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
@@ -233,6 +296,13 @@ public class CheckServiceImpl implements CheckService {
                         .eq(EmployJob::getUserId, record.getId())
                         .list();
 
+                //企业实名信息
+                EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService
+                        .lambdaQuery()
+                        .eq(EmployAhthenticationCompany::getUserId, record.getId())
+                        .one();
+                record.setEmployAhthenticationCompany(ahthenticationCompany);
+                record.setJobNum(employJobList.size());
                 record.setEmployJobList(employJobList);
             }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java

@@ -11,6 +11,10 @@ import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume;
 import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employJob.service.IEmployJobService;
+import org.jeecg.modules.employJobType.entity.EmployJobType;
+import org.jeecg.modules.employJobType.service.IEmployJobTypeService;
+import org.jeecg.modules.employNature.entity.EmployNature;
+import org.jeecg.modules.employNature.service.IEmployNatureService;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.employResume.service.IEmployResumeService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -35,6 +39,14 @@ public class CollectionServiceImpl implements CollectionService {
     @Resource
     private IEmployJobService employJobService;
 
+    //工作性质表
+    @Resource
+    private IEmployNatureService employNatureService;
+
+    //工种信息表
+    @Resource
+    private IEmployJobTypeService employJobTypeService;
+
     //工作收藏表
     @Resource
     private IEmployCollectionJobService employCollectionJobService;
@@ -142,6 +154,12 @@ public class CollectionServiceImpl implements CollectionService {
                 //获取用户信息
                 HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
                 resume.setHanHaiMember(member);
+                //获取工作性质信息
+                EmployNature  nature = employNatureService.getById(resume.getNatureId());
+                resume.setNatureId_dictText(nature.getName());
+                //获取工种信息
+                EmployJobType jobType = employJobTypeService.getById(resume.getTypeId());
+                resume.setTypeId_dictText(jobType.getName());
                 //将简历信息添加到我的收藏中
                 record.setEmployResume(resume);
             }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java

@@ -3,12 +3,14 @@ package org.jeecg.modules.apiService.impl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiService.CompanyService;
-import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
-import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import org.jeecg.modules.employCompany.service.IEmployCompanyService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+@Service
 public class CompanyServiceImpl implements CompanyService {
 
     /******************************************************************************************************************/
@@ -18,22 +20,22 @@ public class CompanyServiceImpl implements CompanyService {
 
     //企业实名认证表
     @Resource
-    private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
+    private IEmployCompanyService employCompanyService;
 
     /******************************************************************************************************************/
 
     //查看企业信息
     @Override
-    public Result<?> queryCompany(String token) {
+    public Result<?> queryCompany(String token, String companyId) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         String message = "企业信息查询失败";
 
         try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
             //获取工作详情
-            EmployAhthenticationCompany one = employAhthenticationCompanyService
+            EmployCompany one = employCompanyService
                     .lambdaQuery()
-                    .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId())
+                    .eq(EmployCompany::getId, companyId)
                     .one();
 
             if(null != one){
@@ -51,14 +53,14 @@ public class CompanyServiceImpl implements CompanyService {
 
     //修改企业信息
     @Override
-    public Result<?> updateCompany(String token, EmployAhthenticationCompany company) {
+    public Result<?> updateCompany(String token, EmployCompany company) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         String message = "修改企业信息失败！";
 
         try{
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-            boolean result = employAhthenticationCompanyService.updateById(company);
+            boolean result = employCompanyService.updateById(company);
 
             if(result){
                 message = "修改企业信息成功！";

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java

@@ -23,7 +23,9 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -97,6 +99,10 @@ public class JobServiceImpl implements JobService {
                 //所属公司
                 query.eq(EmployJob::getCompany, employJob.getCompany());
             }
+            if(null != employJob.getTitle()){
+                //工作岗位名称
+                query.like(EmployJob::getTitle, employJob.getTitle());
+            }
             //按时间倒序
             query.orderByDesc(EmployJob::getCreateTime);
 
@@ -311,4 +317,53 @@ public class JobServiceImpl implements JobService {
         }
     }
 
+    //删除工作信息
+    public Result<?> deleteJob(String token, String jobId) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String message = "工作信息删除失败";
+        //执行结果
+        boolean result = false;
+
+        try{
+            //删除工作岗位被收藏信息
+            List<EmployCollectionJob> collectionJobList = employCollectionJobService
+                    .lambdaQuery()
+                    .eq(EmployCollectionJob::getJobId, jobId)
+                    .list();
+            List<String> collectionIds = new ArrayList<>();
+            for (EmployCollectionJob collectionJob : collectionJobList) {
+                collectionIds.add(collectionJob.getId());
+            }
+            employCollectionJobService.removeByIds(collectionIds);
+
+            //删除工作岗位被查看信息
+            List<EmployCheckJob> checkJobList = employCheckJobService
+                    .lambdaQuery()
+                    .eq(EmployCheckJob::getJobId, jobId)
+                    .list();
+            List<String> checkIds = new ArrayList<>();
+            employCheckJobService.removeByIds(checkIds);
+
+            //执行工作信息删除
+            result = employJobService.removeById(jobId);
+
+            //判断执行结果
+            if(result){
+                message = "工作信息删除成功！";
+            }else {
+                message = "工作信息删除失败！";
+            }
+
+            //返回执行结果
+            return Result.OK(message);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message);
+        }
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.apiService.impl;
 
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
@@ -15,10 +16,12 @@ import org.jeecg.modules.employNotebook.service.IEmployNotebookService;
 import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo;
 import org.jeecg.modules.employWorkInfo.service.IEmployWorkInfoService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +34,10 @@ public class NotebookServiceImpl implements NotebookService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    //用户表
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
     //账本表
     @Resource
     private IEmployNotebookService employNotebookService;
@@ -108,9 +115,13 @@ public class NotebookServiceImpl implements NotebookService {
 
     //记工记账-全年收支
     @Override
-    public Result<?> queryBill(String token, String employNoteBookId, PageBean pageBean) {
+    public Result<?> queryBill(String token, String employNoteBookId, String year, PageBean pageBean) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //收支记录列表
+        Page<EmployBillInfo> pageList = null;
+        //分页信息
+        Page<EmployBillInfo> page = null;
 
         try{
             //获取账本id列表
@@ -150,12 +161,17 @@ public class NotebookServiceImpl implements NotebookService {
             }
 
             //根据账本id列表查询收支记录
-            Page<EmployBillInfo> page = new Page<EmployBillInfo>(pageBean.getPageNo(), pageBean.getPageSize());
-            Page<EmployBillInfo> pageList = employBillInfoService
-                    .lambdaQuery()
-                    .in(EmployBillInfo::getNotebookId, notebooIds)
-                    .page(page);
+            //分页
+            page = new Page<EmployBillInfo>(pageBean.getPageNo(), pageBean.getPageSize());
+            LambdaQueryChainWrapper<EmployBillInfo> query = employBillInfoService.lambdaQuery();
 
+            query.in(EmployBillInfo::getNotebookId, notebooIds);
+            if(StringUtils.isNotEmpty(year)){
+                query.like(EmployBillInfo::getBillDate, year);
+            }
+
+            //获取收支记录列表
+            pageList = query.page(page);
 
             return Result.OK("收支记录", pageList);
         }catch (Exception e){
@@ -165,7 +181,7 @@ public class NotebookServiceImpl implements NotebookService {
     }
 
     //记工记账-全年收支金额
-    public Result<?> queryBillAmount(String token, String employNoteBookId){
+    public Result<?> queryBillAmount(String token, String employNoteBookId, String year){
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //返回信息
@@ -211,10 +227,12 @@ public class NotebookServiceImpl implements NotebookService {
             }
 
             //根据账本id列表查询收支记录
-            List<EmployBillInfo> pageList = employBillInfoService
-                    .lambdaQuery()
-                    .in(EmployBillInfo::getNotebookId, notebooIds)
-                    .list();
+            LambdaQueryChainWrapper<EmployBillInfo> query = employBillInfoService.lambdaQuery();
+            query.in(EmployBillInfo::getNotebookId, notebooIds);
+            if(StringUtils.isNotEmpty(year)){
+                query.like(EmployBillInfo::getBillDate, year);
+            }
+            List<EmployBillInfo> pageList = query.list();
 
             BigDecimal incomeCount = BigDecimal.valueOf(0);//总收入
             BigDecimal expenditureCount = BigDecimal.valueOf(0);//总支出

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java

@@ -6,6 +6,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.ResumeService;
+import org.jeecg.modules.employAddress.entity.EmployAddress;
+import org.jeecg.modules.employAddress.service.IEmployAddressService;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
 import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employCheckResume.entity.EmployCheckResume;
@@ -29,6 +31,10 @@ public class ResumeServiceImpl implements ResumeService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    //工作地址表
+    @Resource
+    private IEmployAddressService employAddressService;
+
     //用户信息表
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
@@ -74,6 +80,14 @@ public class ResumeServiceImpl implements ResumeService {
                 //工作性质
                 query.eq(EmployResume::getNatureId, employResume.getNatureId());
             }
+            if(null != employResume.getExpectAddress()){
+                //期望工作地点
+                query.eq(EmployResume::getExpectAddress, employResume.getExpectAddress());
+            }
+            if(null != employResume.getTitle()){
+                //简历名称
+                query.like(EmployResume::getTitle, employResume.getTitle());
+            }
             //按时间倒序
             query.orderByDesc(EmployResume::getCreateTime);
 
@@ -125,6 +139,10 @@ public class ResumeServiceImpl implements ResumeService {
             EmployResume resume = employResumeService.getById(resumeId);
             map.put("resume", resume);
 
+            //简历期望工作地
+            EmployAddress address = employAddressService.getById(resume.getExpectAddress());
+            resume.setExpectAddressName(address.getAdress());
+
             //2、获取个人实名认证信息
             EmployAuthenticationPerson person = employAuthenticationPersonService
                     .lambdaQuery()

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

@@ -17,6 +17,8 @@ import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob;
 import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService;
 import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume;
 import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import org.jeecg.modules.employCompany.service.IEmployCompanyService;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employJob.service.IEmployJobService;
 import org.jeecg.modules.employResume.entity.EmployResume;
@@ -46,6 +48,10 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
 
+    //企业信息
+    @Resource
+    private IEmployCompanyService employCompanyService;
+
     //个人实名信息
     @Resource
     private IEmployAuthenticationPersonService employAuthenticationPersonService;
@@ -205,6 +211,39 @@ public class UserInfoServiceImpl implements UserInfoService {
         }
     }
 
+   //根据招聘人id查询招聘人信息
+   public Result<?> getDataByUserId(String token){
+       //权限验证
+       HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+       String message = "";
+       //返回数据
+       Map<String, Object> map = new HashMap<>();
+
+       try{
+           //招聘者信息
+           map.put("userInfo", hanHaiMember);
+           //招聘者企业实名信息
+           EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService
+                   .lambdaQuery()
+                   .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId())
+                   .one();
+           map.put("ahthenticationCompany", ahthenticationCompany);
+           //招聘者企业信息
+           EmployCompany company = employCompanyService
+                   .lambdaQuery()
+                   .eq(EmployCompany::getSocialCode,ahthenticationCompany.getSocialCode())
+                   .one();
+           map.put("company", company);
+
+           return Result.OK("招聘者相关信息", map);
+       }catch (Exception e){
+           e.printStackTrace();
+           return Result.error("招聘者相关信息获取失败", map);
+       }
+
+   }
+
     //获取用户VIP信息
     public String getVip(String token){
         //权限验证

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java

@@ -47,7 +47,7 @@ public class VipServiceImpl implements VipService {
         //根据会员类型查询会员名称
         EmployVipType vipType = employVipTypeService
                 .lambdaQuery()
-                .eq(EmployVipType::getType, vipTypeId)
+                .eq(EmployVipType::getId, vipTypeId)
                 .one();
 
         //吊起微信支付