From dff4186a56e83aae1634a527c5a50f2112a7d1a2 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Tue, 27 Aug 2024 20:27:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=88=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=A0=87=E5=BF=97=EF=BC=89=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81=E6=8E=A5=E5=8F=A3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E7=94=A8=E6=88=B7token=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml | 4 +++- .../controller/HanHaiRealEnterpriseController.java | 2 +- .../hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java | 6 +++++- .../mapper/HanHaiRealEnterpriseMapper.java | 2 +- .../service/IHanHaiRealEnterpriseService.java | 2 +- .../service/impl/HanHaiRealEnterpriseServiceImpl.java | 2 +- .../hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue | 6 ++++++ .../vue/modules/HanHaiRealEnterpriseForm.vue | 5 +++++ .../hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts | 10 ++++++++++ .../org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java | 2 ++ .../src/main/resources/application-dev.yml | 1 + 11 files changed, 36 insertions(+), 6 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml index f1c7418..5c3932c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml +++ b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml @@ -10,7 +10,9 @@ - + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java index 528cb38..babbe73 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 企业认证表 * @Author: jeecg-boot - * @Date: 2024-08-26 + * @Date: 2024-08-27 * @Version: V1.0 */ @Api(tags="企业认证表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java index 3259f4b..da8b03f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 企业认证表 * @Author: jeecg-boot - * @Date: 2024-08-26 + * @Date: 2024-08-27 * @Version: V1.0 */ @Data @@ -74,4 +74,8 @@ public class HanHaiRealEnterprise implements Serializable { @Excel(name = "身份证反面", width = 15) @ApiModelProperty(value = "身份证反面") private java.lang.String imageReverseSide; + /**用户标识*/ + @Excel(name = "用户标识", width = 15) + @ApiModelProperty(value = "用户标识") + private java.lang.String userId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java index 6dbdcfc..ba51dd9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 企业认证表 * @Author: jeecg-boot - * @Date: 2024-08-26 + * @Date: 2024-08-27 * @Version: V1.0 */ public interface HanHaiRealEnterpriseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java index c0ba1de..e06b958 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 企业认证表 * @Author: jeecg-boot - * @Date: 2024-08-26 + * @Date: 2024-08-27 * @Version: V1.0 */ public interface IHanHaiRealEnterpriseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java index c3d94ce..240e06c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 企业认证表 * @Author: jeecg-boot - * @Date: 2024-08-26 + * @Date: 2024-08-27 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue index 74d7c9b..a7171ce 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue @@ -155,6 +155,11 @@ dataIndex: 'imageReverseSide', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'用户标识', + align:"center", + dataIndex: 'userId' + }, { title: '操作', dataIndex: 'action', @@ -195,6 +200,7 @@ fieldList.push({type:'string',value:'otherImage',text:'其他资质',dictCode:''}) fieldList.push({type:'string',value:'imageStraight',text:'身份证正面',dictCode:''}) fieldList.push({type:'string',value:'imageReverseSide',text:'身份证反面',dictCode:''}) + fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue index da6e782..f326973 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue @@ -33,6 +33,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts index c096964..b24e482 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts @@ -38,6 +38,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'imageReverseSide', customRender:render.renderAvatar, }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -82,4 +87,9 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '用户标识', + field: 'userId', + component: 'Input', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index 9512f06..4e595c8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -207,6 +207,8 @@ public class InfoApiServiceImpl implements InfoApiService { return Result.OK("其他资质未上传！"); } + haiRealEnterprise.setUserId(hanHaiMember.getId()); + Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise); if(result){ return Result.OK("企业认证提交成功！"); diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index b856d2e..e157a38 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -270,6 +270,7 @@ cas: logging: level: org.jeecg.modules.system.mapper : info + org.jeecg.modules : debug #swagger knife4j: #开启增强配置