1、接口内容添加

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-21
+ * @Date:   2024-10-24
  * @Version: V1.0
  */
 @Api(tags="电子合同表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-21
+ * @Date:   2024-10-24
  * @Version: V1.0
  */
 @Data
@@ -59,6 +59,10 @@ public class EmployContract implements Serializable {
 	@Excel(name = "求职者签署(0-未签 1-已签)", width = 15)
     @ApiModelProperty(value = "求职者签署(0-未签 1-已签)")
     private java.lang.String signPerson;
+	/**合同标题*/
+	@Excel(name = "合同标题", width = 15)
+    @ApiModelProperty(value = "合同标题")
+    private java.lang.String title;
 	/**合同甲方名称*/
 	@Excel(name = "合同甲方名称", width = 15)
     @ApiModelProperty(value = "合同甲方名称")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-21
+ * @Date:   2024-10-24
  * @Version: V1.0
  */
 public interface EmployContractMapper extends BaseMapper<EmployContract> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-21
+ * @Date:   2024-10-24
  * @Version: V1.0
  */
 public interface IEmployContractService extends IService<EmployContract> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-21
+ * @Date:   2024-10-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue

@@ -138,6 +138,11 @@
             align:"center",
             dataIndex: 'signPerson'
           },
+          {
+            title:'合同标题',
+            align:"center",
+            dataIndex: 'title'
+          },
           {
             title:'合同甲方名称',
             align:"center",
@@ -195,6 +200,7 @@
         fieldList.push({type:'string',value:'fileContract',text:'合同文件',dictCode:''})
         fieldList.push({type:'string',value:'signCompany',text:'公司签署(0-未签 1-已签)',dictCode:''})
         fieldList.push({type:'string',value:'signPerson',text:'求职者签署(0-未签 1-已签)',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'合同标题',dictCode:''})
         fieldList.push({type:'string',value:'nameA',text:'合同甲方名称',dictCode:''})
         fieldList.push({type:'string',value:'nameB',text:'合同乙方名称',dictCode:''})
         fieldList.push({type:'string',value:'companyId',text:'关联招聘者id',dictCode:"han_hai_member,nick_name,id"})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue

@@ -18,6 +18,11 @@
               <a-input v-model="model.signPerson" placeholder="请输入求职者签署(0-未签 1-已签)"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入合同标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="合同甲方名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nameA">
               <a-input v-model="model.nameA" placeholder="请输入合同甲方名称"  ></a-input>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts

@@ -20,6 +20,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'signPerson'
    },
+   {
+    title: '合同标题',
+    align:"center",
+    dataIndex: 'title'
+   },
    {
     title: '合同甲方名称',
     align:"center",
@@ -63,6 +68,11 @@ export const formSchema: FormSchema[] = [
     field: 'signPerson',
     component: 'Input',
   },
+  {
+    label: '合同标题',
+    field: 'title',
+    component: 'Input',
+  },
   {
     label: '合同甲方名称',
     field: 'nameA',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/controller/EmployUserInfoController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employUserInfo.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.employUserInfo.entity.EmployUserInfo;
+import org.jeecg.modules.employUserInfo.service.IEmployUserInfoService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 用户信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-24
+ * @Version: V1.0
+ */
+@Api(tags="用户信息表")
+@RestController
+@RequestMapping("/employUserInfo/employUserInfo")
+@Slf4j
+public class EmployUserInfoController extends JeecgController<EmployUserInfo, IEmployUserInfoService> {
+	@Autowired
+	private IEmployUserInfoService employUserInfoService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employUserInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "用户信息表-分页列表查询")
+	@ApiOperation(value="用户信息表-分页列表查询", notes="用户信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployUserInfo>> queryPageList(EmployUserInfo employUserInfo,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployUserInfo> queryWrapper = QueryGenerator.initQueryWrapper(employUserInfo, req.getParameterMap());
+		Page<EmployUserInfo> page = new Page<EmployUserInfo>(pageNo, pageSize);
+		IPage<EmployUserInfo> pageList = employUserInfoService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employUserInfo
+	 * @return
+	 */
+	@AutoLog(value = "用户信息表-添加")
+	@ApiOperation(value="用户信息表-添加", notes="用户信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployUserInfo employUserInfo) {
+		employUserInfoService.save(employUserInfo);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employUserInfo
+	 * @return
+	 */
+	@AutoLog(value = "用户信息表-编辑")
+	@ApiOperation(value="用户信息表-编辑", notes="用户信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployUserInfo employUserInfo) {
+		employUserInfoService.updateById(employUserInfo);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "用户信息表-通过id删除")
+	@ApiOperation(value="用户信息表-通过id删除", notes="用户信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		employUserInfoService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "用户信息表-批量删除")
+	@ApiOperation(value="用户信息表-批量删除", notes="用户信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.employUserInfoService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "用户信息表-通过id查询")
+	@ApiOperation(value="用户信息表-通过id查询", notes="用户信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<EmployUserInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployUserInfo employUserInfo = employUserInfoService.getById(id);
+		if(employUserInfo==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employUserInfo);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employUserInfo
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployUserInfo employUserInfo) {
+        return super.exportXls(request, employUserInfo, EmployUserInfo.class, "用户信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, EmployUserInfo.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/entity/EmployUserInfo.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.employUserInfo.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 用户信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_user_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_user_info对象", description="用户信息表")
+public class EmployUserInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**用户姓名*/
+	@Excel(name = "用户姓名", width = 15)
+    @ApiModelProperty(value = "用户姓名")
+    private java.lang.String name;
+	/**用户年龄*/
+	@Excel(name = "用户年龄", width = 15)
+    @ApiModelProperty(value = "用户年龄")
+    private java.lang.Integer age;
+	/**性别*/
+	@Excel(name = "性别", width = 15)
+    @ApiModelProperty(value = "性别")
+    private java.lang.String sex;
+	/**电话号码*/
+	@Excel(name = "电话号码", width = 15)
+    @ApiModelProperty(value = "电话号码")
+    private java.lang.String phone;
+	/**用户所在地*/
+	@Excel(name = "用户所在地", width = 15)
+    @ApiModelProperty(value = "用户所在地")
+    private java.lang.String address;
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/EmployUserInfoMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employUserInfo.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employUserInfo.entity.EmployUserInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 用户信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-24
+ * @Version: V1.0
+ */
+public interface EmployUserInfoMapper extends BaseMapper<EmployUserInfo> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/xml/EmployUserInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.employUserInfo.mapper.EmployUserInfoMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/service/IEmployUserInfoService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employUserInfo.service;
+
+import org.jeecg.modules.employUserInfo.entity.EmployUserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 用户信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-24
+ * @Version: V1.0
+ */
+public interface IEmployUserInfoService extends IService<EmployUserInfo> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/service/impl/EmployUserInfoServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employUserInfo.service.impl;
+
+import org.jeecg.modules.employUserInfo.entity.EmployUserInfo;
+import org.jeecg.modules.employUserInfo.mapper.EmployUserInfoMapper;
+import org.jeecg.modules.employUserInfo.service.IEmployUserInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 用户信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-24
+ * @Version: V1.0
+ */
+@Service
+public class EmployUserInfoServiceImpl extends ServiceImpl<EmployUserInfoMapper, EmployUserInfo> implements IEmployUserInfoService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/EmployUserInfoList.vue

@@ -0,0 +1,202 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用户信息表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <employ-user-info-modal ref="modalForm" @ok="modalFormOk"></employ-user-info-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployUserInfoModal from './modules/EmployUserInfoModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'EmployUserInfoList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployUserInfoModal
+    },
+    data () {
+      return {
+        description: '用户信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'用户年龄',
+            align:"center",
+            dataIndex: 'age'
+          },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'sex'
+          },
+          {
+            title:'电话号码',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'用户所在地',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'关联用户id',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employUserInfo/employUserInfo/list",
+          delete: "/employUserInfo/employUserInfo/delete",
+          deleteBatch: "/employUserInfo/employUserInfo/deleteBatch",
+          exportXlsUrl: "/employUserInfo/employUserInfo/exportXls",
+          importExcelUrl: "employUserInfo/employUserInfo/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'用户姓名',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'用户年龄',dictCode:''})
+        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话号码',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'用户所在地',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoForm.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入用户姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
+              <a-input-number v-model="model.age" placeholder="请输入用户年龄" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话号码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户所在地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入用户所在地"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'EmployUserInfoForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/employUserInfo/employUserInfo/add",
+          edit: "/employUserInfo/employUserInfo/edit",
+          queryById: "/employUserInfo/employUserInfo/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <employ-user-info-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-user-info-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import EmployUserInfoForm from './EmployUserInfoForm'
+
+  export default {
+    name: 'EmployUserInfoModal',
+    components: {
+      EmployUserInfoForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <employ-user-info-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-user-info-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployUserInfoForm from './EmployUserInfoForm'
+  export default {
+    name: 'EmployUserInfoModal',
+    components: {
+      EmployUserInfoForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfo.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employUserInfo/employUserInfo/list',
+  save='/employUserInfo/employUserInfo/add',
+  edit='/employUserInfo/employUserInfo/edit',
+  deleteOne = '/employUserInfo/employUserInfo/delete',
+  deleteBatch = '/employUserInfo/employUserInfo/deleteBatch',
+  importExcel = '/employUserInfo/employUserInfo/importExcel',
+  exportXls = '/employUserInfo/employUserInfo/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfo.data.ts

@@ -0,0 +1,76 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '用户姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '用户年龄',
+    align:"center",
+    dataIndex: 'age'
+   },
+   {
+    title: '性别',
+    align:"center",
+    dataIndex: 'sex'
+   },
+   {
+    title: '电话号码',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '用户所在地',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '关联用户id',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '用户年龄',
+    field: 'age',
+    component: 'InputNumber',
+  },
+  {
+    label: '性别',
+    field: 'sex',
+    component: 'Input',
+  },
+  {
+    label: '电话号码',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '用户所在地',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '关联用户id',
+    field: 'userId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfoList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EmployUserInfoModal @register="registerModal" @success="handleSuccess"></EmployUserInfoModal>
+  </div>
+</template>
+
+<script lang="ts" name="employUserInfo-employUserInfo" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import EmployUserInfoModal from './components/EmployUserInfoModal.vue'
+  import {columns, searchFormSchema} from './employUserInfo.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employUserInfo.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '用户信息表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"用户信息表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/components/EmployUserInfoModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../employUserInfo.data';
+    import {saveOrUpdate} from '../employUserInfo.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java

@@ -145,7 +145,7 @@ public class CommonApiController {
 
     //我的服务-获取VIP信息
     @ApiOperation(value="我的服务-获取VIP配置信息", notes="我的服务-获取VIP配置信息")
-    @RequestMapping(value = "/queryVipType", method = {RequestMethod.POST})
+    @RequestMapping(value = "/queryVipType", method = {RequestMethod.GET})
     public Result<?> queryVipType(PageBean pageBean){
         return commonApiService.queryVipType(pageBean);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CollectionBean.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.apiBean;
+
+import lombok.Data;
+import org.jeecg.modules.employJob.entity.EmployJob;
+import org.jeecg.modules.employResume.entity.EmployResume;
+
+@Data
+public class CollectionBean {
+    EmployJob employJob;
+    EmployResume employResume;
+    Boolean collectionFlag;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WatchMeBean.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.apiBean;
+
+import lombok.Data;
+import org.jeecg.modules.employJob.entity.EmployJob;
+import org.jeecg.modules.employResume.entity.EmployResume;
+import org.jeecg.modules.employUserInfo.entity.EmployUserInfo;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+
+import java.util.List;
+
+@Data
+public class WatchMeBean {
+    HanHaiMember hanHaiMember;
+    List<EmployJob> employJobList;
+    List<EmployResume> employResumeList;
+}

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

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.CollectionBean;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiBean.ResumeCollectionBean;
+import org.jeecg.modules.apiBean.WatchMeBean;
 import org.jeecg.modules.apiService.BossApiService;
 import org.jeecg.modules.employCheckJob.entity.EmployCheckJob;
 import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService;
@@ -37,6 +39,9 @@ public class BossApiServiceImpl implements BossApiService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
     //工作信息表
     @Resource
     private IEmployJobService employJobService;
@@ -76,23 +81,41 @@ public class BossApiServiceImpl implements BossApiService {
     //首页-根据Id查看简历详情
     @Override
     public Result<?> queryResumeById(String token, String resumeId) {
+
+        CollectionBean collectionBean = new CollectionBean();
+        Boolean collectionFlag = false;
+        //获取简历详情
         EmployResume one = employResumeService
                 .lambdaQuery()
                 .eq(EmployResume::getId, resumeId)
                 .one();
 
-        //添加简历被查看记录
+        collectionBean.setEmployResume(one);
+
         if(null != token){
             //权限验证
             HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+            //添加简历被查看记录
             EmployCheckResume employCheckResume = new EmployCheckResume();
             employCheckResume.setResumeId(one.getId());
             employCheckResume.setUserId(hanHaiMember.getId());
             employCheckResumeService.saveOrUpdate(employCheckResume);
+
+            //添加是否被收藏标识
+            EmployCollectionResume collection = employCollectionResumeService
+                    .lambdaQuery()
+                    .eq(EmployCollectionResume::getResumeId, one.getId())
+                    .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
+                    .one();
+
+            if(null != collection){
+                collectionFlag = true;
+            }
         }
+        collectionBean.setCollectionFlag(collectionFlag);
 
-        return Result.OK("简历详情", one);
+        return Result.OK("简历详情", collectionBean);
     }
 
     //首页-发布招工
@@ -198,14 +221,32 @@ public class BossApiServiceImpl implements BossApiService {
             return Result.OK("没有人看过我的招工", lists);
         }
 
-        //根据求职者id查询求职者简历
-        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployResume> pageList = employResumeService
+        //根据求职者id查询求职者基本信息
+        List<HanHaiMember> hanHaiMemberList = hanHaiMemberService
                 .lambdaQuery()
-                .in(EmployResume::getUserId,objects)
-                .page(page);
+                .in(HanHaiMember::getId, objects)
+                .list();
+
+        //根据求职者id查询求职者简历
+//        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<EmployResume> pageList = employResumeService
+//                .lambdaQuery()
+//                .in(EmployResume::getUserId,objects)
+//                .page(page);
+        List<WatchMeBean> watchMeBeanList = new ArrayList<>();
+        for (HanHaiMember haiMember : hanHaiMemberList) {
+            WatchMeBean watchMeBean = new WatchMeBean();
+            List<EmployResume> employResumeList = employResumeService
+                    .lambdaQuery()
+                    .eq(EmployResume::getUserId, haiMember.getId())
+                    .list();
+
+            watchMeBean.setHanHaiMember(haiMember);
+            watchMeBean.setEmployResumeList(employResumeList);
+            watchMeBeanList.add(watchMeBean);
+        }
 
-        return Result.OK("谁看过我(谁看过我的招工)列表", pageList);
+        return Result.OK("谁看过我(谁看过我的招工)列表", watchMeBeanList);
     }
 
     //我的招工

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

@@ -250,6 +250,8 @@ public class CommonApiServiceImpl implements CommonApiService {
     public Result<?> queryScore(String token) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //积分信息
+        ScoreBean scoreBean = new ScoreBean();
 
         //正式积分
         EmployScore one = employScoreService
@@ -264,12 +266,24 @@ public class CommonApiServiceImpl implements CommonApiService {
                 .eq(EmployScore::getType, "1")
                 .one();
 
-        double three = one.getScore() + two.getScore();
+        double three = 0;
+        if(null != one && null != two){
+           three = one.getScore() + two.getScore();
+        }else if(null != one){
+            three = one.getScore();
+        }else if(null != two){
+            three = two.getScore();
+        }else {
+            scoreBean.setFormalScore(0);
+            scoreBean.setTempScore(0);
+            scoreBean.setCurrentScore(0);
+            return Result.OK("积分信息", scoreBean);
+        }
 
-        ScoreBean scoreBean = new ScoreBean();
         scoreBean.setFormalScore(one.getScore());
         scoreBean.setTempScore(two.getScore());
         scoreBean.setCurrentScore(three);
+
         return Result.OK("积分信息", scoreBean);
     }
 

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

@@ -6,8 +6,10 @@ import org.apache.poi.hslf.blip.EMF;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.CollectionBean;
 import org.jeecg.modules.apiBean.JobCollectionBean;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiBean.WatchMeBean;
 import org.jeecg.modules.apiService.EmployeeApiService;
 import org.jeecg.modules.employCert.entity.EmployCert;
 import org.jeecg.modules.employCert.service.IEmployCertService;
@@ -98,11 +100,17 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
     @Override
     public Result<?> queryJobById(String token, String jobId) {
 
+        CollectionBean collectionBean = new CollectionBean();
+        Boolean collectionFlag = false;
+
+        //获取工作详情
         EmployJob one = employJobService
                 .lambdaQuery()
                 .eq(EmployJob::getId, jobId)
                 .one();
 
+        collectionBean.setEmployJob(one);
+
         //添加工作被查看记录
         if(null != token){
             //权限验证
@@ -112,9 +120,22 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
             employCheckJob.setJobId(one.getId());
             employCheckJob.setUserId(hanHaiMember.getId());
             employCheckJobService.saveOrUpdate(employCheckJob);
+
+            //添加是否被收藏标识
+            EmployCollectionJob collection = employCollectionJobService
+                    .lambdaQuery()
+                    .eq(EmployCollectionJob::getJobId, one.getId())
+                    .eq(EmployCollectionJob::getUserId, hanHaiMember.getId())
+                    .one();
+
+            if(null != collection){
+                collectionFlag = true;
+            }
         }
 
-        return Result.OK("工作详情", one);
+        collectionBean.setCollectionFlag(collectionFlag);
+
+        return Result.OK("工作详情", collectionBean);
     }
 
 
@@ -238,14 +259,33 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
         if(index == 0){
             return Result.OK("没有人看过我的简历", list1);
         }
-        //根据招聘人员id查询发布的工作岗位
-        Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJob> pageList = employJobService
+
+        //根据招聘人员id查询招聘人员基本信息
+        List<HanHaiMember> hanHaiMemberList = hanHaiMemberService
                 .lambdaQuery()
-                .in(EmployJob::getUserId,objects)
-                .page(page);
+                .in(HanHaiMember::getId, objects)
+                .list();
+
+        //根据招聘人员id查询发布的工作岗位
+//        Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<EmployJob> pageList = employJobService
+//                .lambdaQuery()
+//                .in(EmployJob::getUserId,objects)
+//                .page(page);
+        List<WatchMeBean> watchMeBeanList = new ArrayList<>();
+        for (HanHaiMember haiMember : hanHaiMemberList) {
+            WatchMeBean watchMeBean = new WatchMeBean();
+            List<EmployJob> employJobList = employJobService
+                    .lambdaQuery()
+                    .eq(EmployJob::getUserId, haiMember.getId())
+                    .list();
+
+            watchMeBean.setHanHaiMember(haiMember);
+            watchMeBean.setEmployJobList(employJobList);
+            watchMeBeanList.add(watchMeBean);
+        }
 
-        return Result.OK("谁看过我的简历", pageList);
+        return Result.OK("谁看过我的简历", watchMeBeanList);
     }
 
     //会员中心-我的找活