diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java index 4e834dc..b2353e0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java @@ -9,8 +9,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.apache.ibatis.annotations.Update; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -41,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ @Api(tags="企业信息实名认证表") @@ -51,17 +49,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class EmployAhthenticationCompanyController extends JeecgController { @Autowired private IEmployAhthenticationCompanyService employAhthenticationCompanyService; - - // 添加一键审核接口 - @AutoLog(value = "一键审核") - @ApiOperation(value="一键审核", notes="一键审核") - @PostMapping(value = "/batchAudit") - public Result batchAudit() { - System.out.println("hello"); - return Result.OK("添加成功！"); - } - - /** + + /** * 分页列表查询 * * @param employAhthenticationCompany diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java index 814de8b..91cfcdd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ @Data @@ -85,6 +85,10 @@ public class EmployAhthenticationCompany implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户id") private java.lang.String userId; + /**有效期*/ + @Excel(name = "有效期", width = 15) + @ApiModelProperty(value = "有效期") + private java.util.Date validTime; /**审核备注*/ @Excel(name = "审核备注", width = 15) @ApiModelProperty(value = "审核备注") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java index a1c9fde..2352aa0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ public interface EmployAhthenticationCompanyMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java index f884a74..956cc9a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ public interface IEmployAhthenticationCompanyService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java index 80056ef..d9f4f7d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue index 116b6ea..1fe7332 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue @@ -189,6 +189,11 @@ align:"center", dataIndex: 'userId_dictText' }, + { + title:'有效期', + align:"center", + dataIndex: 'validTime' + }, { title:'审核备注', align:"center", @@ -237,6 +242,7 @@ fieldList.push({type:'Text',value:'authorizationBook',text:'授权书',dictCode:''}) fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'employ_status'}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'datetime',value:'validTime',text:'有效期'}) fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue index 9406a8b..a67447c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue @@ -48,6 +48,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts index 12ecca7..5abe6f1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts @@ -51,6 +51,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, + { + title: '有效期', + align:"center", + dataIndex: 'validTime' + }, { title: '审核备注', align:"center", @@ -132,6 +137,11 @@ export const formSchema: FormSchema[] = [ dictCode:"han_hai_member,nick_name,id" }, }, + { + label: '有效期', + field: 'validTime', + component: 'Input', + }, { label: '审核备注', field: 'remark', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java index ea3643e..93a0e9d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 个人实名认证信息表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ @Api(tags="个人实名认证信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java index 7dd568f..e89072b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 个人实名认证信息表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ @Data @@ -67,6 +67,10 @@ public class EmployAuthenticationPerson implements Serializable { @Excel(name = "授权书", width = 15) @ApiModelProperty(value = "授权书") private java.lang.String authorizationBook; + /**技能证书*/ + @Excel(name = "技能证书", width = 15) + @ApiModelProperty(value = "技能证书") + private java.lang.String skillBook; /**审核状态*/ @Excel(name = "审核状态", width = 15, dicCode = "employ_status") @Dict(dicCode = "employ_status") @@ -77,6 +81,10 @@ public class EmployAuthenticationPerson implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户id") private java.lang.String userId; + /**有效期*/ + @Excel(name = "有效期", width = 15) + @ApiModelProperty(value = "有效期") + private java.util.Date validTime; /**审核备注*/ @Excel(name = "审核备注", width = 15) @ApiModelProperty(value = "审核备注") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java index e5c2faf..13c09d6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 个人实名认证信息表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ public interface EmployAuthenticationPersonMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java index 3f9e059..f2fff67 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 个人实名认证信息表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ public interface IEmployAuthenticationPersonService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java index 3a851c4..f7999e6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 个人实名认证信息表 * @Author: jeecg-boot - * @Date: 2025-05-22 + * @Date: 2025-08-05 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue index 5cfaf4e..26d90ed 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue @@ -181,6 +181,12 @@ dataIndex: 'authorizationBook', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'技能证书', + align:"center", + dataIndex: 'skillBook', + scopedSlots: {customRender: 'imgSlot'} + }, { title:'审核状态', align:"center", @@ -191,6 +197,11 @@ align:"center", dataIndex: 'userId_dictText' }, + { + title:'有效期', + align:"center", + dataIndex: 'validTime' + }, { title:'审核备注', align:"center", @@ -235,8 +246,10 @@ fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''}) fieldList.push({type:'string',value:'image',text:'身份证人像面照片',dictCode:''}) fieldList.push({type:'Text',value:'authorizationBook',text:'授权书',dictCode:''}) + fieldList.push({type:'Text',value:'skillBook',text:'技能证书',dictCode:''}) fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'employ_status'}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'datetime',value:'validTime',text:'有效期'}) fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue index a4f4a30..acd8530 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue @@ -28,6 +28,11 @@ + + + + + @@ -38,6 +43,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts index 027b8bd..1900637 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts @@ -31,6 +31,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'authorizationBook', customRender:render.renderAvatar, }, + { + title: '技能证书', + align:"center", + dataIndex: 'skillBook', + customRender:render.renderAvatar, + }, { title: '审核状态', align:"center", @@ -41,6 +47,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, + { + title: '有效期', + align:"center", + dataIndex: 'validTime' + }, { title: '审核备注', align:"center", @@ -108,6 +119,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '技能证书', + field: 'skillBook', + component: 'JImageUpload', + componentProps:{ + }, + }, { label: '审核状态', field: 'status', @@ -124,6 +142,11 @@ export const formSchema: FormSchema[] = [ dictCode:"han_hai_member,nick_name,id" }, }, + { + label: '有效期', + field: 'validTime', + component: 'Input', + }, { label: '审核备注', field: 'remark', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/controller/EmployCheckPhoneController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/controller/EmployCheckPhoneController.java new file mode 100644 index 0000000..7a08aae --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/controller/EmployCheckPhoneController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employCheckPhone.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.employCheckPhone.entity.EmployCheckPhone; +import org.jeecg.modules.employCheckPhone.service.IEmployCheckPhoneService; + +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: 2025-08-05 + * @Version: V1.0 + */ +@Api(tags="电话查看表") +@RestController +@RequestMapping("/employCheckPhone/employCheckPhone") +@Slf4j +public class EmployCheckPhoneController extends JeecgController { + @Autowired + private IEmployCheckPhoneService employCheckPhoneService; + + /** + * 分页列表查询 + * + * @param employCheckPhone + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "电话查看表-分页列表查询") + @ApiOperation(value="电话查看表-分页列表查询", notes="电话查看表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployCheckPhone employCheckPhone, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employCheckPhone, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employCheckPhoneService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employCheckPhone + * @return + */ + @AutoLog(value = "电话查看表-添加") + @ApiOperation(value="电话查看表-添加", notes="电话查看表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployCheckPhone employCheckPhone) { + employCheckPhoneService.save(employCheckPhone); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employCheckPhone + * @return + */ + @AutoLog(value = "电话查看表-编辑") + @ApiOperation(value="电话查看表-编辑", notes="电话查看表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployCheckPhone employCheckPhone) { + employCheckPhoneService.updateById(employCheckPhone); + 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) { + employCheckPhoneService.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.employCheckPhoneService.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) { + EmployCheckPhone employCheckPhone = employCheckPhoneService.getById(id); + if(employCheckPhone==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employCheckPhone); + } + + /** + * 导出excel + * + * @param request + * @param employCheckPhone + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployCheckPhone employCheckPhone) { + return super.exportXls(request, employCheckPhone, EmployCheckPhone.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, EmployCheckPhone.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/entity/EmployCheckPhone.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/entity/EmployCheckPhone.java new file mode 100644 index 0000000..461f2cb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/entity/EmployCheckPhone.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.employCheckPhone.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: 2025-08-05 + * @Version: V1.0 + */ +@Data +@TableName("employ_check_phone") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_check_phone对象", description="电话查看表") +public class EmployCheckPhone 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; + /**关联简历id*/ + @Excel(name = "关联简历id", width = 15, dictTable = "employ_resume", dicText = "name", dicCode = "id") + @Dict(dictTable = "employ_resume", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联简历id") + private java.lang.String resumeId; + /**关联用户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/employCheckPhone/mapper/EmployCheckPhoneMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/mapper/EmployCheckPhoneMapper.java new file mode 100644 index 0000000..a2dbac5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/mapper/EmployCheckPhoneMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employCheckPhone.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employCheckPhone.entity.EmployCheckPhone; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 电话查看表 + * @Author: jeecg-boot + * @Date: 2025-08-05 + * @Version: V1.0 + */ +public interface EmployCheckPhoneMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/mapper/xml/EmployCheckPhoneMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/mapper/xml/EmployCheckPhoneMapper.xml new file mode 100644 index 0000000..48f9d27 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/mapper/xml/EmployCheckPhoneMapper.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/employCheckPhone/service/IEmployCheckPhoneService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/service/IEmployCheckPhoneService.java new file mode 100644 index 0000000..84c41cf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/service/IEmployCheckPhoneService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employCheckPhone.service; + +import org.jeecg.modules.employCheckPhone.entity.EmployCheckPhone; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 电话查看表 + * @Author: jeecg-boot + * @Date: 2025-08-05 + * @Version: V1.0 + */ +public interface IEmployCheckPhoneService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/service/impl/EmployCheckPhoneServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/service/impl/EmployCheckPhoneServiceImpl.java new file mode 100644 index 0000000..5c017d0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/service/impl/EmployCheckPhoneServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employCheckPhone.service.impl; + +import org.jeecg.modules.employCheckPhone.entity.EmployCheckPhone; +import org.jeecg.modules.employCheckPhone.mapper.EmployCheckPhoneMapper; +import org.jeecg.modules.employCheckPhone.service.IEmployCheckPhoneService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 电话查看表 + * @Author: jeecg-boot + * @Date: 2025-08-05 + * @Version: V1.0 + */ +@Service +public class EmployCheckPhoneServiceImpl extends ServiceImpl implements IEmployCheckPhoneService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/EmployCheckPhoneList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/EmployCheckPhoneList.vue new file mode 100644 index 0000000..17617f9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/EmployCheckPhoneList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneForm.vue new file mode 100644 index 0000000..6e68f00 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneModal.Style#Drawer.vue new file mode 100644 index 0000000..a39e68a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneModal.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/employCheckPhone/vue/modules/EmployCheckPhoneModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneModal.vue new file mode 100644 index 0000000..ef2bc75 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue/modules/EmployCheckPhoneModal.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/employCheckPhone/vue3/EmployCheckPhone.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/EmployCheckPhone.api.ts new file mode 100644 index 0000000..b42bc4b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/EmployCheckPhone.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employCheckPhone/employCheckPhone/list', + save='/employCheckPhone/employCheckPhone/add', + edit='/employCheckPhone/employCheckPhone/edit', + deleteOne = '/employCheckPhone/employCheckPhone/delete', + deleteBatch = '/employCheckPhone/employCheckPhone/deleteBatch', + importExcel = '/employCheckPhone/employCheckPhone/importExcel', + exportXls = '/employCheckPhone/employCheckPhone/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/employCheckPhone/vue3/EmployCheckPhone.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/EmployCheckPhone.data.ts new file mode 100644 index 0000000..e18bf56 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/EmployCheckPhone.data.ts @@ -0,0 +1,39 @@ +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: '关联简历id', + align:"center", + dataIndex: 'resumeId_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联简历id', + field: 'resumeId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_resume,name,id" + }, + }, + { + 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/employCheckPhone/vue3/EmployCheckPhoneList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/EmployCheckPhoneList.vue new file mode 100644 index 0000000..2d410f4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/EmployCheckPhoneList.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/employCheckPhone/vue3/components/EmployCheckPhoneModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/components/EmployCheckPhoneModal.vue new file mode 100644 index 0000000..0a5e2d3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckPhone/vue3/components/EmployCheckPhoneModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java index 31811d3..4accd82 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-08-05 * @Version: V1.0 */ @Api(tags="会员类型表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java index 23c75fe..0bff73e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-08-05 * @Version: V1.0 */ @Data @@ -69,4 +69,8 @@ public class EmployVipType implements Serializable { @Dict(dicCode = "employ_vip_type") @ApiModelProperty(value = "会员类型") private java.lang.String type; + /**简历查看次数*/ + @Excel(name = "简历查看次数", width = 15) + @ApiModelProperty(value = "简历查看次数") + private java.lang.Integer checknum; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java index db0b191..5e30d4c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-08-05 * @Version: V1.0 */ public interface EmployVipTypeMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java index 432f71e..ea876e6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-08-05 * @Version: V1.0 */ public interface IEmployVipTypeService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java index c2b1094..4da89d3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-08-05 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue index 3ce95e4..d613738 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue @@ -174,6 +174,11 @@ align:"center", dataIndex: 'type_dictText' }, + { + title:'简历查看次数', + align:"center", + dataIndex: 'checknum' + }, { title: '操作', dataIndex: 'action', @@ -213,6 +218,7 @@ fieldList.push({type:'string',value:'recharge',text:'充值类型',dictCode:'employ_recharge'}) fieldList.push({type:'string',value:'perquisite',text:'专属特权',dictCode:''}) fieldList.push({type:'string',value:'type',text:'会员类型',dictCode:'employ_vip_type'}) + fieldList.push({type:'int',value:'checknum',text:'简历查看次数',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue index a0b2657..7ea97a6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue @@ -28,6 +28,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts index 3d089e1..28efb63 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts @@ -29,6 +29,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'type_dictText' }, + { + title: '简历查看次数', + align:"center", + dataIndex: 'checknum' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -90,4 +95,9 @@ export const formSchema: FormSchema[] = [ dictCode:"employ_vip_type" }, }, + { + label: '简历查看次数', + field: 'checknum', + component: 'InputNumber', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index 7c04efb..3173f58 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -9,6 +9,10 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.service.IEmployConfigService; +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.service.AppletLoginService; @@ -19,6 +23,7 @@ import javax.annotation.Resource; import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.InputStreamReader; +import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -27,6 +32,7 @@ import java.util.Map; @Service public class AppletLoginServiceImpl implements AppletLoginService { + /******************************************************************************************************************/ //微信小程序appid(特易招) private static final String mpAppId = "wxe631bce44d54667e"; //微信小程序appSecret(特易招) @@ -40,6 +46,14 @@ public class AppletLoginServiceImpl implements AppletLoginService { @Resource private HttpConf httpConf; + //系统配置 + @Resource + private IEmployConfigService employConfigService; + //积分记录表 + @Resource + private IEmployScoreRecordService employScoreRecordService; + /******************************************************************************************************************/ + @@ -83,6 +97,30 @@ public class AppletLoginServiceImpl implements AppletLoginService { map.put("userInfo", member); map.put("token", token); + //用户推荐积分增加 + if(StringUtils.isNotEmpty(loginReq.getShareId())){ + HanHaiMember shareMember = memberService.getById(loginReq.getShareId()); + if(null != shareMember){ + //获取推荐积分数值 + EmployConfig config = employConfigService + .lambdaQuery() + .eq(EmployConfig::getParamCode, "config_share_score") + .one(); + BigDecimal shareScore = BigDecimal.valueOf(Double.valueOf(config.getParamValue())); + BigDecimal newScore = shareMember.getIntegerPrice().add(shareScore); + shareMember.setIntegerPrice(newScore); + memberService.updateById(shareMember); + + //积分记录添加 + EmployScoreRecord record = new EmployScoreRecord(); + record.setScore(shareScore); + record.setUserId(shareMember.getId()); + record.setTitle("分享好友获取积分"); + record.setType("0"); + employScoreRecordService.save(record); + } + } + result.setCode(200); result.setResult(map); return result; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java index f191b51..78ddc1d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java @@ -60,4 +60,11 @@ public class ScoreController { return scoreService.judgeSign(token); } + //我的服务-我的积分-积分清零 + @ApiOperation(value="我的服务-我的积分-积分清零", notes="我的服务-我的积分-积分清零") + @RequestMapping(value = "/clearScore", method = {RequestMethod.GET}) + public Result clearScore(){ + return scoreService.clearScore(); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java index 73eb002..be23614 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java @@ -52,4 +52,11 @@ public class UserController { return userInfoService.getDataByUserId(userId); } + //获取查看电话剩余次数 + @ApiOperation(value="获取查看电话剩余次数", notes="获取查看电话剩余次数") + @RequestMapping(value = "/queryPhoneNum", method = {RequestMethod.GET}) + public Result queryPhoneNum(@RequestHeader("X-Access-Token") String token, String resumeId){ + return userInfoService.queryPhoneNum(token, resumeId); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java index 5f26c65..43cb33d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java @@ -1,8 +1,11 @@ package org.jeecg.modules.apiService; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; public interface ScoreService { @@ -21,4 +24,7 @@ public interface ScoreService { //判断当日是否已签到 public Boolean judgeSign(String token); + //我的服务-我的积分-积分清零 + public Result clearScore(); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java index 9bafdb0..4395469 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java @@ -1,8 +1,11 @@ package org.jeecg.modules.apiService; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; /** * 个人信息接口补充：lzx @@ -20,4 +23,7 @@ public interface UserInfoService { //根据userId查询个人相关信息 public Result getDataByUserId(String userId); + + //获取查看电话剩余次数 + public Result queryPhoneNum(String token, String resumeId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java index 337cbbc..084317c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.apiService.impl; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.AuthenticationService; +import org.jeecg.modules.apiUtils.CommonUtils; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; @@ -11,6 +12,7 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; @Service public class AuthenticationServiceImpl implements AuthenticationService { @@ -63,7 +65,13 @@ public class AuthenticationServiceImpl implements AuthenticationService { message = "审核已通过，不能修改！"; } }else { + Date oldTime = CommonUtils.getCurrentTime(); + int addTime = 12;//12个余额 + //在当前有效期基础上增加时长 + Date newTime = CommonUtils.getValidTime(oldTime, addTime); + employAuthenticationPerson.setUserId(hanHaiMember.getId()); + employAuthenticationPerson.setValidTime(newTime); boolean result = employAuthenticationPersonService.save(employAuthenticationPerson); message = "个人实名添加成功！"; } @@ -114,7 +122,13 @@ public class AuthenticationServiceImpl implements AuthenticationService { message = "审核已通过，不能修改！"; } }else { + Date oldTime = CommonUtils.getCurrentTime(); + int addTime = 12;//12个余额 + //在当前有效期基础上增加时长 + Date newTime = CommonUtils.getValidTime(oldTime, addTime); + employAhthenticationCompany.setUserId(hanHaiMember.getId()); + employAhthenticationCompany.setValidTime(newTime); boolean result = employAhthenticationCompanyService.save(employAhthenticationCompany); message = "企业实名添加成功！"; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java index 751cc20..7ed4851 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java @@ -81,6 +81,7 @@ public class CheckServiceImpl implements CheckService { public Result queryWatchWhoBoss(String token, PageBean pageBean) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1870164829569347586"); try{ //查看简历查看记录 @@ -94,24 +95,26 @@ public class CheckServiceImpl implements CheckService { for (EmployCheckResume record : pageList.getRecords()) { //获取简历信息 EmployResume employResume = employResumeService.getById(record.getResumeId()); - //获取用户信息 - HanHaiMember member = hanHaiMemberService.getById(employResume.getUserId()); - employResume.setHanHaiMember(member); - //获取个人实名信息 - EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService - .lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, employResume.getUserId()) - .one(); - employResume.setEmployAuthenticationPerson(ahthenticationPerson); - //获取工作性质信息 - EmployNature nature = employNatureService.getById(employResume.getNatureId()); - employResume.setNatureId_dictText(nature.getName()); - //获取工种信息 - EmployJobType jobType = employJobTypeService.getById(employResume.getTypeId()); - employResume.setTypeId_dictText(jobType.getName()); - - //将简历信息添加到查看记录中 - record.setEmployResume(employResume); + if(null != employResume){ + //获取用户信息 + HanHaiMember member = hanHaiMemberService.getById(employResume.getUserId()); + employResume.setHanHaiMember(member); + //获取个人实名信息 + EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, employResume.getUserId()) + .one(); + employResume.setEmployAuthenticationPerson(ahthenticationPerson); + //获取工作性质信息 + EmployNature nature = employNatureService.getById(employResume.getNatureId()); + employResume.setNatureId_dictText(nature.getName()); + //获取工种信息 + EmployJobType jobType = employJobTypeService.getById(employResume.getTypeId()); + employResume.setTypeId_dictText(jobType.getName()); + + //将简历信息添加到查看记录中 + record.setEmployResume(employResume); + } } return Result.OK("我看过谁", pageList); @@ -125,8 +128,8 @@ public class CheckServiceImpl implements CheckService { @Override public Result queryWatchMeBoss(String token, PageBean pageBean) { //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember hanHaiMember = hanHaiMemberService.getById("1870164829569347586"); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1870164829569347586"); try{ //查询我发布的工作列表 @@ -180,24 +183,26 @@ public class CheckServiceImpl implements CheckService { .lambdaQuery() .eq(EmployResume::getUserId, record.getId()) .one(); + if(null != resume){ + //添加用户信息 + resume.setHanHaiMember(record); + //添加个人实名信息 + EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, record.getId()) + .one(); + resume.setEmployAuthenticationPerson(ahthenticationPerson); + //添加工作性质信息 + EmployNature nature = employNatureService.getById(resume.getNatureId()); + resume.setNatureId_dictText(nature.getName()); + //添加工种信息 + EmployJobType jobType = employJobTypeService.getById(resume.getTypeId()); + resume.setTypeId_dictText(jobType.getName()); + + resumeList.add(resume); + //record.setEmployResume(resume); + } - //添加用户信息 - resume.setHanHaiMember(record); - //添加个人实名信息 - EmployAuthenticationPerson ahthenticationPerson = employAuthenticationPersonService - .lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, record.getId()) - .one(); - resume.setEmployAuthenticationPerson(ahthenticationPerson); - //添加工作性质信息 - EmployNature nature = employNatureService.getById(resume.getNatureId()); - resume.setNatureId_dictText(nature.getName()); - //添加工种信息 - EmployJobType jobType = employJobTypeService.getById(resume.getTypeId()); - resume.setTypeId_dictText(jobType.getName()); - - resumeList.add(resume); - //record.setEmployResume(resume); } return Result.OK("谁看过我(谁看过我的招工)列表", resumeList); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java index bf48f05..61f8625 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.JobService; +import org.jeecg.modules.apiUtils.CommonUtils; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; @@ -111,6 +112,12 @@ public class JobServiceImpl implements JobService { //工作岗位发布人id query.like(EmployJob::getUserId, userId); } + + //招聘截止时间 + query.gt(EmployJob::getDeadline, CommonUtils.getCurrentTime()) + .or() + .isNull(EmployJob::getDeadline); + //按时间倒序 query.orderByDesc(EmployJob::getCreateTime); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java index 6e0d00d..47a2379 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java @@ -6,6 +6,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ScoreService; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.service.IEmployConfigService; import org.jeecg.modules.employScore.entity.EmployScore; import org.jeecg.modules.employScore.service.IEmployScoreService; import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; @@ -17,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; @Service public class ScoreServiceImpl implements ScoreService { @@ -36,6 +39,10 @@ public class ScoreServiceImpl implements ScoreService { //积分记录表 @Resource private IEmployScoreRecordService employScoreRecordService; + + //配置信息表 + @Resource + private IEmployConfigService employConfigService; /******************************************************************************************************************/ //会员中心-积分 @@ -111,7 +118,13 @@ public class ScoreServiceImpl implements ScoreService { return Result.error("已签到，不可重复签到"); } - BigDecimal score = BigDecimal.valueOf(2);//签到积分 + //1、签到积分查询 + EmployConfig config = employConfigService + .lambdaQuery() + .eq(EmployConfig::getParamCode, "config_sign_score") + .one(); + double signScore = Double.parseDouble(config.getParamValue()); + BigDecimal score = BigDecimal.valueOf(signScore);//签到积分 BigDecimal newScore = hanHaiMember.getIntegerPrice().add(score); hanHaiMember.setIntegerPrice(newScore); @@ -172,5 +185,35 @@ public class ScoreServiceImpl implements ScoreService { } } + //积分清零 + @Override + public Result clearScore() { + try{ + //积分清零 + BigDecimal score = BigDecimal.valueOf(0); + + List hanHaiMemberList = hanHaiMemberService.list(); + for (HanHaiMember hanHaiMember : hanHaiMemberList) { + //添加积分记录 + EmployScoreRecord record = new EmployScoreRecord(); + record.setScore(hanHaiMember.getIntegerPrice()); + record.setUserId(hanHaiMember.getId()); + record.setTitle("积分清零"); + record.setType("1"); + employScoreRecordService.save(record); + + //减少用户积分 + hanHaiMember.setIntegerPrice(score); + hanHaiMemberService.updateById(hanHaiMember); + } + + return Result.OK("积分清零成功"); + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("积分清零失败"); + } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java index 14f4de5..2edd972 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java @@ -5,12 +5,15 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.UserInfoService; +import org.jeecg.modules.apiUtils.CommonUtils; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; +import org.jeecg.modules.employCheckPhone.entity.EmployCheckPhone; +import org.jeecg.modules.employCheckPhone.service.IEmployCheckPhoneService; import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService; import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; @@ -19,6 +22,8 @@ import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; import org.jeecg.modules.employCompany.entity.EmployCompany; import org.jeecg.modules.employCompany.service.IEmployCompanyService; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.service.IEmployConfigService; import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.employJob.service.IEmployJobService; import org.jeecg.modules.employResume.entity.EmployResume; @@ -84,6 +89,10 @@ public class UserInfoServiceImpl implements UserInfoService { @Resource private IEmployCheckResumeService employCheckResumeService; + //查看电话记录表 + @Resource + private IEmployCheckPhoneService employCheckPhoneService; + //会员信息关联表 @Resource private IEmployVipUserService employVipUserService; @@ -95,6 +104,10 @@ public class UserInfoServiceImpl implements UserInfoService { //积分信息表 @Resource private ScoreServiceImpl scoreService; + + //配置信息表 + @Resource + private IEmployConfigService employConfigService; /******************************************************************************************************************/ @@ -165,7 +178,22 @@ public class UserInfoServiceImpl implements UserInfoService { boolean signFlag = scoreService.judgeSign(token); //获取用户vip类型 - String vipType = getVip(token); + EmployVipType vip = getVip(hanHaiMember.getId()); + String vipType = "暂未开通会员"; + if(null != vip){ + vipType = vip.getName(); + } + + //获取用户简历可查看次数 + EmployConfig num = employConfigService + .lambdaQuery() + .eq(EmployConfig::getParamCode, "config_check_num") + .one(); + int countNum = Integer.parseInt(num.getParamValue()); + if(null != vip){ + countNum = vip.getChecknum(); + } + int checkNum = getCheckNum(hanHaiMember.getId(), countNum);//简历剩余查看次数 //boss //简历收藏数量 @@ -194,13 +222,16 @@ public class UserInfoServiceImpl implements UserInfoService { map.put("jobCollectionNum", jobCollectionNum); map.put("jobcheckNumEmployee", jobcheckNumEmployee); map.put("resumeCheckNumEmployee", resumeCheckNumEmployee); + map.put("checkNum",checkNum); if(null != ahthenticationPerson){ map.put("personAuthenticationStatus",ahthenticationPerson.getStatus());//个人实名状态 + map.put("personAuthenticationValidTime", ahthenticationPerson.getValidTime());//实名有效时间 }else { map.put("personAuthenticationStatus","-1");//个人实名状态 } if(null != ahthenticationCompany){ map.put("companyAuthenticationStatus",ahthenticationCompany.getStatus());//企业实名状态 + map.put("companyAuthenticationValidTime", ahthenticationCompany.getValidTime());//实名有效时间 }else { map.put("companyAuthenticationStatus","-1");//企业实名状态 } @@ -249,29 +280,80 @@ public class UserInfoServiceImpl implements UserInfoService { } - //获取用户VIP信息 - public String getVip(String token){ + //获取查看电话剩余次数 + @Override + public Result queryPhoneNum(String token, String resumeId) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1870164829569347586"); + + try{ + //如果当天查看过该电话，则当天可以一直查看 + EmployCheckPhone one = employCheckPhoneService + .lambdaQuery() + .eq(EmployCheckPhone::getResumeId, resumeId) + .eq(EmployCheckPhone::getUserId, hanHaiMember.getId()) + .like(EmployCheckPhone::getCreateTime, CommonUtils.getCurrentDay()) + .one(); + if(null != one){ + return Result.OK("剩余电话查看次数", 1); + } + + //获取用户vip类型 + EmployVipType vip = getVip(hanHaiMember.getId()); + + //获取用户简历可查看次数 + EmployConfig num = employConfigService + .lambdaQuery() + .eq(EmployConfig::getParamCode, "config_check_num") + .one(); + int countNum = Integer.parseInt(num.getParamValue()); + if(null != vip){ + countNum = vip.getChecknum(); + } + int checkNum = getCheckPhoneNum(hanHaiMember.getId(), countNum);//剩余电话查看次数 + + //添加电话查看记录 + if(checkNum > 0){ + EmployCheckPhone phone = new EmployCheckPhone(); + phone.setResumeId(resumeId); + phone.setUserId(hanHaiMember.getId()); + employCheckPhoneService.save(phone); + } + + + return Result.OK("剩余电话查看次数", checkNum); + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("剩余电话查看次数", 0); + } + } + + //获取用户VIP信息 + public EmployVipType getVip(String userId){ try{ //查询用户vip关联 EmployVipUser vu = employVipUserService .lambdaQuery() - .eq(EmployVipUser::getUserId, hanHaiMember.getId()) + .eq(EmployVipUser::getUserId, userId) .one(); if(null == vu){ - return "暂未开通VIP"; + return null; } //查询vip信息 EmployVipType vt = employVipTypeService.getById(vu.getTypeId()); + if(null == vt){ + return null; + } - return vt.getName(); + return vt; }catch (Exception e){ e.printStackTrace(); - return "Vip信息查询失败"; + return null; } } @@ -366,6 +448,47 @@ public class UserInfoServiceImpl implements UserInfoService { return checkResumeList.size(); } + //查看电话记录 + public int checkPhone(String userId){ + String currentDay = CommonUtils.getCurrentDay();//当前日期 + List checkResumeList = employCheckPhoneService + .lambdaQuery() + .eq(EmployCheckPhone::getUserId, userId) + .like(EmployCheckPhone::getCreateTime, currentDay) + .list(); + return checkResumeList.size(); + } + + //获取简历剩余查看次数 + public int getCheckNum(String userId, int countNum){ + try{ + + //已查看次数 + int checkedNum = checkResumeNumBoss(userId); + + //剩余查看次数 + int checkNum = countNum - checkedNum; + + return checkNum; + }catch (Exception e){ + return 0; + } + } + + //获取电话剩余查看次数 + public int getCheckPhoneNum(String userId, int countNum){ + try{ + //已查看次数 + int checkedNum = checkPhone(userId); + + //剩余查看次数 + int checkNum = countNum - checkedNum; + + return checkNum; + }catch (Exception e){ + return 0; + } + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/CommonUtils.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/CommonUtils.java new file mode 100644 index 0000000..7781477 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/CommonUtils.java @@ -0,0 +1,45 @@ +package org.jeecg.modules.apiUtils; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +public class CommonUtils { + + //获取当前时间 + public static Date getCurrentTime(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date now = new Date(); + String formattedDate = sdf.format(now); +// System.out.println(now); // 输出格式化后的当前时间 +// System.out.println(formattedDate); // 输出格式化后的当前时间 + return now; + } + + //获取当前日期 + public static String getCurrentDay(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date now = new Date(); + String formattedDate = sdf.format(now); +// System.out.println(now); // 输出格式化后的当前时间 +// System.out.println(formattedDate); // 输出格式化后的当前时间 + return formattedDate; + } + + //获取延长时间 + public static Date getValidTime(Date oldTime, int month){ + // 创建Calendar实例 + Calendar cal = Calendar.getInstance(); + cal.setTime(oldTime); // 设置当前时间 + + // 在当前时间基础上加n个月 + cal.add(Calendar.MONTH, month); + Date newTime = cal.getTime(); + return newTime; + } + + public static void main(String[] args) { + System.out.println(getValidTime(getCurrentTime(), 3)); + } + +}