更新

admin-ui/src/views/work/banner/edit.vue

@@ -10,7 +10,7 @@
       <el-form-item label="展示位置" prop="type">
         <el-select v-model="form.type" placeholder="请选择">
           <el-option label="首页" :value="0"></el-option>
-          <el-option label="服务业" :value="1"></el-option>
+          <el-option label="更多服务" :value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="显示顺序" prop="orderNum"><el-input type="number" :min="0" v-model="form.orderNum" placeholder="请输入显示顺序" /></el-form-item>

admin-ui/src/views/work/banner/index.vue

@@ -16,7 +16,7 @@
       <el-table-column label="展示位置" align="center" prop="type" width="130">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.type == 0">首页</el-tag>
-          <el-tag type="danger" v-if="scope.row.type == 1">服务业</el-tag>
+          <el-tag type="danger" v-if="scope.row.type == 1">更多服务</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="点击跳转到" align="center" prop="contentTitle" />

app/App.vue

@@ -30,7 +30,7 @@ button::after {
 /**挂载iconfont字体图标*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/c/font_4507607_mybvdfcho37.ttf?t=1718616245217') format('truetype');
+	src: url('https://at.alicdn.com/t/c/font_4507607_4zezmbmoj2k.ttf?t=1718677535976') format('truetype');
 	/* src: url('~@/static/font/iconfont.ttf') format('truetype'); */
 }
 .icon {

app/pages/index/index.vue

@@ -49,7 +49,7 @@ export default {
 	},
 	methods: {
 		initData() {
-			//首页数据
+			//轮播图
 			this.http.request({
 				url: '/app/home/banner/0',
 				success: (res) => {

app/pages/serve/index.vue

@@ -155,12 +155,18 @@ export default {
 	},
 	methods: {
 		getData() {
+			//轮播图
 			this.http.request({
-				url: '/app/home/index',
+				url: '/app/home/banner/1',
 				success: (res) => {
-					this.contract = res.data.data.contract;
-					this.bannerList = res.data.data.bannerList;
-					this.newsList = res.data.data.newsList;
+					this.bannerList = res.data.data;
+				}
+			});
+			//资讯
+			this.http.request({
+				url: '/app/home/news',
+				success: (res) => {
+					this.newsList = res.data.data;
 				}
 			});
 		},

app/pages/statement/index/index.vue

@@ -94,6 +94,9 @@ export default {
 			this.getUserInfo();
 		}
 	},
+	onLoad() {
+		this.getData();
+	},
 	methods: {
 		getUserInfo() {
 			this.http.request({
@@ -105,13 +108,9 @@ export default {
 		},
 		getData() {
 			this.http.request({
-				url: '/app/home/index',
+				url: '/app/home/contract',
 				success: (res) => {
-					this.contract = res.data.data.contract;
-					this.bannerList = res.data.data.bannerList;
-					res.data.data.noticeList.forEach((item) => {
-						this.noticeList.push(item.title);
-					});
+					this.contract = res.data.data;
 				}
 			});
 		},

app/pages/user/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="main">
 		<view class="user" @click="go('/pages/user/auth')">
-			<image :src="user.avatarUrl ? user.avatarUrl : '../../static/favicon.png'" class="head"></image>
+			<image :src="user.avatar ? ip + user.avatar : '../../static/favicon.png'" class="head"></image>
 			<view class="con" v-if="user.id">
 				<view class="nickName">{{ user.type == 0 ? '个人用户' : '企业用户' }}</view>
 				<view class="welcome">
@@ -70,42 +70,6 @@
 				</view>
 			</view>
 		</view>
-		<!--政务服务-->
-		<view class="mtt" style="display: none">政务服务</view>
-		<view class="menu" style="display: none">
-			<view class="cd">
-				<view class="out">
-					<view class="int">
-						<view class="icon" style="background-color: #f44336">&#xe6be;</view>
-						<view class="title">失业登记</view>
-					</view>
-				</view>
-			</view>
-			<view class="cd">
-				<view class="out">
-					<view class="int">
-						<view class="icon" style="background-color: #4581fb">&#xe64a;</view>
-						<view class="title">就业补贴</view>
-					</view>
-				</view>
-			</view>
-			<view class="cd">
-				<view class="out">
-					<view class="int">
-						<view class="icon" style="background-color: #ff9800">&#xe73c;</view>
-						<view class="title">培训指导</view>
-					</view>
-				</view>
-			</view>
-			<view class="cd">
-				<view class="out">
-					<view class="int">
-						<view class="icon" style="background-color: #00bcd4">&#xe998;</view>
-						<view class="title">法务服务</view>
-					</view>
-				</view>
-			</view>
-		</view>
 		<view v-if="user.type == 1">
 			<view class="mtt">企业服务</view>
 			<view class="menu">
@@ -131,6 +95,7 @@
 						<view class="int">
 							<view class="icon" style="background-color: #03a9f4">&#xe646;</view>
 							<view class="title">企业信息</view>
+							<view class="bage" v-if="user.id && !user.enterprise">去认证</view>
 						</view>
 					</view>
 				</view>
@@ -144,6 +109,7 @@
 						<view class="int">
 							<view class="icon" style="background-color: #3f51b5">&#xe606;</view>
 							<view class="title">我的简历</view>
+							<view class="bage" v-if="user.id && !user.resume">待完善</view>
 						</view>
 					</view>
 				</view>
@@ -208,6 +174,14 @@
 					</button>
 				</view>
 			</view>
+			<view class="cd" @click="show = true">
+				<view class="out">
+					<view class="int">
+						<view class="icon" style="background-color: #607d8b">&#xe6ee;</view>
+						<view class="title">切换角色</view>
+					</view>
+				</view>
+			</view>
 			<view class="cd" @click="go('/pages/other/setting')">
 				<view class="out">
 					<view class="int">
@@ -217,6 +191,7 @@
 				</view>
 			</view>
 		</view>
+		<u-action-sheet round="20" :actions="type" @select="selectClick" cancelText="取消" :show="show" @close="show = false"></u-action-sheet>
 	</view>
 </template>
 <script>
@@ -224,11 +199,16 @@ export default {
 	data() {
 		return {
 			ip: this.http.ip,
-			user: {}
+			user: {},
+			type: [
+				{ name: '找工作(个人)', value: 0 },
+				{ name: '我要招聘(企业)', value: 1 }
+			],
+			show: false
 		};
 	},
 	onShow() {
-/* 		 		 		 	 this.user = {
+		/* 		 		 		 	 this.user = {
 				token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjkwOThjOGFjLTU2OWItNGE5Yi1iYTE0LTlkYzQ4MTkyYmI0MCJ9.EBZwQ6YxN2gLIxmDoNqts5vO1IMjaqzE7tXsj68aTThvBNXhKylxv9ONucWudrsgTO0Q97UNDw-Wj3466QnJXg'
 			};
 			uni.setStorageSync('user', this.user); */
@@ -252,6 +232,25 @@ export default {
 				}
 			});
 		},
+		//切换角色
+		selectClick(e) {
+			uni.showModal({
+				title: '提示',
+				content: e.value == 0 ? '确定切换到个人用户?' : '确定切换到企业用户?',
+				success: (res) => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/app/user/choice',
+							data: { type: e.value },
+							method: 'POST',
+							success: (res) => {
+								this.getUserInfo();
+							}
+						});
+					}
+				}
+			});
+		},
 		go(url) {
 			if (this.hasLogin()) {
 				uni.navigateTo({ url: url });

app/pages/user/resume/edit.vue

@@ -24,13 +24,6 @@
 			<multiSelector v-model="item.birthday" :range="dict.birthday" name="出生年月" placeholder="请选择出生年月"></multiSelector>
 		</view>
 		<view class="form_group">
-			<view class="lable re">参加工作时间</view>
-			<picker mode="date" fields="month" :end="end" @change="picker($event, 'joinDate')">
-				<input placeholder="请选择参加工作时间" v-model="item.joinDate" :disabled="true" />
-				<view class="icon more">&#xe62b;</view>
-			</picker>
-		</view>
-		<view class="form_group">
 			<view class="lable re">手机号</view>
 			<input type="number" placeholder="请输入手机号" v-model="item.phone" />
 		</view>
@@ -39,27 +32,12 @@
 			<input placeholder="请输入邮箱" v-model="item.email" />
 		</view>
 		<view class="form_group">
-			<view class="lable re">工作城市</view>
-			<picker :disabled="true" @click="go('/pages/job/position/city')">
-				<input placeholder="请选择工作城市" v-model="item.cityName" :disabled="true" />
-				<view class="icon more">&#xe62b;</view>
-			</picker>
-		</view>
-		<view class="form_group">
 			<view class="lable re">意向职位</view>
 			<picker :disabled="true" @click="go('/pages/job/position/classification')">
 				<input placeholder="请选择意向职位" v-model="item.positionName" :disabled="true" />
 				<view class="icon more">&#xe62b;</view>
 			</picker>
 		</view>
-		<view class="form_group">
-			<view class="lable re">期望薪资</view>
-			<multiSelector v-model="item.salary" :range="dict.salary" name="薪资" placeholder="请选择薪资要求"></multiSelector>
-		</view>
-		<view class="form_group">
-			<view class="lable re">个人优势</view>
-			<textarea cols="30" maxlength="200" rows="10" v-model="item.advantage" placeholder="等待输入内容"></textarea>
-		</view>
 		<button class="btn" @click="save()">保存</button>
 	</view>
 </template>
@@ -110,7 +88,6 @@ export default {
 				{ name: 'name', checkType: 'notnull', errorMsg: '请输入姓名' },
 				{ name: 'sex', checkType: 'notnull', errorMsg: '请上选择性别' },
 				{ name: 'birthday', checkType: 'notnull', errorMsg: '请选择出生年月' },
-				{ name: 'joinDate', checkType: 'notnull', errorMsg: '请选择参加工作时间' },
 				{ name: 'phone', checkType: 'phone', errorMsg: '请输入正确的手机号' },
 				{ name: 'email', checkType: 'email', errorMsg: '请输入正确的邮箱' }
 			];

app/pages/user/resume/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="resume">
-		<view class="message _error" v-if="!item.advantage">
+		<view class="message _error" v-if="!item.name">
 			<text class="icon">&#xec72;</text>
 			<text>需要完善简历才能找工作。</text>
 		</view>
@@ -11,29 +11,20 @@
 					<view class="name">
 						<text>{{ item.name ? item.name : '姓名' }}</text>
 					</view>
-					<view class="item">年龄：{{ item.age || '' }}，性别：{{ item.sex || '' }}</view>
-					<view class="item">工作经验：{{ item.experience || '' }}年</view>
+					<view class="item">年龄：{{ item.age || '' }}</view>
+					<view class="item">性别：{{ item.sex || '' }}</view>
 					<view class="item">手机号码：{{ item.phone || '' }}</view>
 					<view class="item">电子邮箱：{{ item.email || '' }}</view>
 				</view>
 				<image :src="item.avatar ? ip + item.avatar : '../../../static/ls.jpg'" mode="widthFix" class="tx" v-if="item.avatar"></image>
 			</view>
 		</view>
-		<!--个人优势-->
-		<view class="row">
-			<view class="label">
-				<text class="title">个人优势</text>
-			</view>
-			<view class="ellip">{{ item.advantage || '还未输入个人优势' }}</view>
-		</view>
 		<!--求职期望-->
 		<view class="row">
 			<view class="label">
 				<text class="title">求职期望</text>
 			</view>
-			<view class="item">工作城市：{{ item.cityName || '' }}</view>
 			<view class="item">意向工作：{{ item.positionName || '' }}</view>
-			<view class="item">期望薪资：{{ item.salary || '' }}</view>
 		</view>
 		<button class="btn" @click="go('/pages/user/resume/edit?item=' + JSON.stringify(item))">编辑</button>
 	</view>

app/pages/user/resume/preview.vue

@@ -7,29 +7,20 @@
 					<view class="name">
 						<text>{{ item.name || '' }}</text>
 					</view>
-					<view class="item">年龄：{{ item.age || '' }}，性别：{{ item.sex || '' }}</view>
-					<view class="item">工作经验：{{ item.experience || '' }}年</view>
+					<view class="item">年龄：{{ item.age || '' }}</view>
+					<view class="item">性别：{{ item.sex || '' }}</view>
 					<view class="item">手机号码：{{ item.phone || '' }}</view>
 					<view class="item">电子邮箱：{{ item.email || '' }}</view>
 				</view>
 				<image :src="item.avatar ? ip + item.avatar : '../../../static/ls.jpg'" mode="widthFix" class="tx" v-if="item.avatar"></image>
 			</view>
 		</view>
-		<!--个人优势-->
-		<view class="row">
-			<view class="label">
-				<text class="title">个人优势</text>
-			</view>
-			<view class="item">{{ item.advantage || '' }}</view>
-		</view>
 		<!--求职期望-->
 		<view class="row">
 			<view class="label">
 				<text class="title">求职期望</text>
 			</view>
-			<view class="item">工作城市：{{ item.cityName || '' }}</view>
 			<view class="item">意向工作：{{ item.positionName || '' }}</view>
-			<view class="item">期望薪资：{{ item.salary || '' }}</view>
 		</view>
 		<button class="btn" @click="invite()">
 			<text class="icon">&#xe6a3;</text>

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ResumeDeliverController.java

@@ -1,66 +0,0 @@
-package com.ruoyi.web.work.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.web.work.domain.ResumeDeliver;
-import com.ruoyi.web.work.service.IResumeDeliverService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 简历投递
- * @author lsw
- * @date 2024-06-13
- */
-@RestController
-@RequestMapping("/work/deliver")
-public class ResumeDeliverController extends BaseController {
-    @Autowired
-    private IResumeDeliverService resumeDeliverService;
-
-    @PreAuthorize("@ss.hasPermi('work:deliver:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(ResumeDeliver resumeDeliver){
-        startPage();
-        List<ResumeDeliver> list = resumeDeliverService.selectList(resumeDeliver);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:deliver:query')")
-    @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") String id){
-        return AjaxResult.success(resumeDeliverService.getById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:deliver:add')")
-    @Log(title = "简历投递", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody ResumeDeliver resumeDeliver){
-        return toAjax(resumeDeliverService.save(resumeDeliver));
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:deliver:edit')")
-    @Log(title = "简历投递", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody ResumeDeliver resumeDeliver){
-        return toAjax(resumeDeliverService.updateById(resumeDeliver));
-    }
-
-    @PreAuthorize("@ss.hasPermi('work:deliver:remove')")
-    @Log(title = "简历投递", businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids){
-        return toAjax(resumeDeliverService.removeByIds(Arrays.asList(ids)));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Resume.java

@@ -36,17 +36,6 @@ public class Resume{
     @ApiModelProperty(value = "年龄:根=据出生年月自动计算")
     private Integer age;
 
-    @NotBlank(message = "个人优势不能为空")
-    @ApiModelProperty(value = "个人优势")
-    private String advantage;
-
-    @ApiModelProperty(value = "工作经验:根=据参与工作时间自动计算")
-    private Integer experience;
-
-    @NotBlank(message = "参与工作时间不能为空")
-    @ApiModelProperty(value = "参与工作时间")
-    private String joinDate;
-
     @NotBlank(message = "手机号不能为空")
     @ApiModelProperty(value = "手机号")
     private String phone;
@@ -59,17 +48,6 @@ public class Resume{
     @ApiModelProperty(value = "邮箱")
     private String email;
 
-    @NotBlank(message = "薪资要求不能为空")
-    @ApiModelProperty(value = "薪资要求")
-    private String salary;
-
-    @NotBlank(message = "工作城市不能为空")
-    @ApiModelProperty(value = "工作城市")
-    private String cityName;
-
-    @ApiModelProperty(value = "城市id")
-    private Long cityId;
-
     @ApiModelProperty(value = "职位id")
     private Long positionId;
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/User.java

@@ -27,6 +27,9 @@ public class User{
     @ApiModelProperty(value = "姓名")
     private String name;
 
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
     @ApiModelProperty(value = "手机号")
     private String phone;
 
@@ -125,4 +128,10 @@ public class User{
 
     @TableField(exist = false)
     private Integer agree;
+
+    @TableField(exist = false)
+    private String resume;
+
+    @TableField(exist = false)
+    private String enterprise;
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ContractServiceImpl.java

@@ -123,7 +123,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         doc.replace("${address}", platform.getAddress(), true, true);
         doc.replace("${name}", user.getName(), true, true);
         doc.replace("${idCard}", user.getIdCard(), true, true);
-        doc.replace("${phone}", user.getPhone(), true, true);
+        if (user.getPhone() != null) {
+            doc.replace("${phone}", user.getPhone(), true, true);
+        }
         doc.replace("${address2}", user.getAddress(), true, true);
         doc.replace("${date}", DateUtils.getDate(), true, true);
         // 查找并替换占位符

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ResumeServiceImpl.java

@@ -6,10 +6,13 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.web.work.api.util.AppUtil;
 import com.ruoyi.web.work.domain.Resume;
+import com.ruoyi.web.work.domain.User;
 import com.ruoyi.web.work.mapper.ResumeMapper;
 import com.ruoyi.web.work.service.IResumeService;
+import com.ruoyi.web.work.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.Validator;
 import java.util.List;
@@ -24,6 +27,9 @@ public class ResumeServiceImpl extends ServiceImpl<ResumeMapper, Resume> impleme
     private ResumeMapper resumeMapper;
 
     @Autowired
+    private IUserService userService;
+
+    @Autowired
     protected Validator validator;
 
     @Override
@@ -44,17 +50,20 @@ public class ResumeServiceImpl extends ServiceImpl<ResumeMapper, Resume> impleme
         return AjaxResult.success(resume);
     }
 
+    @Transactional
     @Override
     public AjaxResult edit(Resume resume) {
         resume.setId(AppUtil.getUser().getId());
-        //计算年龄
         resume.setAge(Integer.parseInt(DateUtils.getYear()) - Integer.parseInt(resume.getBirthday().substring(0, 4)));
-        //计算工作经验
-        int year = Integer.parseInt(DateUtils.getYear()) - Integer.parseInt(resume.getJoinDate().substring(0, 4));
-        resume.setExperience(year == 0 ? 1 : year);
         if (!updateById(resume)) {
             throw new ServiceException("编辑简历失败");
         }
+        User user = new User();
+        user.setId(AppUtil.getUser().getId());
+        user.setAvatar(resume.getAvatar());
+        if (!userService.updateById(user)) {
+            throw new ServiceException("同步简历头像失败");
+        }
         return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/UserServiceImpl.java

@@ -9,17 +9,22 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.web.work.api.config.TokenServices;
 import com.ruoyi.web.work.api.util.AppUtil;
+import com.ruoyi.web.work.domain.Enterprise;
+import com.ruoyi.web.work.domain.Resume;
 import com.ruoyi.web.work.domain.User;
 import com.ruoyi.web.work.domain.dto.AuthDto;
 import com.ruoyi.web.work.domain.dto.ChoiceDto;
 import com.ruoyi.web.work.domain.dto.LoginDto;
 import com.ruoyi.web.work.domain.dto.UserDto;
 import com.ruoyi.web.work.mapper.UserMapper;
+import com.ruoyi.web.work.service.IEnterpriseService;
+import com.ruoyi.web.work.service.IResumeService;
 import com.ruoyi.web.work.service.IUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -36,6 +41,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     private TokenServices tokenService;
 
     @Autowired
+    private IResumeService resumeService;
+
+    @Autowired
+    private IEnterpriseService enterpriseService;
+
+    @Autowired
     private Environment env;
 
     @Override
@@ -95,6 +106,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return AjaxResult.success();
     }
 
+    @Transactional
     @Override
     public AjaxResult choice(ChoiceDto dto) {
         User user = new User();
@@ -103,6 +115,28 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (!updateById(user)) {
             throw new ServiceException("选择用户类型失败");
         }
+        //个人用户
+        if (user.getType() == 0) {
+            Resume resume = resumeService.getById(AppUtil.getUser().getId());
+            if (resume == null) {
+                resume = new Resume();
+                resume.setId(AppUtil.getUser().getId());
+                if (!resumeService.save(resume)) {
+                    throw new ServiceException("选择用户类型创建简历失败");
+                }
+            }
+        }
+        //企业用户
+        if (user.getType() == 1) {
+            Enterprise enterprise = enterpriseService.getById(AppUtil.getUser().getId());
+            if (enterprise == null) {
+                enterprise = new Enterprise();
+                enterprise.setId(AppUtil.getUser().getId());
+                if (!enterpriseService.save(enterprise)) {
+                    throw new ServiceException("选择用户类型创建企业信息失败");
+                }
+            }
+        }
         tokenService.setLoginUser(getById(AppUtil.getUser().getId()).setToken(AppUtil.getUser().getToken()));
         return AjaxResult.success();
     }

ruoyi-admin/src/main/resources/mapper/work/UserMapper.xml

@@ -23,7 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( SELECT COUNT( d.id ) FROM tb_resume_deliver d WHERE d.user_id = u.id AND d.state=1 AND d.is_accept=1) AS invite,
             ( SELECT COUNT( d.id ) FROM tb_resume_deliver d WHERE d.enterprise_id = u.id) AS receive,
             ( SELECT COUNT( d.id ) FROM tb_resume_deliver d WHERE d.enterprise_id = u.id AND d.state=1) AS ask,
-            ( SELECT COUNT( d.id ) FROM tb_resume_deliver d WHERE d.enterprise_id = u.id AND d.state=1 AND d.is_accept=1) AS agree
+            ( SELECT COUNT( d.id ) FROM tb_resume_deliver d WHERE d.enterprise_id = u.id AND d.state=1 AND d.is_accept=1) AS agree,
+            ( SELECT name FROM tb_resume d WHERE d.id = u.id) AS resume,
+            ( SELECT name FROM tb_enterprise d WHERE d.id = u.id) AS enterprise
         FROM
             tb_user u
         WHERE