From ef3b210769751b54ffef2e476060f3689da28d45 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 2 Sep 2025 20:26:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=80=83=E8=AF=81=E5=92=A8=E8=AF=A2?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmployRedisterController.java | 2 +- .../employRedister/entity/EmployRedister.java | 72 +++++++- .../mapper/EmployRedisterMapper.java | 2 +- .../service/IEmployRedisterService.java | 2 +- .../service/impl/EmployRedisterServiceImpl.java | 2 +- .../employRedister/vue/EmployRedisterList.vue | 105 +++++++++++- .../vue/modules/EmployRedisterForm.vue | 79 ++++++++- .../employRedister/vue3/EmployRedister.data.ts | 187 ++++++++++++++++++++- 8 files changed, 428 insertions(+), 23 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/controller/EmployRedisterController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/controller/EmployRedisterController.java index 1b72090..74145ef 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/controller/EmployRedisterController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/controller/EmployRedisterController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 报名材料提交表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-09-02 * @Version: V1.0 */ @Api(tags="报名材料提交表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/entity/EmployRedister.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/entity/EmployRedister.java index 3c7b038..608da4e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/entity/EmployRedister.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/entity/EmployRedister.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 报名材料提交表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-09-02 * @Version: V1.0 */ @Data @@ -119,14 +119,74 @@ public class EmployRedister implements Serializable { @Excel(name = "工作单位", width = 15) @ApiModelProperty(value = "工作单位") 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*/ @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; + /**关联证书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; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/mapper/EmployRedisterMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/mapper/EmployRedisterMapper.java index d7f01de..4b6e69a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/mapper/EmployRedisterMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/mapper/EmployRedisterMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 报名材料提交表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-09-02 * @Version: V1.0 */ public interface EmployRedisterMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/IEmployRedisterService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/IEmployRedisterService.java index 11f9a4c..06acede 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/IEmployRedisterService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/IEmployRedisterService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 报名材料提交表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-09-02 * @Version: V1.0 */ public interface IEmployRedisterService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/impl/EmployRedisterServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/impl/EmployRedisterServiceImpl.java index 5584dc1..b2159e9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/impl/EmployRedisterServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/service/impl/EmployRedisterServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 报名材料提交表 * @Author: jeecg-boot - * @Date: 2024-12-21 + * @Date: 2025-09-02 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue index f1b93ca..9249f5c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue @@ -9,6 +9,11 @@ + + + + + 查询 @@ -242,15 +247,94 @@ dataIndex: 'companyName' }, { - title:'关联证书id', + title:'姓名', 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', align:"center", dataIndex: 'userId_dictText' }, + { + title:'关联证书id', + align:"center", + dataIndex: 'cerId_dictText' + }, { title: '操作', dataIndex: 'action', @@ -303,8 +387,23 @@ fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''}) fieldList.push({type:'string',value:'cerNo',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:'cerId',text:'关联证书id',dictTable:"employ_cert", dictText:'name', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue index 6bfba5c..08a4982 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue @@ -94,8 +94,78 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,6 +173,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts index 790b75a..4307091 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts @@ -109,15 +109,94 @@ export const columns: BasicColumn[] = [ dataIndex: 'companyName' }, { - title: '关联证书id', + title: '姓名', 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', align:"center", dataIndex: 'userId_dictText' }, + { + title: '关联证书id', + align:"center", + dataIndex: 'cerId_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -127,6 +206,15 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', colProps: {span: 6}, }, + { + label: "关联证书id", + field: "cerId", + component: 'JSearchSelect', + componentProps:{ + dict:"employ_cert,name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -249,12 +337,87 @@ export const formSchema: FormSchema[] = [ 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', @@ -264,4 +427,12 @@ export const formSchema: FormSchema[] = [ dict:"han_hai_member,nick_name,id" }, }, + { + label: '关联证书id', + field: 'cerId', + component: 'JSearchSelect', + componentProps:{ + dict:"employ_cert,name,id" + }, + }, ];