Browse Source

1、考证咨询补充节点信息

master
Aug 1 week ago
parent
commit
ef3b210769
8 changed files with 428 additions and 23 deletions
  1. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/controller/EmployRedisterController.java
  2. +66
    -6
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/entity/EmployRedister.java
  3. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/mapper/EmployRedisterMapper.java
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/IEmployRedisterService.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/impl/EmployRedisterServiceImpl.java
  6. +102
    -3
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue
  7. +77
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue
  8. +179
    -8
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/controller/EmployRedisterController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/** /**
* @Description: 报名材料提交表 * @Description: 报名材料提交表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-12-21
* @Date: 2025-09-02
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="报名材料提交表") @Api(tags="报名材料提交表")


+ 66
- 6
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/entity/EmployRedister.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/** /**
* @Description: 报名材料提交表 * @Description: 报名材料提交表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-12-21
* @Date: 2025-09-02
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@ -119,14 +119,74 @@ public class EmployRedister implements Serializable {
@Excel(name = "工作单位", width = 15) @Excel(name = "工作单位", width = 15)
@ApiModelProperty(value = "工作单位") @ApiModelProperty(value = "工作单位")
private java.lang.String companyName; private java.lang.String companyName;
/**关联证书id*/
@Excel(name = "关联证书id", width = 15, dictTable = "employ_cert", dicText = "name", dicCode = "id")
@Dict(dictTable = "employ_cert", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "关联证书id")
private java.lang.String cerId;
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
private java.lang.String textColumn1;
/**居民身份证号*/
@Excel(name = "居民身份证号", width = 15)
@ApiModelProperty(value = "居民身份证号")
private java.lang.String textColumn2;
/**出生日期*/
@Excel(name = "出生日期", width = 15)
@ApiModelProperty(value = "出生日期")
private java.lang.String textColumn3;
/**性别*/
@Excel(name = "性别", width = 15)
@ApiModelProperty(value = "性别")
private java.lang.String textColumn4;
/**考生来源*/
@Excel(name = "考生来源", width = 15)
@ApiModelProperty(value = "考生来源")
private java.lang.String textColumn5;
/**身份证上的所在地*/
@Excel(name = "身份证上的所在地", width = 15)
@ApiModelProperty(value = "身份证上的所在地")
private java.lang.String textColumn6;
/**从事职业*/
@Excel(name = "从事职业", width = 15)
@ApiModelProperty(value = "从事职业")
private java.lang.String textColumn7;
/**报考工种*/
@Excel(name = "报考工种", width = 15)
@ApiModelProperty(value = "报考工种")
private java.lang.String textColumn8;
/**工作单位/个体名称*/
@Excel(name = "工作单位/个体名称", width = 15)
@ApiModelProperty(value = "工作单位/个体名称")
private java.lang.String textColumn9;
/**文化程度*/
@Excel(name = "文化程度", width = 15)
@ApiModelProperty(value = "文化程度")
private java.lang.String textColumn10;
/**参加工作日期*/
@Excel(name = "参加工作日期", width = 15)
@ApiModelProperty(value = "参加工作日期")
private java.lang.String textColumn11;
/**操作证-正面照*/
@Excel(name = "操作证-正面照", width = 15)
@ApiModelProperty(value = "操作证-正面照")
private java.lang.String imageColumn1;
/**操作证-反面照*/
@Excel(name = "操作证-反面照", width = 15)
@ApiModelProperty(value = "操作证-反面照")
private java.lang.String imageColumn2;
/**安管申请表*/
@Excel(name = "安管申请表", width = 15)
@ApiModelProperty(value = "安管申请表")
private java.lang.String imageColumn3;
/**特种设备体检表*/
@Excel(name = "特种设备体检表", width = 15)
@ApiModelProperty(value = "特种设备体检表")
private java.lang.String imageColumn4;
/**关联用户id*/ /**关联用户id*/
@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "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") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id") @ApiModelProperty(value = "关联用户id")
private java.lang.String userId; private java.lang.String userId;
/**关联证书id*/
@Excel(name = "关联证书id", width = 15, dictTable = "employ_cert", dicText = "name", dicCode = "id")
@Dict(dictTable = "employ_cert", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "关联证书id")
private java.lang.String cerId;
} }

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/mapper/EmployRedisterMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @Description: 报名材料提交表 * @Description: 报名材料提交表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-12-21
* @Date: 2025-09-02
* @Version: V1.0 * @Version: V1.0
*/ */
public interface EmployRedisterMapper extends BaseMapper<EmployRedister> { public interface EmployRedisterMapper extends BaseMapper<EmployRedister> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/IEmployRedisterService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: 报名材料提交表 * @Description: 报名材料提交表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-12-21
* @Date: 2025-09-02
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IEmployRedisterService extends IService<EmployRedister> { public interface IEmployRedisterService extends IService<EmployRedister> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/impl/EmployRedisterServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 报名材料提交表 * @Description: 报名材料提交表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-12-21
* @Date: 2025-09-02
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service


+ 102
- 3
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue View File

@ -9,6 +9,11 @@
<a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input> <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="关联证书id">
<j-search-select-tag placeholder="请选择关联证书id" v-model="queryParam.cerId" dict="employ_cert,name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@ -242,15 +247,94 @@
dataIndex: 'companyName' dataIndex: 'companyName'
}, },
{ {
title:'关联证书id',
title:'姓名',
align:"center", align:"center",
dataIndex: 'cerId_dictText'
dataIndex: 'textColumn1'
},
{
title:'居民身份证号',
align:"center",
dataIndex: 'textColumn2'
},
{
title:'出生日期',
align:"center",
dataIndex: 'textColumn3'
},
{
title:'性别',
align:"center",
dataIndex: 'textColumn4'
},
{
title:'考生来源',
align:"center",
dataIndex: 'textColumn5'
},
{
title:'身份证上的所在地',
align:"center",
dataIndex: 'textColumn6'
},
{
title:'从事职业',
align:"center",
dataIndex: 'textColumn7'
},
{
title:'报考工种',
align:"center",
dataIndex: 'textColumn8'
},
{
title:'工作单位/个体名称',
align:"center",
dataIndex: 'textColumn9'
},
{
title:'文化程度',
align:"center",
dataIndex: 'textColumn10'
},
{
title:'参加工作日期',
align:"center",
dataIndex: 'textColumn11'
},
{
title:'操作证-正面照',
align:"center",
dataIndex: 'imageColumn1',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'操作证-反面照',
align:"center",
dataIndex: 'imageColumn2',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'安管申请表',
align:"center",
dataIndex: 'imageColumn3',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'特种设备体检表',
align:"center",
dataIndex: 'imageColumn4',
scopedSlots: {customRender: 'imgSlot'}
}, },
{ {
title:'关联用户id', title:'关联用户id',
align:"center", align:"center",
dataIndex: 'userId_dictText' dataIndex: 'userId_dictText'
}, },
{
title:'关联证书id',
align:"center",
dataIndex: 'cerId_dictText'
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
@ -303,8 +387,23 @@
fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
fieldList.push({type:'string',value:'cerNo',text:'身份证号',dictCode:''}) fieldList.push({type:'string',value:'cerNo',text:'身份证号',dictCode:''})
fieldList.push({type:'string',value:'companyName',text:'工作单位',dictCode:''}) fieldList.push({type:'string',value:'companyName',text:'工作单位',dictCode:''})
fieldList.push({type:'sel_search',value:'cerId',text:'关联证书id',dictTable:"employ_cert", dictText:'name', dictCode:'id'})
fieldList.push({type:'Text',value:'textColumn1',text:'姓名',dictCode:''})
fieldList.push({type:'Text',value:'textColumn2',text:'居民身份证号',dictCode:''})
fieldList.push({type:'Text',value:'textColumn3',text:'出生日期',dictCode:''})
fieldList.push({type:'Text',value:'textColumn4',text:'性别',dictCode:''})
fieldList.push({type:'Text',value:'textColumn5',text:'考生来源',dictCode:''})
fieldList.push({type:'Text',value:'textColumn6',text:'身份证上的所在地',dictCode:''})
fieldList.push({type:'Text',value:'textColumn7',text:'从事职业',dictCode:''})
fieldList.push({type:'Text',value:'textColumn8',text:'报考工种',dictCode:''})
fieldList.push({type:'Text',value:'textColumn9',text:'工作单位/个体名称',dictCode:''})
fieldList.push({type:'Text',value:'textColumn10',text:'文化程度',dictCode:''})
fieldList.push({type:'Text',value:'textColumn11',text:'参加工作日期',dictCode:''})
fieldList.push({type:'Text',value:'imageColumn1',text:'操作证-正面照',dictCode:''})
fieldList.push({type:'Text',value:'imageColumn2',text:'操作证-反面照',dictCode:''})
fieldList.push({type:'Text',value:'imageColumn3',text:'安管申请表',dictCode:''})
fieldList.push({type:'Text',value:'imageColumn4',text:'特种设备体检表',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'关联用户id',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) fieldList.push({type:'sel_search',value:'userId',text:'关联用户id',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'sel_search',value:'cerId',text:'关联证书id',dictTable:"employ_cert", dictText:'name', dictCode:'id'})
this.superFieldList = fieldList this.superFieldList = fieldList
} }
} }


+ 77
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue View File

@ -94,8 +94,78 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="关联证书id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerId">
<j-search-select-tag v-model="model.cerId" dict="employ_cert,name,id" />
<a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn1">
<a-input v-model="model.textColumn1" placeholder="请输入姓名" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="居民身份证号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn2">
<a-input v-model="model.textColumn2" placeholder="请输入居民身份证号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="出生日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn3">
<a-input v-model="model.textColumn3" placeholder="请输入出生日期" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn4">
<a-input v-model="model.textColumn4" placeholder="请输入性别" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="考生来源" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn5">
<a-input v-model="model.textColumn5" placeholder="请输入考生来源" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="身份证上的所在地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn6">
<a-input v-model="model.textColumn6" placeholder="请输入身份证上的所在地" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="从事职业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn7">
<a-input v-model="model.textColumn7" placeholder="请输入从事职业" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="报考工种" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn8">
<a-input v-model="model.textColumn8" placeholder="请输入报考工种" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工作单位/个体名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn9">
<a-input v-model="model.textColumn9" placeholder="请输入工作单位/个体名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="文化程度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn10">
<a-input v-model="model.textColumn10" placeholder="请输入文化程度" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="参加工作日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="textColumn11">
<a-input v-model="model.textColumn11" placeholder="请输入参加工作日期" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="操作证-正面照" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageColumn1">
<j-image-upload isMultiple v-model="model.imageColumn1" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="操作证-反面照" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageColumn2">
<j-image-upload isMultiple v-model="model.imageColumn2" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="安管申请表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageColumn3">
<j-image-upload isMultiple v-model="model.imageColumn3" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="特种设备体检表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageColumn4">
<j-image-upload isMultiple v-model="model.imageColumn4" ></j-image-upload>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -103,6 +173,11 @@
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" /> <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="关联证书id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerId">
<j-search-select-tag v-model="model.cerId" dict="employ_cert,name,id" />
</a-form-model-item>
</a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>


+ 179
- 8
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts View File

@ -109,15 +109,94 @@ export const columns: BasicColumn[] = [
dataIndex: 'companyName' dataIndex: 'companyName'
}, },
{ {
title: '关联证书id',
title: '姓名',
align:"center", align:"center",
dataIndex: 'cerId_dictText'
dataIndex: 'textColumn1'
},
{
title: '居民身份证号',
align:"center",
dataIndex: 'textColumn2'
},
{
title: '出生日期',
align:"center",
dataIndex: 'textColumn3'
},
{
title: '性别',
align:"center",
dataIndex: 'textColumn4'
},
{
title: '考生来源',
align:"center",
dataIndex: 'textColumn5'
},
{
title: '身份证上的所在地',
align:"center",
dataIndex: 'textColumn6'
},
{
title: '从事职业',
align:"center",
dataIndex: 'textColumn7'
},
{
title: '报考工种',
align:"center",
dataIndex: 'textColumn8'
},
{
title: '工作单位/个体名称',
align:"center",
dataIndex: 'textColumn9'
},
{
title: '文化程度',
align:"center",
dataIndex: 'textColumn10'
},
{
title: '参加工作日期',
align:"center",
dataIndex: 'textColumn11'
},
{
title: '操作证-正面照',
align:"center",
dataIndex: 'imageColumn1',
customRender:render.renderAvatar,
},
{
title: '操作证-反面照',
align:"center",
dataIndex: 'imageColumn2',
customRender:render.renderAvatar,
},
{
title: '安管申请表',
align:"center",
dataIndex: 'imageColumn3',
customRender:render.renderAvatar,
},
{
title: '特种设备体检表',
align:"center",
dataIndex: 'imageColumn4',
customRender:render.renderAvatar,
}, },
{ {
title: '关联用户id', title: '关联用户id',
align:"center", align:"center",
dataIndex: 'userId_dictText' dataIndex: 'userId_dictText'
}, },
{
title: '关联证书id',
align:"center",
dataIndex: 'cerId_dictText'
},
]; ];
//查询数据 //查询数据
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
@ -127,6 +206,15 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
colProps: {span: 6}, colProps: {span: 6},
}, },
{
label: "关联证书id",
field: "cerId",
component: 'JSearchSelect',
componentProps:{
dict:"employ_cert,name,id"
},
colProps: {span: 6},
},
]; ];
//表单数据 //表单数据
export const formSchema: FormSchema[] = [ export const formSchema: FormSchema[] = [
@ -249,12 +337,87 @@ export const formSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
label: '关联证书id',
field: 'cerId',
component: 'JSearchSelect',
componentProps:{
dict:"employ_cert,name,id"
},
label: '姓名',
field: 'textColumn1',
component: 'Input',
},
{
label: '居民身份证号',
field: 'textColumn2',
component: 'Input',
},
{
label: '出生日期',
field: 'textColumn3',
component: 'Input',
},
{
label: '性别',
field: 'textColumn4',
component: 'Input',
},
{
label: '考生来源',
field: 'textColumn5',
component: 'Input',
},
{
label: '身份证上的所在地',
field: 'textColumn6',
component: 'Input',
},
{
label: '从事职业',
field: 'textColumn7',
component: 'Input',
},
{
label: '报考工种',
field: 'textColumn8',
component: 'Input',
},
{
label: '工作单位/个体名称',
field: 'textColumn9',
component: 'Input',
},
{
label: '文化程度',
field: 'textColumn10',
component: 'Input',
},
{
label: '参加工作日期',
field: 'textColumn11',
component: 'Input',
},
{
label: '操作证-正面照',
field: 'imageColumn1',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '操作证-反面照',
field: 'imageColumn2',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '安管申请表',
field: 'imageColumn3',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '特种设备体检表',
field: 'imageColumn4',
component: 'JImageUpload',
componentProps:{
},
}, },
{ {
label: '关联用户id', label: '关联用户id',
@ -264,4 +427,12 @@ export const formSchema: FormSchema[] = [
dict:"han_hai_member,nick_name,id" dict:"han_hai_member,nick_name,id"
}, },
}, },
{
label: '关联证书id',
field: 'cerId',
component: 'JSearchSelect',
componentProps:{
dict:"employ_cert,name,id"
},
},
]; ];

Loading…
Cancel
Save