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 0e72ebf..4e834dc 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,6 +9,8 @@ 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; @@ -39,7 +41,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ @Api(tags="企业信息实名认证表") @@ -49,8 +51,17 @@ 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 @@ -97,10 +108,6 @@ public class EmployAhthenticationCompanyController extends JeecgController edit(@RequestBody EmployAhthenticationCompany employAhthenticationCompany) { employAhthenticationCompanyService.updateById(employAhthenticationCompany); - //如果企业实名通过,则添加公司信息 - if("1".equals(employAhthenticationCompany.getStatus())){ - employAhthenticationCompanyService.addCompany(employAhthenticationCompany); - } return Result.OK("编辑成功!"); } 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 acab5b5..814de8b 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: 2024-12-29 + * @Date: 2025-05-22 * @Version: V1.0 */ @Data @@ -71,6 +71,10 @@ public class EmployAhthenticationCompany implements Serializable { @Excel(name = "招聘者职位", width = 15) @ApiModelProperty(value = "招聘者职位") private java.lang.String career; + /**授权书*/ + @Excel(name = "授权书", width = 15) + @ApiModelProperty(value = "授权书") + private java.lang.String authorizationBook; /**审核状态*/ @Excel(name = "审核状态", width = 15, dicCode = "employ_status") @Dict(dicCode = "employ_status") 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 6a4b8e5..a1c9fde 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: 2024-12-29 + * @Date: 2025-05-22 * @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 db3aa30..f884a74 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 @@ -2,18 +2,13 @@ package org.jeecg.modules.employAhthenticationCompany.service; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.employCompany.entity.EmployCompany; /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ public interface IEmployAhthenticationCompanyService extends IService { - - public void addCompany(EmployAhthenticationCompany employAhthenticationCompany); - - } 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 a858ad0..80056ef 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 @@ -3,45 +3,17 @@ package org.jeecg.modules.employAhthenticationCompany.service.impl; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import org.jeecg.modules.employAhthenticationCompany.mapper.EmployAhthenticationCompanyMapper; import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; -import org.jeecg.modules.employCompany.entity.EmployCompany; -import org.jeecg.modules.employCompany.service.IEmployCompanyService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import javax.annotation.Resource; - /** * @Description: 企业信息实名认证表 * @Author: jeecg-boot - * @Date: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ @Service public class EmployAhthenticationCompanyServiceImpl extends ServiceImpl implements IEmployAhthenticationCompanyService { - //企业实名认证表 - @Resource - private IEmployCompanyService employCompanyService; - - //添加公司信息 - @Override - public void addCompany(EmployAhthenticationCompany employAhthenticationCompany) { - EmployCompany company = new EmployCompany(); - company.setCompanyName(employAhthenticationCompany.getCompanyName()); - company.setAddress(employAhthenticationCompany.getCompanyAddress()); - company.setLicense(employAhthenticationCompany.getBusinessLicense()); - company.setLegalPerson(employAhthenticationCompany.getLegalPerson()); - company.setSocialCode(employAhthenticationCompany.getSocialCode()); - - //判断该公司信息是否已存在, 如果不存在,则添加公司信息 - EmployCompany one = employCompanyService - .lambdaQuery() - .eq(EmployCompany::getSocialCode, company.getSocialCode()) - .one(); - if(null == one){ - employCompanyService.save(company); - } - - } } 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 50b5c0b..116b6ea 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 @@ -173,6 +173,12 @@ align:"center", dataIndex: 'career' }, + { + title:'授权书', + align:"center", + dataIndex: 'authorizationBook', + scopedSlots: {customRender: 'imgSlot'} + }, { title:'审核状态', align:"center", @@ -228,6 +234,7 @@ fieldList.push({type:'string',value:'socialCode',text:'社会统一信用代码',dictCode:''}) fieldList.push({type:'string',value:'businessLicense',text:'工商营业执照',dictCode:''}) fieldList.push({type:'string',value:'career',text:'招聘者职位',dictCode:''}) + fieldList.push({type:'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:'string',value:'remark',text:'审核备注',dictCode:''}) 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 252122e..9406a8b 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 @@ -33,6 +33,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 be7887a..12ecca7 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 @@ -35,6 +35,12 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'career' }, + { + title: '授权书', + align:"center", + dataIndex: 'authorizationBook', + customRender:render.renderAvatar, + }, { title: '审核状态', align:"center", @@ -103,6 +109,13 @@ export const formSchema: FormSchema[] = [ field: 'career', component: 'Input', }, + { + label: '授权书', + field: 'authorizationBook', + component: 'JImageUpload', + componentProps:{ + }, + }, { label: '审核状态', field: 'status', 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 fe0fe68..ea3643e 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: 2024-12-20 + * @Date: 2025-05-22 * @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 93f94a7..7dd568f 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: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ @Data @@ -63,6 +63,10 @@ public class EmployAuthenticationPerson implements Serializable { @Excel(name = "身份证人像面照片", width = 15) @ApiModelProperty(value = "身份证人像面照片") private java.lang.String image; + /**授权书*/ + @Excel(name = "授权书", width = 15) + @ApiModelProperty(value = "授权书") + private java.lang.String authorizationBook; /**审核状态*/ @Excel(name = "审核状态", width = 15, dicCode = "employ_status") @Dict(dicCode = "employ_status") 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 235e44e..e5c2faf 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: 2024-12-20 + * @Date: 2025-05-22 * @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 b9bc000..3f9e059 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: 2024-12-20 + * @Date: 2025-05-22 * @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 c13115a..3a851c4 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: 2024-12-20 + * @Date: 2025-05-22 * @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 966a98b..5cfaf4e 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 @@ -4,6 +4,38 @@
+ + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -143,6 +175,12 @@ dataIndex: 'image', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'授权书', + align:"center", + dataIndex: 'authorizationBook', + scopedSlots: {customRender: 'imgSlot'} + }, { title:'审核状态', align:"center", @@ -196,6 +234,7 @@ fieldList.push({type:'string',value:'cerNo',text:'身份证号',dictCode:''}) 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:'string',value:'status',text:'审核状态',dictCode:'employ_status'}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''}) 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 adb1344..a4f4a30 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 @@ -23,6 +23,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 38fc459..027b8bd 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 @@ -25,6 +25,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'image', customRender:render.renderAvatar, }, + { + title: '授权书', + align:"center", + dataIndex: 'authorizationBook', + customRender:render.renderAvatar, + }, { title: '审核状态', align:"center", @@ -43,6 +49,33 @@ export const columns: BasicColumn[] = [ ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "姓名", + field: "name", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "身份证号", + field: "cerNo", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "联系方式", + field: "phone", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "审核状态", + field: "status", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_status" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -68,6 +101,13 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '授权书', + field: 'authorizationBook', + component: 'JImageUpload', + componentProps:{ + }, + }, { label: '审核状态', field: 'status', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/controller/EmployJobController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/controller/EmployJobController.java index 87acea9..cf71c81 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/controller/EmployJobController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/controller/EmployJobController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-05-22 * @Version: V1.0 */ @Api(tags="工作信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java index e3a82f2..ffd7ae4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java @@ -4,8 +4,6 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -24,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-05-22 * @Version: V1.0 */ @Data @@ -132,6 +130,12 @@ public class EmployJob implements Serializable { @Excel(name = "纬度", width = 15) @ApiModelProperty(value = "纬度") private java.math.BigDecimal latitude; + /**招聘截止时间*/ + @Excel(name = "招聘截止时间", width = 15) + @ApiModelProperty(value = "招聘截止时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date deadline; //用户信息 @TableField(exist = false) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/mapper/EmployJobMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/mapper/EmployJobMapper.java index 96a0c19..142aea0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/mapper/EmployJobMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/mapper/EmployJobMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-05-22 * @Version: V1.0 */ public interface EmployJobMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/IEmployJobService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/IEmployJobService.java index aa46c0d..13258f4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/IEmployJobService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/IEmployJobService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-05-22 * @Version: V1.0 */ public interface IEmployJobService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/impl/EmployJobServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/impl/EmployJobServiceImpl.java index 82a6b4c..fe2b8ea 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/impl/EmployJobServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/service/impl/EmployJobServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-05-22 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/EmployJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/EmployJobList.vue index 574c808..95457d2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/EmployJobList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/EmployJobList.vue @@ -235,6 +235,11 @@ align:"center", dataIndex: 'areaId_dictText' }, + { + title:'招聘截止时间', + align:"center", + dataIndex: 'deadline' + }, { title: '操作', dataIndex: 'action', @@ -287,6 +292,7 @@ fieldList.push({type:'string',value:'areaId',text:'关联区域id',dictCode:"employ_address,adress,id"}) fieldList.push({type:'BigDecimal',value:'longitude',text:'经度',dictCode:''}) fieldList.push({type:'BigDecimal',value:'latitude',text:'纬度',dictCode:''}) + fieldList.push({type:'datetime',value:'deadline',text:'招聘截止时间'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/modules/EmployJobForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/modules/EmployJobForm.vue index eb77bd9..52bd2d0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/modules/EmployJobForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/modules/EmployJobForm.vue @@ -83,6 +83,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue3/EmployJob.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue3/EmployJob.data.ts index 6fc148e..f2c4d58 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue3/EmployJob.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue3/EmployJob.data.ts @@ -75,6 +75,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'areaId_dictText' }, + { + title: '招聘截止时间', + align:"center", + dataIndex: 'deadline' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -224,4 +229,9 @@ export const formSchema: FormSchema[] = [ field: 'latitude', component: 'InputNumber', }, + { + label: '招聘截止时间', + field: 'deadline', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 310cf98..6fe0a0b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: han_hai_member + * @Description: 公用用户信息表 * @Author: jeecg-boot - * @Date: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ -@Api(tags="han_hai_member") +@Api(tags="公用用户信息表") @RestController @RequestMapping("/hanHaiMember/hanHaiMember") @Slf4j @@ -59,8 +59,8 @@ public class HanHaiMemberController extends JeecgController> queryPageList(HanHaiMember hanHaiMember, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController add(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.save(hanHaiMember); @@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController edit(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.updateById(hanHaiMember); @@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { hanHaiMemberService.removeById(id); @@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { HanHaiMember hanHaiMember = hanHaiMemberService.getById(id); @@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index fb32e1d..03e5c8c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: han_hai_member + * @Description: 公用用户信息表 * @Author: jeecg-boot - * @Date: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index bc2fe87..9566858 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: han_hai_member + * @Description: 公用用户信息表 * @Author: jeecg-boot - * @Date: 2024-12-20 + * @Date: 2025-05-22 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 09616c4..68eff52 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -4,6 +4,43 @@
+ + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -12,7 +49,7 @@
新增 - 导出 + 导出 导入 @@ -109,7 +146,7 @@ }, data () { return { - description: 'han_hai_member管理页面', + description: '公用用户信息表管理页面', // 表头 columns: [ { @@ -150,14 +187,14 @@ dataIndex: 'account' }, { - title:'登录密码', + title:'企业名称', align:"center", - dataIndex: 'password' + dataIndex: 'shopName_dictText' }, { title:'角色', align:"center", - dataIndex: 'role' + dataIndex: 'role_dictText' }, { title:'小程序标识', @@ -167,8 +204,14 @@ { title:'积分', align:"center", + sorter: true, dataIndex: 'integerPrice' }, + { + title:'是否拉黑', + align:"center", + dataIndex: 'isForbid' + }, { title: '操作', dataIndex: 'action', @@ -208,10 +251,11 @@ fieldList.push({type:'Text',value:'headImage',text:'用户头像',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''}) - fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) + fieldList.push({type:'sel_search',value:'shopName',text:'企业名称',dictTable:"employ_company", dictText:'company_name', dictCode:'id'}) fieldList.push({type:'string',value:'role',text:'角色',dictCode:'employ_role'}) fieldList.push({type:'string',value:'appletOpenid',text:'小程序标识',dictCode:''}) fieldList.push({type:'BigDecimal',value:'integerPrice',text:'积分',dictCode:''}) + fieldList.push({type:'string',value:'isForbid',text:'是否拉黑',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index 6743274..83033d0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -24,13 +24,13 @@ - - + + - + @@ -43,6 +43,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 7615b5d..ad48f70 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -32,14 +32,14 @@ export const columns: BasicColumn[] = [ dataIndex: 'account' }, { - title: '登录密码', + title: '企业名称', align:"center", - dataIndex: 'password' + dataIndex: 'shopName_dictText' }, { title: '角色', align:"center", - dataIndex: 'role' + dataIndex: 'role_dictText' }, { title: '小程序标识', @@ -49,11 +49,53 @@ export const columns: BasicColumn[] = [ { title: '积分', align:"center", + sorter: true, dataIndex: 'integerPrice' }, + { + title: '是否拉黑', + align:"center", + dataIndex: 'isForbid' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "昵称", + field: "nickName", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "手机号码", + field: "phone", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "登录账号", + field: "account", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "企业名称", + field: "shopName", + component: 'JSearchSelect', + componentProps:{ + dict:"employ_company,company_name,id" + }, + colProps: {span: 6}, + }, + { + label: "角色", + field: "role", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_role" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -80,14 +122,20 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '登录密码', - field: 'password', - component: 'Input', + label: '企业名称', + field: 'shopName', + component: 'JSearchSelect', + componentProps:{ + dict:"employ_company,company_name,id" + }, }, { label: '角色', field: 'role', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_role" + }, }, { label: '小程序标识', @@ -99,4 +147,9 @@ export const formSchema: FormSchema[] = [ field: 'integerPrice', component: 'InputNumber', }, + { + label: '是否拉黑', + field: 'isForbid', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue index d91d68c..75de71c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue @@ -53,7 +53,7 @@ //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ - title: 'han_hai_member', + title: '公用用户信息表', api: list, columns, canResize:false, @@ -70,7 +70,7 @@ }, }, exportConfig: { - name:"han_hai_member", + name:"公用用户信息表", url: getExportUrl, }, importConfig: {