1、字段补充

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<EmployAhthenticationCompany, IEmployAhthenticationCompanyService> {
 	@Autowired
 	private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
-	
-	/**
+
+	 // 添加一键审核接口
+	 @AutoLog(value = "一键审核")
+	 @ApiOperation(value="一键审核", notes="一键审核")
+	 @PostMapping(value = "/batchAudit")
+	 public Result<String> batchAudit() {
+		 System.out.println("hello");
+		 return Result.OK("添加成功！");
+	 }
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param employAhthenticationCompany
@@ -97,10 +108,6 @@ public class EmployAhthenticationCompanyController extends JeecgController<Emplo
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody EmployAhthenticationCompany employAhthenticationCompany) {
 		employAhthenticationCompanyService.updateById(employAhthenticationCompany);
-		//如果企业实名通过，则添加公司信息
-		if("1".equals(employAhthenticationCompany.getStatus())){
-			employAhthenticationCompanyService.addCompany(employAhthenticationCompany);
-		}
 		return Result.OK("编辑成功!");
 	}
 	

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")

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<EmployAhthenticationCompany> {

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<EmployAhthenticationCompany> {
 
-
-    public void addCompany(EmployAhthenticationCompany employAhthenticationCompany);
-
-
 }

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<EmployAhthenticationCompanyMapper, EmployAhthenticationCompany> 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);
-        }
-
-    }
 }

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:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue

@@ -33,6 +33,11 @@
               <a-input v-model="model.career" placeholder="请输入招聘者职位"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="授权书" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="authorizationBook">
+              <j-image-upload isMultiple  v-model="model.authorizationBook" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
               <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择审核状态" />

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',

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="个人实名认证信息表")

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")

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<EmployAuthenticationPerson> {

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<EmployAuthenticationPerson> {

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue

@@ -4,6 +4,38 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="姓名">
+              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="身份证号">
+              <a-input placeholder="请输入身份证号" v-model="queryParam.cerNo"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="联系方式">
+                <a-input placeholder="请输入联系方式" v-model="queryParam.phone"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="审核状态">
+                <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.status" dictCode="employ_status"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <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="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -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:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue

@@ -23,6 +23,11 @@
               <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="授权书" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="authorizationBook">
+              <j-image-upload isMultiple  v-model="model.authorizationBook" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
               <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择审核状态" />

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',

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="工作信息表")

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)

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<EmployJob> {

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<EmployJob> {

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

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
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue/modules/EmployJobForm.vue

@@ -83,6 +83,11 @@
               <a-input-number v-model="model.latitude" placeholder="请输入纬度" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招聘截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deadline">
+              <j-date placeholder="请选择招聘截止时间"  v-model="model.deadline" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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',
+  },
 ];

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<HanHaiMember, IHanHa
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "han_hai_member-分页列表查询")
-	@ApiOperation(value="han_hai_member-分页列表查询", notes="han_hai_member-分页列表查询")
+	//@AutoLog(value = "公用用户信息表-分页列表查询")
+	@ApiOperation(value="公用用户信息表-分页列表查询", notes="公用用户信息表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<HanHaiMember>> queryPageList(HanHaiMember hanHaiMember,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param hanHaiMember
 	 * @return
 	 */
-	@AutoLog(value = "han_hai_member-添加")
-	@ApiOperation(value="han_hai_member-添加", notes="han_hai_member-添加")
+	@AutoLog(value = "公用用户信息表-添加")
+	@ApiOperation(value="公用用户信息表-添加", notes="公用用户信息表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody HanHaiMember hanHaiMember) {
 		hanHaiMemberService.save(hanHaiMember);
@@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param hanHaiMember
 	 * @return
 	 */
-	@AutoLog(value = "han_hai_member-编辑")
-	@ApiOperation(value="han_hai_member-编辑", notes="han_hai_member-编辑")
+	@AutoLog(value = "公用用户信息表-编辑")
+	@ApiOperation(value="公用用户信息表-编辑", notes="公用用户信息表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody HanHaiMember hanHaiMember) {
 		hanHaiMemberService.updateById(hanHaiMember);
@@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "han_hai_member-通过id删除")
-	@ApiOperation(value="han_hai_member-通过id删除", notes="han_hai_member-通过id删除")
+	@AutoLog(value = "公用用户信息表-通过id删除")
+	@ApiOperation(value="公用用户信息表-通过id删除", notes="公用用户信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		hanHaiMemberService.removeById(id);
@@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "han_hai_member-批量删除")
-	@ApiOperation(value="han_hai_member-批量删除", notes="han_hai_member-批量删除")
+	@AutoLog(value = "公用用户信息表-批量删除")
+	@ApiOperation(value="公用用户信息表-批量删除", notes="公用用户信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "han_hai_member-通过id查询")
-	@ApiOperation(value="han_hai_member-通过id查询", notes="han_hai_member-通过id查询")
+	//@AutoLog(value = "公用用户信息表-通过id查询")
+	@ApiOperation(value="公用用户信息表-通过id查询", notes="公用用户信息表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<HanHaiMember> queryById(@RequestParam(name="id",required=true) String id) {
 		HanHaiMember hanHaiMember = hanHaiMemberService.getById(id);
@@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, HanHaiMember hanHaiMember) {
-        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "han_hai_member");
+        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "公用用户信息表");
     }
 
     /**

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -24,16 +24,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: han_hai_member
+ * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2025-05-22
  * @Version: V1.0
  */
 @Data
 @TableName("han_hai_member")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="han_hai_member对象", description="han_hai_member")
+@ApiModel(value="han_hai_member对象", description="公用用户信息表")
 public class HanHaiMember implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -84,12 +84,14 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "登录盐", width = 15)
     @ApiModelProperty(value = "登录盐")
     private java.lang.String passwordSalt;
-	/**店铺名称备注*/
-	@Excel(name = "店铺名称备注", width = 15)
-    @ApiModelProperty(value = "店铺名称备注")
+	/**企业名称*/
+	@Excel(name = "企业名称", width = 15, dictTable = "employ_company", dicText = "company_name", dicCode = "id")
+	@Dict(dictTable = "employ_company", dicText = "company_name", dicCode = "id")
+    @ApiModelProperty(value = "企业名称")
     private java.lang.String shopName;
 	/**角色*/
-	@Excel(name = "角色", width = 15)
+	@Excel(name = "角色", width = 15, dicCode = "employ_role")
+	@Dict(dicCode = "employ_role")
     @ApiModelProperty(value = "角色")
     private java.lang.String role;
 	/**ID标识号码*/
@@ -202,6 +204,10 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "是否分销商", width = 15)
     @ApiModelProperty(value = "是否分销商")
     private java.lang.String isDai;
+	/**是否拉黑*/
+	@Excel(name = "是否拉黑", width = 15)
+    @ApiModelProperty(value = "是否拉黑")
+    private java.lang.String isForbid;
 
     //工作信息
     @TableField(exist = false)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -7,9 +7,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: han_hai_member
+ * @Description: 公用用户信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2025-05-22
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

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<HanHaiMember> {

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -4,6 +4,43 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="昵称">
+              <a-input placeholder="请输入昵称" v-model="queryParam.nickName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="手机号码">
+              <a-input placeholder="请输入手机号码" v-model="queryParam.phone"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="登录账号">
+                <a-input placeholder="请输入登录账号" v-model="queryParam.account"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="企业名称">
+                <j-search-select-tag placeholder="请选择企业名称" v-model="queryParam.shopName" dict="employ_company,company_name,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="角色">
+                <j-dict-select-tag placeholder="请选择角色" v-model="queryParam.role" dictCode="employ_role"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <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="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -12,7 +49,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('han_hai_member')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('公用用户信息表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -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
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -24,13 +24,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">
-              <a-input v-model="model.password" placeholder="请输入登录密码"  ></a-input>
+            <a-form-model-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopName">
+              <j-search-select-tag v-model="model.shopName" dict="employ_company,company_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
-              <a-input v-model="model.role" placeholder="请输入角色"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="employ_role" placeholder="请选择角色" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -43,6 +43,11 @@
               <a-input-number v-model="model.integerPrice" placeholder="请输入积分" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否拉黑" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isForbid">
+              <a-input v-model="model.isForbid" placeholder="请输入是否拉黑"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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',
+  },
 ];

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: {