diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java index 6472b9d..3e08725 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java +++ b/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="电子合同表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java index 7f2c37c..0ee51c0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java +++ b/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 = "合同甲方名称") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java index 1becbef..a5c75e6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java index 124bdcd..d76e1f1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java index 03cbe6d..65cef01 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue index 0d6d191..1c425f3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue +++ b/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"}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue index 58f2efc..47bcd76 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue @@ -18,6 +18,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts index 3b527fc..b13509e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts +++ b/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', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/controller/EmployUserInfoController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/controller/EmployUserInfoController.java new file mode 100644 index 0000000..4dd0e2d --- /dev/null +++ b/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 { + @Autowired + private IEmployUserInfoService employUserInfoService; + + /** + * 分页列表查询 + * + * @param employUserInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "用户信息表-分页列表查询") + @ApiOperation(value="用户信息表-分页列表查询", notes="用户信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployUserInfo employUserInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employUserInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employUserInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employUserInfo + * @return + */ + @AutoLog(value = "用户信息表-添加") + @ApiOperation(value="用户信息表-添加", notes="用户信息表-添加") + @PostMapping(value = "/add") + public Result 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 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 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 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 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); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/entity/EmployUserInfo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/entity/EmployUserInfo.java new file mode 100644 index 0000000..b9d7480 --- /dev/null +++ b/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; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/EmployUserInfoMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/EmployUserInfoMapper.java new file mode 100644 index 0000000..7c68363 --- /dev/null +++ b/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 { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/xml/EmployUserInfoMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/xml/EmployUserInfoMapper.xml new file mode 100644 index 0000000..624db80 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/mapper/xml/EmployUserInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/service/IEmployUserInfoService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/service/IEmployUserInfoService.java new file mode 100644 index 0000000..8478990 --- /dev/null +++ b/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 { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/service/impl/EmployUserInfoServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/service/impl/EmployUserInfoServiceImpl.java new file mode 100644 index 0000000..6c0e8b9 --- /dev/null +++ b/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 implements IEmployUserInfoService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/EmployUserInfoList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/EmployUserInfoList.vue new file mode 100644 index 0000000..a4e4929 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/EmployUserInfoList.vue @@ -0,0 +1,202 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoForm.vue new file mode 100644 index 0000000..37f3cfc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoForm.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.Style#Drawer.vue new file mode 100644 index 0000000..66257cf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.vue new file mode 100644 index 0000000..04e8a49 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue/modules/EmployUserInfoModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfo.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfo.api.ts new file mode 100644 index 0000000..9c5f294 --- /dev/null +++ b/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}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfo.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfo.data.ts new file mode 100644 index 0000000..4e7293e --- /dev/null +++ b/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" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfoList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfoList.vue new file mode 100644 index 0000000..01886d7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/EmployUserInfoList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/components/EmployUserInfoModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/components/EmployUserInfoModal.vue new file mode 100644 index 0000000..7270c63 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employUserInfo/vue3/components/EmployUserInfoModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java index c85fa03..7fbff92 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java +++ b/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); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CollectionBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CollectionBean.java new file mode 100644 index 0000000..4675133 --- /dev/null +++ b/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; +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WatchMeBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WatchMeBean.java new file mode 100644 index 0000000..f30f2a0 --- /dev/null +++ b/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 employJobList; + List employResumeList; +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java index d594c94..363922f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java +++ b/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 page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employResumeService + //根据求职者id查询求职者基本信息 + List hanHaiMemberList = hanHaiMemberService .lambdaQuery() - .in(EmployResume::getUserId,objects) - .page(page); + .in(HanHaiMember::getId, objects) + .list(); + + //根据求职者id查询求职者简历 +// Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); +// Page pageList = employResumeService +// .lambdaQuery() +// .in(EmployResume::getUserId,objects) +// .page(page); + List watchMeBeanList = new ArrayList<>(); + for (HanHaiMember haiMember : hanHaiMemberList) { + WatchMeBean watchMeBean = new WatchMeBean(); + List 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); } //我的招工 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index f834682..102e0f1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/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); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java index 5eeeab1..3d97f3b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java +++ b/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 page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employJobService + + //根据招聘人员id查询招聘人员基本信息 + List hanHaiMemberList = hanHaiMemberService .lambdaQuery() - .in(EmployJob::getUserId,objects) - .page(page); + .in(HanHaiMember::getId, objects) + .list(); + + //根据招聘人员id查询发布的工作岗位 +// Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); +// Page pageList = employJobService +// .lambdaQuery() +// .in(EmployJob::getUserId,objects) +// .page(page); + List watchMeBeanList = new ArrayList<>(); + for (HanHaiMember haiMember : hanHaiMemberList) { + WatchMeBean watchMeBean = new WatchMeBean(); + List 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); } //会员中心-我的找活