1、调整个人简历相关接口

2、调整工作岗位相关接口
3、添加工作/简历收藏接口
4、调整考证咨询相关接口
5、调整兑换码相关接口

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Api(tags="地址表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Data
@@ -50,5 +50,5 @@ public class EmployAddress implements Serializable {
 	/**地址*/
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
-    private java.lang.String address;
+    private java.lang.String adress;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 public interface EmployAddressMapper extends BaseMapper<EmployAddress> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 public interface IEmployAddressService extends IService<EmployAddress> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue

@@ -4,6 +4,21 @@
     <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.adress"></a-input>
+            </a-form-item>
+          </a-col>
+          <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>
@@ -124,7 +139,7 @@
           {
             title:'地址',
             align:"center",
-            dataIndex: 'address'
+            dataIndex: 'adress'
           },
           {
             title: '操作',
@@ -160,7 +175,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'adress',text:'地址',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressForm.vue

@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adress">
+              <a-input v-model="model.adress" placeholder="请输入地址"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts

@@ -7,17 +7,23 @@ export const columns: BasicColumn[] = [
     {
     title: '地址',
     align:"center",
-    dataIndex: 'address'
+    dataIndex: 'adress'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "地址",
+      field: "adress",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
     label: '地址',
-    field: 'address',
+    field: 'adress',
     component: 'Input',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/controller/EmployCertMaterialController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 证书报名材料关联表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="证书报名材料关联表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/entity/EmployCertMaterial.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 证书报名材料关联表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -53,8 +53,12 @@ public class EmployCertMaterial implements Serializable {
     @ApiModelProperty(value = "关联证书id")
     private java.lang.String certId;
 	/**关联报名材料id*/
-	@Excel(name = "关联报名材料id", width = 15, dictTable = "employ_material", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "employ_material", dicText = "name", dicCode = "id")
+	@Excel(name = "关联报名材料id", width = 15, dictTable = "employ_material", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "employ_material", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "关联报名材料id")
     private java.lang.String materialId;
+	/**排序字段*/
+	@Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private java.lang.Integer orderNo;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/mapper/EmployCertMaterialMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 证书报名材料关联表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployCertMaterialMapper extends BaseMapper<EmployCertMaterial> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/service/IEmployCertMaterialService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 证书报名材料关联表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployCertMaterialService extends IService<EmployCertMaterial> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/service/impl/EmployCertMaterialServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 证书报名材料关联表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/vue/EmployCertMaterialList.vue

@@ -4,6 +4,26 @@
     <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="关联证书id">
+              <j-dict-select-tag placeholder="请选择关联证书id" v-model="queryParam.certId" dictCode="employ_cert,name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="关联报名材料id">
+              <j-dict-select-tag placeholder="请选择关联报名材料id" v-model="queryParam.materialId" dictCode="employ_material,title,id"/>
+            </a-form-item>
+          </a-col>
+          <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>
@@ -132,6 +152,11 @@
             align:"center",
             dataIndex: 'materialId_dictText'
           },
+          {
+            title:'排序字段',
+            align:"center",
+            dataIndex: 'orderNo'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -167,7 +192,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'certId',text:'关联证书id',dictCode:"employ_cert,name,id"})
-        fieldList.push({type:'string',value:'materialId',text:'关联报名材料id',dictCode:"employ_material,name,id"})
+        fieldList.push({type:'string',value:'materialId',text:'关联报名材料id',dictCode:"employ_material,title,id"})
+        fieldList.push({type:'int',value:'orderNo',text:'排序字段',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/vue/modules/EmployCertMaterialForm.vue

@@ -10,7 +10,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联报名材料id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialId">
-              <j-dict-select-tag type="list" v-model="model.materialId" dictCode="employ_material,name,id" placeholder="请选择关联报名材料id" />
+              <j-dict-select-tag type="list" v-model="model.materialId" dictCode="employ_material,title,id" placeholder="请选择关联报名材料id" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
+              <a-input-number v-model="model.orderNo" placeholder="请输入排序字段" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCertMaterial/vue3/EmployCertMaterial.data.ts

@@ -14,9 +14,32 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'materialId_dictText'
    },
+   {
+    title: '排序字段',
+    align:"center",
+    dataIndex: 'orderNo'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "关联证书id",
+      field: "certId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_cert,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "关联报名材料id",
+      field: "materialId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_material,title,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -33,7 +56,12 @@ export const formSchema: FormSchema[] = [
     field: 'materialId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"employ_material,name,id"
+        dictCode:"employ_material,title,id"
      },
   },
+  {
+    label: '排序字段',
+    field: 'orderNo',
+    component: 'InputNumber',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/controller/EmployCompanyController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="企业信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/entity/EmployCompany.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -79,4 +79,16 @@ public class EmployCompany implements Serializable {
 	@Excel(name = "统一社会信用代码", width = 15)
     @ApiModelProperty(value = "统一社会信用代码")
     private java.lang.String socialCode;
+	/**logo*/
+	@Excel(name = "logo", width = 15)
+    @ApiModelProperty(value = "logo")
+    private java.lang.String logo;
+	/**所属行业*/
+	@Excel(name = "所属行业", width = 15)
+    @ApiModelProperty(value = "所属行业")
+    private java.lang.String industry;
+	/**融资轮数*/
+	@Excel(name = "融资轮数", width = 15)
+    @ApiModelProperty(value = "融资轮数")
+    private java.lang.String financing;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/mapper/EmployCompanyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployCompanyMapper extends BaseMapper<EmployCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/service/IEmployCompanyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployCompanyService extends IService<EmployCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/service/impl/EmployCompanyServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/vue/EmployCompanyList.vue

@@ -4,6 +4,21 @@
     <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.companyName"></a-input>
+            </a-form-item>
+          </a-col>
+          <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>
@@ -129,12 +144,14 @@
           {
             title:'企业图片',
             align:"center",
-            dataIndex: 'image'
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'营业执照',
             align:"center",
-            dataIndex: 'license'
+            dataIndex: 'license',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'企业人数',
@@ -161,6 +178,21 @@
             align:"center",
             dataIndex: 'socialCode'
           },
+          {
+            title:'logo',
+            align:"center",
+            dataIndex: 'logo'
+          },
+          {
+            title:'所属行业',
+            align:"center",
+            dataIndex: 'industry'
+          },
+          {
+            title:'融资轮数',
+            align:"center",
+            dataIndex: 'financing'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -203,6 +235,9 @@
         fieldList.push({type:'string',value:'address',text:'企业地址',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'公司电话',dictCode:''})
         fieldList.push({type:'string',value:'socialCode',text:'统一社会信用代码',dictCode:''})
+        fieldList.push({type:'Text',value:'logo',text:'logo',dictCode:''})
+        fieldList.push({type:'string',value:'industry',text:'所属行业',dictCode:''})
+        fieldList.push({type:'string',value:'financing',text:'融资轮数',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/vue/modules/EmployCompanyForm.vue

@@ -10,12 +10,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="企业图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <a-input v-model="model.image" placeholder="请输入企业图片"  ></a-input>
+              <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="license">
-              <a-input v-model="model.license" placeholder="请输入营业执照"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.license" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -43,6 +43,21 @@
               <a-input v-model="model.socialCode" placeholder="请输入统一社会信用代码"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="logo" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logo">
+              <a-input v-model="model.logo" placeholder="请输入logo"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属行业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industry">
+              <a-input v-model="model.industry" placeholder="请输入所属行业"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="融资轮数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="financing">
+              <a-input v-model="model.financing" 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/employCompany/vue3/EmployCompany.data.ts

@@ -12,12 +12,14 @@ export const columns: BasicColumn[] = [
    {
     title: '企业图片',
     align:"center",
-    dataIndex: 'image'
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
    },
    {
     title: '营业执照',
     align:"center",
-    dataIndex: 'license'
+    dataIndex: 'license',
+    customRender:render.renderAvatar,
    },
    {
     title: '企业人数',
@@ -44,9 +46,30 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'socialCode'
    },
+   {
+    title: 'logo',
+    align:"center",
+    dataIndex: 'logo'
+   },
+   {
+    title: '所属行业',
+    align:"center",
+    dataIndex: 'industry'
+   },
+   {
+    title: '融资轮数',
+    align:"center",
+    dataIndex: 'financing'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "企业名称",
+      field: "companyName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -58,12 +81,16 @@ export const formSchema: FormSchema[] = [
   {
     label: '企业图片',
     field: 'image',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '营业执照',
     field: 'license',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '企业人数',
@@ -90,4 +117,19 @@ export const formSchema: FormSchema[] = [
     field: 'socialCode',
     component: 'Input',
   },
+  {
+    label: 'logo',
+    field: 'logo',
+    component: 'Input',
+  },
+  {
+    label: '所属行业',
+    field: 'industry',
+    component: 'Input',
+  },
+  {
+    label: '融资轮数',
+    field: 'financing',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/controller/EmployExchangeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 兑换码信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="兑换码信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/entity/EmployExchange.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 兑换码信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -63,5 +63,5 @@ public class EmployExchange implements Serializable {
 	/**兑换积分数量*/
 	@Excel(name = "兑换积分数量", width = 15)
     @ApiModelProperty(value = "兑换积分数量")
-    private java.lang.Double score;
+    private java.math.BigDecimal score;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/mapper/EmployExchangeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 兑换码信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployExchangeMapper extends BaseMapper<EmployExchange> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/service/IEmployExchangeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 兑换码信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployExchangeService extends IService<EmployExchange> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/service/impl/EmployExchangeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 兑换码信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/vue/EmployExchangeList.vue

@@ -4,6 +4,33 @@
     <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.code"></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="exchangeCode_status"/>
+            </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.score"></a-input>
+              </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>
@@ -140,6 +167,7 @@
           {
             title:'兑换积分数量',
             align:"center",
+            sorter: true,
             dataIndex: 'score'
           },
           {
@@ -179,7 +207,7 @@
         fieldList.push({type:'datetime',value:'overdueTime',text:'过期时间'})
         fieldList.push({type:'string',value:'code',text:'兑换码',dictCode:''})
         fieldList.push({type:'string',value:'status',text:'使用状态',dictCode:'exchangeCode_status'})
-        fieldList.push({type:'double',value:'score',text:'兑换积分数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'score',text:'兑换积分数量',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/vue3/EmployExchange.data.ts

@@ -22,11 +22,33 @@ export const columns: BasicColumn[] = [
    {
     title: '兑换积分数量',
     align:"center",
+    sorter: true,
     dataIndex: 'score'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "兑换码",
+      field: "code",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "使用状态",
+      field: "status",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"exchangeCode_status"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "兑换积分数量",
+      field: "score",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/controller/EmployExchangeConfigController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employExchangeConfig.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.employExchangeConfig.entity.EmployExchangeConfig;
+import org.jeecg.modules.employExchangeConfig.service.IEmployExchangeConfigService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 兑换码问答配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-21
+ * @Version: V1.0
+ */
+@Api(tags="兑换码问答配置")
+@RestController
+@RequestMapping("/employExchangeConfig/employExchangeConfig")
+@Slf4j
+public class EmployExchangeConfigController extends JeecgController<EmployExchangeConfig, IEmployExchangeConfigService> {
+	@Autowired
+	private IEmployExchangeConfigService employExchangeConfigService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employExchangeConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "兑换码问答配置-分页列表查询")
+	@ApiOperation(value="兑换码问答配置-分页列表查询", notes="兑换码问答配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployExchangeConfig>> queryPageList(EmployExchangeConfig employExchangeConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployExchangeConfig> queryWrapper = QueryGenerator.initQueryWrapper(employExchangeConfig, req.getParameterMap());
+		Page<EmployExchangeConfig> page = new Page<EmployExchangeConfig>(pageNo, pageSize);
+		IPage<EmployExchangeConfig> pageList = employExchangeConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employExchangeConfig
+	 * @return
+	 */
+	@AutoLog(value = "兑换码问答配置-添加")
+	@ApiOperation(value="兑换码问答配置-添加", notes="兑换码问答配置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployExchangeConfig employExchangeConfig) {
+		employExchangeConfigService.save(employExchangeConfig);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employExchangeConfig
+	 * @return
+	 */
+	@AutoLog(value = "兑换码问答配置-编辑")
+	@ApiOperation(value="兑换码问答配置-编辑", notes="兑换码问答配置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployExchangeConfig employExchangeConfig) {
+		employExchangeConfigService.updateById(employExchangeConfig);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "兑换码问答配置-通过id删除")
+	@ApiOperation(value="兑换码问答配置-通过id删除", notes="兑换码问答配置-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		employExchangeConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "兑换码问答配置-批量删除")
+	@ApiOperation(value="兑换码问答配置-批量删除", notes="兑换码问答配置-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.employExchangeConfigService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "兑换码问答配置-通过id查询")
+	@ApiOperation(value="兑换码问答配置-通过id查询", notes="兑换码问答配置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<EmployExchangeConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployExchangeConfig employExchangeConfig = employExchangeConfigService.getById(id);
+		if(employExchangeConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employExchangeConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employExchangeConfig
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployExchangeConfig employExchangeConfig) {
+        return super.exportXls(request, employExchangeConfig, EmployExchangeConfig.class, "兑换码问答配置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, EmployExchangeConfig.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/entity/EmployExchangeConfig.java

@@ -0,0 +1,62 @@
+package org.jeecg.modules.employExchangeConfig.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 兑换码问答配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_exchange_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_exchange_config对象", description="兑换码问答配置")
+public class EmployExchangeConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**问题*/
+	@Excel(name = "问题", width = 15)
+    @ApiModelProperty(value = "问题")
+    private java.lang.String question;
+	/**答案*/
+	@Excel(name = "答案", width = 15)
+    @ApiModelProperty(value = "答案")
+    private java.lang.String answer;
+	/**排序字段*/
+	@Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private java.lang.Integer orderNo;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/mapper/EmployExchangeConfigMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employExchangeConfig.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employExchangeConfig.entity.EmployExchangeConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 兑换码问答配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-21
+ * @Version: V1.0
+ */
+public interface EmployExchangeConfigMapper extends BaseMapper<EmployExchangeConfig> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/mapper/xml/EmployExchangeConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.employExchangeConfig.mapper.EmployExchangeConfigMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/service/IEmployExchangeConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employExchangeConfig.service;
+
+import org.jeecg.modules.employExchangeConfig.entity.EmployExchangeConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 兑换码问答配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-21
+ * @Version: V1.0
+ */
+public interface IEmployExchangeConfigService extends IService<EmployExchangeConfig> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/service/impl/EmployExchangeConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employExchangeConfig.service.impl;
+
+import org.jeecg.modules.employExchangeConfig.entity.EmployExchangeConfig;
+import org.jeecg.modules.employExchangeConfig.mapper.EmployExchangeConfigMapper;
+import org.jeecg.modules.employExchangeConfig.service.IEmployExchangeConfigService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 兑换码问答配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-21
+ * @Version: V1.0
+ */
+@Service
+public class EmployExchangeConfigServiceImpl extends ServiceImpl<EmployExchangeConfigMapper, EmployExchangeConfig> implements IEmployExchangeConfigService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue/EmployExchangeConfigList.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</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>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <employ-exchange-config-modal ref="modalForm" @ok="modalFormOk"></employ-exchange-config-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployExchangeConfigModal from './modules/EmployExchangeConfigModal'
+
+  export default {
+    name: 'EmployExchangeConfigList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployExchangeConfigModal
+    },
+    data () {
+      return {
+        description: '兑换码问答配置管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'问题',
+            align:"center",
+            dataIndex: 'question'
+          },
+          {
+            title:'答案',
+            align:"center",
+            dataIndex: 'answer'
+          },
+          {
+            title:'排序字段',
+            align:"center",
+            dataIndex: 'orderNo'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employExchangeConfig/employExchangeConfig/list",
+          delete: "/employExchangeConfig/employExchangeConfig/delete",
+          deleteBatch: "/employExchangeConfig/employExchangeConfig/deleteBatch",
+          exportXlsUrl: "/employExchangeConfig/employExchangeConfig/exportXls",
+          importExcelUrl: "employExchangeConfig/employExchangeConfig/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'question',text:'问题',dictCode:''})
+        fieldList.push({type:'Text',value:'answer',text:'答案',dictCode:''})
+        fieldList.push({type:'int',value:'orderNo',text:'排序字段',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue/modules/EmployExchangeConfigForm.vue

@@ -0,0 +1,114 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="问题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="question">
+              <a-input v-model="model.question" placeholder="请输入问题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="答案" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="answer">
+              <a-input v-model="model.answer" placeholder="请输入答案"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
+              <a-input-number v-model="model.orderNo" placeholder="请输入排序字段" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'EmployExchangeConfigForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/employExchangeConfig/employExchangeConfig/add",
+          edit: "/employExchangeConfig/employExchangeConfig/edit",
+          queryById: "/employExchangeConfig/employExchangeConfig/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue/modules/EmployExchangeConfigModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <employ-exchange-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-exchange-config-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import EmployExchangeConfigForm from './EmployExchangeConfigForm'
+
+  export default {
+    name: 'EmployExchangeConfigModal',
+    components: {
+      EmployExchangeConfigForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue/modules/EmployExchangeConfigModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <employ-exchange-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-exchange-config-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployExchangeConfigForm from './EmployExchangeConfigForm'
+  export default {
+    name: 'EmployExchangeConfigModal',
+    components: {
+      EmployExchangeConfigForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue3/EmployExchangeConfig.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employExchangeConfig/employExchangeConfig/list',
+  save='/employExchangeConfig/employExchangeConfig/add',
+  edit='/employExchangeConfig/employExchangeConfig/edit',
+  deleteOne = '/employExchangeConfig/employExchangeConfig/delete',
+  deleteBatch = '/employExchangeConfig/employExchangeConfig/deleteBatch',
+  importExcel = '/employExchangeConfig/employExchangeConfig/importExcel',
+  exportXls = '/employExchangeConfig/employExchangeConfig/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue3/EmployExchangeConfig.data.ts

@@ -0,0 +1,43 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '问题',
+    align:"center",
+    dataIndex: 'question'
+   },
+   {
+    title: '答案',
+    align:"center",
+    dataIndex: 'answer'
+   },
+   {
+    title: '排序字段',
+    align:"center",
+    dataIndex: 'orderNo'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '问题',
+    field: 'question',
+    component: 'Input',
+  },
+  {
+    label: '答案',
+    field: 'answer',
+    component: 'Input',
+  },
+  {
+    label: '排序字段',
+    field: 'orderNo',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue3/EmployExchangeConfigList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EmployExchangeConfigModal @register="registerModal" @success="handleSuccess"></EmployExchangeConfigModal>
+  </div>
+</template>
+
+<script lang="ts" name="employExchangeConfig-employExchangeConfig" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import EmployExchangeConfigModal from './components/EmployExchangeConfigModal.vue'
+  import {columns, searchFormSchema} from './employExchangeConfig.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employExchangeConfig.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '兑换码问答配置',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"兑换码问答配置",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeConfig/vue3/components/EmployExchangeConfigModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../employExchangeConfig.data';
+    import {saveOrUpdate} from '../employExchangeConfig.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

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-21
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Api(tags="工作信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java

@@ -4,11 +4,15 @@ 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;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工作信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-21
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Data
@@ -116,8 +120,8 @@ public class EmployJob implements Serializable {
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
 	/**关联区域id*/
-	@Excel(name = "关联区域id", width = 15, dictTable = "employ_address", dicText = "address", dicCode = "id")
-	@Dict(dictTable = "employ_address", dicText = "address", dicCode = "id")
+	@Excel(name = "关联区域id", width = 15, dictTable = "employ_address", dicText = "adress", dicCode = "id")
+	@Dict(dictTable = "employ_address", dicText = "adress", dicCode = "id")
     @ApiModelProperty(value = "关联区域id")
     private java.lang.String areaId;
 	/**经度*/
@@ -128,4 +132,8 @@ public class EmployJob implements Serializable {
 	@Excel(name = "纬度", width = 15)
     @ApiModelProperty(value = "纬度")
     private java.math.BigDecimal latitude;
+
+    //用户信息
+    @TableField(exist = false)
+    HanHaiMember hanHaiMember;
 }

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-21
+ * @Date:   2024-12-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-21
+ * @Date:   2024-12-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-21
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Service

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

@@ -32,7 +32,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="关联区域id">
-                <j-dict-select-tag placeholder="请选择关联区域id" v-model="queryParam.areaId" dictCode="employ_address,address,id"/>
+                <j-dict-select-tag placeholder="请选择关联区域id" v-model="queryParam.areaId" dictCode="employ_address,adress,id"/>
               </a-form-item>
             </a-col>
           </template>
@@ -284,7 +284,7 @@
         fieldList.push({type:'string',value:'typeId',text:'工种类型',dictCode:"employ_job_type,name,id"})
         fieldList.push({type:'string',value:'natureId',text:'工作性质',dictCode:"employ_nature,name,id"})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
-        fieldList.push({type:'string',value:'areaId',text:'关联区域id',dictCode:"employ_address,address,id"})
+        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:''})
         this.superFieldList = fieldList

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

@@ -70,7 +70,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联区域id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaId">
-              <j-dict-select-tag type="list" v-model="model.areaId" dictCode="employ_address,address,id" placeholder="请选择关联区域id" />
+              <j-dict-select-tag type="list" v-model="model.areaId" dictCode="employ_address,adress,id" placeholder="请选择关联区域id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/vue3/EmployJob.data.ts

@@ -122,7 +122,7 @@ export const searchFormSchema: FormSchema[] = [
       field: "areaId",
       component: 'JDictSelectTag',
       componentProps:{
-          dictCode:"employ_address,address,id"
+          dictCode:"employ_address,adress,id"
       },
       colProps: {span: 6},
  	},
@@ -211,7 +211,7 @@ export const formSchema: FormSchema[] = [
     field: 'areaId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"employ_address,address,id"
+        dictCode:"employ_address,adress,id"
      },
   },
   {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/controller/EmployMaterialController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/entity/EmployMaterial.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -47,8 +47,25 @@ public class EmployMaterial implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**报名材料名称*/
-	@Excel(name = "报名材料名称", width = 15)
-    @ApiModelProperty(value = "报名材料名称")
-    private java.lang.String name;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+    private java.lang.String title;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String descrip;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "material_type")
+	@Dict(dicCode = "material_type")
+    @ApiModelProperty(value = "类型")
+    private java.lang.String type;
+	/**对应材料名称*/
+	@Excel(name = "对应材料名称", width = 15)
+    @ApiModelProperty(value = "对应材料名称")
+    private java.lang.String keyName;
+	/**材料底图*/
+	@Excel(name = "材料底图", width = 15)
+    @ApiModelProperty(value = "材料底图")
+    private java.lang.String image;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/mapper/EmployMaterialMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployMaterialMapper extends BaseMapper<EmployMaterial> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/service/IEmployMaterialService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 报名材料信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-20
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployMaterialService extends IService<EmployMaterial> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/service/impl/EmployMaterialServiceImpl.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/vue/EmployMaterialList.vue

@@ -4,6 +4,21 @@
     <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.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <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>
@@ -99,6 +114,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import EmployMaterialModal from './modules/EmployMaterialModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'EmployMaterialList',
@@ -122,9 +138,30 @@
             }
           },
           {
-            title:'报名材料名称',
+            title:'标题',
             align:"center",
-            dataIndex: 'name'
+            dataIndex: 'title'
+          },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'descrip'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'对应材料名称',
+            align:"center",
+            dataIndex: 'keyName'
+          },
+          {
+            title:'材料底图',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title: '操作',
@@ -160,7 +197,11 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'报名材料名称',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'string',value:'descrip',text:'描述',dictCode:''})
+        fieldList.push({type:'string',value:'type',text:'类型',dictCode:'material_type'})
+        fieldList.push({type:'string',value:'keyName',text:'对应材料名称',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'材料底图',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/vue/modules/EmployMaterialForm.vue

@@ -4,8 +4,28 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="报名材料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入报名材料名称"  ></a-input>
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descrip">
+              <a-input v-model="model.descrip" placeholder="请输入描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="material_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="对应材料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyName">
+              <a-input v-model="model.keyName" placeholder="请输入对应材料名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="材料底图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employMaterial/vue3/EmployMaterial.data.ts

@@ -5,19 +5,71 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '报名材料名称',
+    title: '标题',
     align:"center",
-    dataIndex: 'name'
+    dataIndex: 'title'
+   },
+   {
+    title: '描述',
+    align:"center",
+    dataIndex: 'descrip'
+   },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '对应材料名称',
+    align:"center",
+    dataIndex: 'keyName'
+   },
+   {
+    title: '材料底图',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "标题",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '报名材料名称',
-    field: 'name',
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '描述',
+    field: 'descrip',
     component: 'Input',
   },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"material_type"
+     },
+  },
+  {
+    label: '对应材料名称',
+    field: 'keyName',
+    component: 'Input',
+  },
+  {
+    label: '材料底图',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
 ];

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-10-16
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="报名材料提交表")

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-10-16
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -99,14 +99,31 @@ public class EmployRedister implements Serializable {
 	@Excel(name = "行程码复印件", width = 15)
     @ApiModelProperty(value = "行程码复印件")
     private java.lang.String imageRoutecode;
-	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
-    @ApiModelProperty(value = "联系电话")
-    private java.lang.String phone;
+	/**头像*/
+	@Excel(name = "头像", width = 15)
+    @ApiModelProperty(value = "头像")
+    private java.lang.String imageHead;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")
     private java.lang.String name;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
+	/**身份证号*/
+	@Excel(name = "身份证号", width = 15)
+    @ApiModelProperty(value = "身份证号")
+    private java.lang.String cerNo;
+	/**工作单位*/
+	@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;
 	/**关联用户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")

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-10-16
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployRedisterMapper extends BaseMapper<EmployRedister> {

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-10-16
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployRedisterService extends IService<EmployRedister> {

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-10-16
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/EmployRedisterList.vue

@@ -4,6 +4,21 @@
     <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">
+            <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>
@@ -201,15 +216,36 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'联系电话',
+            title:'头像',
             align:"center",
-            dataIndex: 'phone'
+            dataIndex: 'imageHead',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'姓名',
             align:"center",
             dataIndex: 'name'
           },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'身份证号',
+            align:"center",
+            dataIndex: 'cerNo'
+          },
+          {
+            title:'工作单位',
+            align:"center",
+            dataIndex: 'companyName'
+          },
+          {
+            title:'关联证书id',
+            align:"center",
+            dataIndex: 'cerId_dictText'
+          },
           {
             title:'关联用户id',
             align:"center",
@@ -262,9 +298,13 @@
         fieldList.push({type:'string',value:'imageHousehold',text:'户口本本人页复印件',dictCode:''})
         fieldList.push({type:'string',value:'imageHealthcode',text:'健康码复印件',dictCode:''})
         fieldList.push({type:'string',value:'imageRoutecode',text:'行程码复印件',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'string',value:'imageHead',text:'头像',dictCode:''})
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        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:'sel_search',value:'userId',text:'关联用户id',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue/modules/EmployRedisterForm.vue

@@ -69,8 +69,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageHead">
+              <j-image-upload isMultiple  v-model="model.imageHead" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -78,9 +78,29 @@
               <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cerNo">
+              <a-input v-model="model.cerNo" placeholder="请输入身份证号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工作单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
+              <a-input v-model="model.companyName" placeholder="请输入工作单位"  ></a-input>
+            </a-form-model-item>
+          </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-col :span="24">
             <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employRedister/vue3/EmployRedister.data.ts

@@ -83,15 +83,36 @@ export const columns: BasicColumn[] = [
     customRender:render.renderAvatar,
    },
    {
-    title: '联系电话',
+    title: '头像',
     align:"center",
-    dataIndex: 'phone'
+    dataIndex: 'imageHead',
+    customRender:render.renderAvatar,
    },
    {
     title: '姓名',
     align:"center",
     dataIndex: 'name'
    },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '身份证号',
+    align:"center",
+    dataIndex: 'cerNo'
+   },
+   {
+    title: '工作单位',
+    align:"center",
+    dataIndex: 'companyName'
+   },
+   {
+    title: '关联证书id',
+    align:"center",
+    dataIndex: 'cerId_dictText'
+   },
    {
     title: '关联用户id',
     align:"center",
@@ -100,6 +121,12 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "姓名",
+      field: "name",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -194,22 +221,47 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '头像',
+    field: 'imageHead',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
   {
     label: '联系电话',
     field: 'phone',
     component: 'Input',
   },
   {
-    label: '姓名',
-    field: 'name',
+    label: '身份证号',
+    field: 'cerNo',
+    component: 'Input',
+  },
+  {
+    label: '工作单位',
+    field: 'companyName',
     component: 'Input',
   },
+  {
+    label: '关联证书id',
+    field: 'cerId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"employ_cert,name,id"
+    },
+  },
   {
     label: '关联用户id',
     field: 'userId',
-    component: 'JDictSelectTag',
+    component: 'JSearchSelect',
     componentProps:{
-        dictCode:"han_hai_member,nick_name,id"
-     },
+       dict:"han_hai_member,nick_name,id"
+    },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/controller/EmployResumeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 求职简历表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Api(tags="求职简历表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/entity/EmployResume.java

@@ -5,10 +5,13 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 求职简历表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Data
@@ -76,7 +79,8 @@ public class EmployResume implements Serializable {
     @ApiModelProperty(value = "电话")
     private java.lang.String phone;
 	/**期望工作地*/
-	@Excel(name = "期望工作地", width = 15)
+	@Excel(name = "期望工作地", width = 15, dictTable = "employ_address", dicText = "adress", dicCode = "id")
+	@Dict(dictTable = "employ_address", dicText = "adress", dicCode = "id")
     @ApiModelProperty(value = "期望工作地")
     private java.lang.String expectAddress;
 	/**民族*/
@@ -122,4 +126,12 @@ public class EmployResume implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+
+    //用户信息
+    @TableField(exist = false)
+    HanHaiMember hanHaiMember;
+
+    //实名信息
+    @TableField(exist = false)
+    EmployAuthenticationPerson employAuthenticationPerson;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/mapper/EmployResumeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 求职简历表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 public interface EmployResumeMapper extends BaseMapper<EmployResume> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/IEmployResumeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 求职简历表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 public interface IEmployResumeService extends IService<EmployResume> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/impl/EmployResumeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 求职简历表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-22
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue/EmployResumeList.vue

@@ -4,6 +4,48 @@
     <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.title"></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.name"></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-search-select-tag placeholder="请选择期望工作地" v-model="queryParam.expectAddress" dict="employ_address,adress,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.typeId" dictCode="employ_job_type,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.natureId" dictCode="employ_nature,name,id"/>
+              </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>
@@ -54,9 +96,6 @@
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
           <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
         </template>
-        <template slot="pcaSlot" slot-scope="text">
-          <div>{{ getPcaText(text) }}</div>
-        </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
           <a-button
@@ -103,7 +142,6 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import EmployResumeModal from './modules/EmployResumeModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import Area from '@/components/_util/Area'
 
   export default {
     name: 'EmployResumeList',
@@ -126,6 +164,12 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
           {
             title:'求职岗位',
             align:"center",
@@ -150,6 +194,7 @@
           {
             title:'年龄',
             align:"center",
+            sorter: true,
             dataIndex: 'age'
           },
           {
@@ -165,8 +210,7 @@
           {
             title:'期望工作地',
             align:"center",
-            dataIndex: 'expectAddress',
-            scopedSlots: {customRender: 'pcaSlot'}
+            dataIndex: 'expectAddress_dictText'
           },
           {
             title:'民族',
@@ -176,6 +220,7 @@
           {
             title:'工龄',
             align:"center",
+            sorter: true,
             dataIndex: 'workTime'
           },
           {
@@ -183,12 +228,6 @@
             align:"center",
             dataIndex: 'ipAddress'
           },
-          {
-            title:'个人介绍',
-            align:"center",
-            dataIndex: 'brief',
-            scopedSlots: {customRender: 'htmlSlot'}
-          },
           {
             title:'标签',
             align:"center",
@@ -197,11 +236,13 @@
           {
             title:'期望薪资下限',
             align:"center",
+            sorter: true,
             dataIndex: 'salaryLow'
           },
           {
             title:'期望薪资上限',
             align:"center",
+            sorter: true,
             dataIndex: 'salaryUp'
           },
           {
@@ -237,12 +278,10 @@
           
         },
         dictOptions:{},
-        pcaData:'',
         superFieldList:[],
       }
     },
     created() {
-      this.pcaData = new Area()
     this.getSuperFieldList();
     },
     computed: {
@@ -251,13 +290,11 @@
       },
     },
     methods: {
-      getPcaText(code){
-        return this.pcaData.getText(code);
-      },
       initDictConfig(){
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
         fieldList.push({type:'string',value:'title',text:'求职岗位',dictCode:''})
         fieldList.push({type:'string',value:'headImage',text:'头像',dictCode:''})
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
@@ -265,7 +302,7 @@
         fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
         fieldList.push({type:'string',value:'qualification',text:'学历',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
-        fieldList.push({type:'pca',value:'expectAddress',text:'期望工作地'})
+        fieldList.push({type:'sel_search',value:'expectAddress',text:'期望工作地',dictTable:"employ_address", dictText:'adress', dictCode:'id'})
         fieldList.push({type:'string',value:'nation',text:'民族',dictCode:''})
         fieldList.push({type:'int',value:'workTime',text:'工龄',dictCode:''})
         fieldList.push({type:'string',value:'ipAddress',text:'ip归属地',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue/modules/EmployResumeForm.vue

@@ -40,7 +40,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="期望工作地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expectAddress">
-             <j-area-linkage type="cascader" v-model="model.expectAddress" placeholder="请输入省市区"  />
+              <j-search-select-tag v-model="model.expectAddress" dict="employ_address,adress,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue3/EmployResume.data.ts

@@ -5,6 +5,12 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
     title: '求职岗位',
     align:"center",
     dataIndex: 'title'
@@ -28,6 +34,7 @@ export const columns: BasicColumn[] = [
    {
     title: '年龄',
     align:"center",
+    sorter: true,
     dataIndex: 'age'
    },
    {
@@ -43,8 +50,7 @@ export const columns: BasicColumn[] = [
    {
     title: '期望工作地',
     align:"center",
-    dataIndex: 'expectAddress',
-    slots: { customRender: 'pcaSlot' },//TODO 未翻译
+    dataIndex: 'expectAddress_dictText'
    },
    {
     title: '民族',
@@ -54,6 +60,7 @@ export const columns: BasicColumn[] = [
    {
     title: '工龄',
     align:"center",
+    sorter: true,
     dataIndex: 'workTime'
    },
    {
@@ -61,12 +68,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'ipAddress'
    },
-   {
-    title: '个人介绍',
-    align:"center",
-    dataIndex: 'brief',
-    slots: { customRender: 'htmlSlot' },
-   },
    {
     title: '标签',
     align:"center",
@@ -75,11 +76,13 @@ export const columns: BasicColumn[] = [
    {
     title: '期望薪资下限',
     align:"center",
+    sorter: true,
     dataIndex: 'salaryLow'
    },
    {
     title: '期望薪资上限',
     align:"center",
+    sorter: true,
     dataIndex: 'salaryUp'
    },
    {
@@ -100,6 +103,51 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "求职岗位",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "姓名",
+      field: "name",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "电话",
+      field: "phone",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "期望工作地",
+      field: "expectAddress",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"employ_address,adress,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "工种类型",
+      field: "typeId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_job_type,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "工作性质",
+      field: "natureId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_nature,name,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -143,7 +191,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '期望工作地',
     field: 'expectAddress',
-    component: 'JAreaLinkage',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"employ_address,adress,id"
+    },
   },
   {
     label: '民族',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java

@@ -26,17 +26,30 @@ public class CollectionController {
     /******************************************************************************************************************/
 
     //会员中心-我的收藏
-    @ApiOperation(value="我的收藏-收藏工作信息", notes="我的收藏-收藏工作信息")
+    @ApiOperation(value="我的收藏-收藏工作信息列表", notes="我的收藏-收藏工作信息列表")
     @RequestMapping(value = "/queryJobCollectionList", method = {RequestMethod.GET})
     public Result<?> queryJobCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
         return collectionService.queryJobCollectionList(token, pageBean);
     }
 
+    @ApiOperation(value="我的收藏-添加工作收藏", notes="我的收藏-添加工作收藏")
+    @RequestMapping(value = "/addJobCollection", method = {RequestMethod.GET})
+    public Result<?> addJobCollection(@RequestHeader("X-Access-Token") String token, String jobId){
+        return collectionService.addJobCollection(token, jobId);
+    }
+
     //会员中心-我的收藏
-    @ApiOperation(value="我的收藏-收藏简历信息", notes="我的收藏-收藏简历信息")
+    @ApiOperation(value="我的收藏-收藏简历信息列表", notes="我的收藏-收藏简历信息列表")
     @RequestMapping(value = "/queryResumeCollectionList", method = {RequestMethod.GET})
     public Result<?> queryResumeCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
         return collectionService.queryResumeCollectionList(token, pageBean);
     }
 
+    //会员中心-我的收藏
+    @ApiOperation(value="我的收藏-添加简历收藏", notes="我的收藏-添加简历收藏")
+    @RequestMapping(value = "/addResumeCollection", method = {RequestMethod.GET})
+    public Result<?> addResumeCollection(@RequestHeader("X-Access-Token") String token, String resumeId){
+        return collectionService.addResumeCollection(token, resumeId);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExaminationController.java

@@ -27,12 +27,19 @@ public class ExaminationController {
     /******************************************************************************************************************/
 
     //考证咨询-证书查询
-    @ApiOperation(value="考证咨询-证书查询", notes="考证咨询-证书查询")
+    @ApiOperation(value="考证咨询-查询证书列表", notes="考证咨询-查询证书列表")
     @RequestMapping(value = "/queryCert", method = {RequestMethod.GET})
-    public Result<?> queryCert(PageBean pageBean){
+    public Result<?> queryCertList(PageBean pageBean){
         return examinationService.queryCertList(pageBean);
     }
 
+    //考证咨询-证书详情
+    @ApiOperation(value="考证咨询-根据id查询证书详情", notes="考证咨询-根据id查询证书详情")
+    @RequestMapping(value = "/queryCertById", method = {RequestMethod.GET})
+    public Result<?> queryCertById(String cerId){
+        return examinationService.queryCertById(cerId);
+    }
+
     //考证咨询-提交报名材料
     @ApiOperation(value="考证咨询-提交报名材料", notes="考证咨询-提交报名材料")
     @RequestMapping(value = "/addMaterial", method = {RequestMethod.POST})

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExchangeController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.ExaminationService;
 import org.jeecg.modules.apiService.ExchangeService;
 import org.jeecg.modules.employExchange.entity.EmployExchange;
@@ -26,6 +27,12 @@ public class ExchangeController {
     private ExchangeService exchangeService;
     /******************************************************************************************************************/
 
+    @ApiOperation(value="我的服务-查询兑换码列表", notes="我的服务-查询兑换码列表")
+    @RequestMapping(value = "/queryExchangeList", method = {RequestMethod.GET})
+    public Result<?> queryExchangeList(PageBean pageBean){
+        return exchangeService.queryExchangeList(pageBean);
+    }
+
     @ApiOperation(value="我的服务-使用兑换码", notes="我的服务-使用兑换码")
     @RequestMapping(value = "/useExchange", method = {RequestMethod.POST})
     public Result<?> useExchange(@RequestHeader("X-Access-Token") String token, String code){
@@ -35,7 +42,7 @@ public class ExchangeController {
     @ApiOperation(value="我的服务-生成兑换码", notes="我的服务-生成兑换码")
     @RequestMapping(value = "/addExchange", method = {RequestMethod.POST})
     public Result<?> addExchange(EmployExchange employExchange){
-        return exchangeService.addExchange();
+        return exchangeService.addExchange(employExchange);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ResumeController.java

@@ -35,7 +35,7 @@ public class ResumeController {
     //首页-根据Id查看工作详情
     @ApiOperation(value="首页-根据Id查看简历详情", notes="首页-根据Id查看简历详情")
     @RequestMapping(value = "/queryResumeById", method = {RequestMethod.GET})
-    public Result<?> queryResumeById(String token, String jobId){
+    public Result<?> queryResumeById(@RequestHeader("X-Access-Token")String token, String jobId){
         return resumeService.queryResumeById(token, jobId);
     }
 
@@ -49,14 +49,14 @@ public class ResumeController {
     //添加工作信息
     @ApiOperation(value="首页-添加简历信息", notes="首页-添加简历信息")
     @RequestMapping(value = "/addResume", method = {RequestMethod.POST})
-    public Result<?> addResume(String token, EmployResume employResume){
+    public Result<?> addResume(@RequestHeader("X-Access-Token")String token, EmployResume employResume){
         return resumeService.addResume(token, employResume);
     }
 
     //修改工作信息
     @ApiOperation(value="首页-修改简历信息", notes="首页-修改简历信息")
     @RequestMapping(value = "/updateResume", method = {RequestMethod.POST})
-    public Result<?> updateResume(String token, EmployResume employResume){
+    public Result<?> updateResume(@RequestHeader("X-Access-Token") String token, EmployResume employResume){
         return resumeService.updateResume(token, employResume);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CollectionService.java

@@ -12,7 +12,15 @@ public interface CollectionService {
      * @param pageBean
      * @return
      */
-    public Result<?> queryJobCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean);
+    public Result<?> queryJobCollectionList(String token, PageBean pageBean);
+
+    /**
+     * 我的收藏-添加工作收藏
+     * @param token
+     * @param jobId
+     * @return
+     */
+    public Result<?> addJobCollection(String token, String jobId);
 
     /**
      * 我的收藏-收藏简历信息
@@ -20,6 +28,14 @@ public interface CollectionService {
      * @param pageBean
      * @return
      */
-    public Result<?> queryResumeCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean);
+    public Result<?> queryResumeCollectionList(String token, PageBean pageBean);
+
+    /**
+     * 我的收藏-添加简历收藏
+     * @param token
+     * @param resumeId
+     * @return
+     */
+    public Result<?> addResumeCollection(String token, String resumeId);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ExaminationService.java

@@ -13,6 +13,13 @@ public interface ExaminationService {
      */
     public Result<?> queryCertList(PageBean pageBean);
 
+    /**
+     * 考证咨询-证书详情
+     * @param cerNo
+     * @return
+     */
+    public Result<?> queryCertById(String cerNo);
+
     /**
      * 考证咨询-提交报名材料
      * @param token

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ExchangeService.java

@@ -1,10 +1,19 @@
 package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.employExchange.entity.EmployExchange;
 
 public interface ExchangeService {
 
 
+    /**
+     *我的服务-查询兑换码列表
+     * @param pageBean
+     * @return
+     */
+    public Result<?> queryExchangeList(PageBean pageBean);
+
     /**
      * 我的服务-使用兑换码
      * @param token
@@ -17,6 +26,6 @@ public interface ExchangeService {
      * 我的服务-生成兑换码
      * @return
      */
-    public Result<?> addExchange();
+    public Result<?> addExchange(EmployExchange employExchange);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java

@@ -7,6 +7,8 @@ import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthentication
 import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
 import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import org.jeecg.modules.employCompany.service.IEmployCompanyService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +28,10 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     //企业实名认证表
     @Resource
     private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
+
+    //企业信息表
+    @Resource
+    private IEmployCompanyService employCompanyService;
     /******************************************************************************************************************/
 
     //会员中心-个人实名认证

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java

@@ -27,7 +27,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class BossApiServiceImpl implements BossApiService {
@@ -75,46 +77,83 @@ public class BossApiServiceImpl implements BossApiService {
         return Result.OK("简历列表", pageList);
     }
 
-    //首页-根据Id查看简历详情
+    //根据id查看简历详情
     @Override
     public Result<?> queryResumeById(String token, String resumeId) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        Map<String, Object> map = new HashMap<>();
 
-        CollectionBean collectionBean = new CollectionBean();
-        Boolean collectionFlag = false;
-        //获取简历详情
-        EmployResume one = employResumeService
-                .lambdaQuery()
-                .eq(EmployResume::getId, resumeId)
-                .one();
-
-        collectionBean.setEmployResume(one);
-
-        if(null != token){
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //1、获取简历详情
+        EmployResume resume = employResumeService.getById(resumeId);
+        map.put("resume", resume);
 
-            //添加简历被查看记录
-            EmployCheckResume employCheckResume = new EmployCheckResume();
-            employCheckResume.setResumeId(one.getId());
-            employCheckResume.setUserId(hanHaiMember.getId());
-            employCheckResumeService.saveOrUpdate(employCheckResume);
+        //2、获取简历拥有者信息
+        HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
+        map.put("hanHaiMember", member);
 
-            //添加是否被收藏标识
-            EmployCollectionResume collection = employCollectionResumeService
-                    .lambdaQuery()
-                    .eq(EmployCollectionResume::getResumeId, one.getId())
-                    .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
-                    .one();
-
-            if(null != collection){
-                collectionFlag = true;
-            }
+        //3、添加是否被收藏标识
+        EmployCollectionResume collection = employCollectionResumeService
+                .lambdaQuery()
+                .eq(EmployCollectionResume::getResumeId, resume.getId())
+                .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
+                .one();
+        if(null != collection){
+            map.put("collectionFlag", true);
+        }else {
+            map.put("collectionFlag", false);
         }
-        collectionBean.setCollectionFlag(collectionFlag);
 
-        return Result.OK("简历详情", collectionBean);
+        //4、添加简历被查看记录
+        EmployCheckResume employCheckResume = new EmployCheckResume();
+        employCheckResume.setResumeId(resume.getId());
+        employCheckResume.setUserId(hanHaiMember.getId());
+        employCheckResumeService.saveOrUpdate(employCheckResume);
+
+        return Result.OK("简历详情", map);
     }
 
+//    //首页-根据Id查看简历详情
+//    @Override
+//    public Result<?> queryResumeById(String token, String resumeId) {
+//
+//        CollectionBean collectionBean = new CollectionBean();
+//        Boolean collectionFlag = false;
+//        //获取简历详情
+//        EmployResume one = employResumeService
+//                .lambdaQuery()
+//                .eq(EmployResume::getId, resumeId)
+//                .one();
+//
+//        collectionBean.setEmployResume(one);
+//
+//        if(null != token){
+//            //权限验证
+//            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//
+//            //添加简历被查看记录
+//            EmployCheckResume employCheckResume = new EmployCheckResume();
+//            employCheckResume.setResumeId(one.getId());
+//            employCheckResume.setUserId(hanHaiMember.getId());
+//            employCheckResumeService.saveOrUpdate(employCheckResume);
+//
+//            //添加是否被收藏标识
+//            EmployCollectionResume collection = employCollectionResumeService
+//                    .lambdaQuery()
+//                    .eq(EmployCollectionResume::getResumeId, one.getId())
+//                    .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
+//                    .one();
+//
+//            if(null != collection){
+//                collectionFlag = true;
+//            }
+//        }
+//        collectionBean.setCollectionFlag(collectionFlag);
+//
+//        return Result.OK("简历详情", collectionBean);
+//    }
+
     //首页-发布招工
     @Override
     public Result<?> addJob(EmployJob employJob) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java

@@ -68,6 +68,44 @@ public class CollectionServiceImpl implements CollectionService {
         return Result.OK("工作收藏列表", pageList);
     }
 
+    //我的收藏-添加工作收藏
+    @Override
+    public Result<?> addJobCollection(String token, String jobId){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        //判断该工作是否已经被收藏，如果已被收藏，则取消收藏
+        EmployCollectionJob collection = employCollectionJobService
+                .lambdaQuery()
+                .eq(EmployCollectionJob::getUserId, hanHaiMember.getId())
+                .eq(EmployCollectionJob::getJobId, jobId)
+                .one();
+        if(null != collection){
+            //执行取消收藏
+            boolean result = employCollectionJobService.removeById(collection.getId());
+            if(result){
+                return Result.OK("取消收藏成功");
+            }else {
+                return Result.OK("取消收藏失败");
+            }
+        }
+
+        //添加收藏
+        EmployCollectionJob collectionJob = new EmployCollectionJob();
+        collectionJob.setJobId(jobId);
+        collectionJob.setUserId(hanHaiMember.getId());
+
+        //执行工作收藏操作
+        boolean result = employCollectionJobService.save(collectionJob);
+
+        if(result){
+            return Result.OK("收藏成功");
+        }else {
+            return Result.OK("收藏失败");
+        }
+
+    }
+
     //我的收藏-收藏简历信息
     @Override
     public Result<?> queryResumeCollectionList(String token, PageBean pageBean) {
@@ -91,4 +129,43 @@ public class CollectionServiceImpl implements CollectionService {
 
         return Result.OK("简历收藏列表", pageList);
     }
+
+    //我的收藏-添加简历收藏
+    @Override
+    public Result<?> addResumeCollection(String token, String resumeId){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        //判断该工作是否已经被收藏，如果已被收藏，则取消收藏
+        EmployCollectionResume collection = employCollectionResumeService
+                .lambdaQuery()
+                .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
+                .eq(EmployCollectionResume::getResumeId, resumeId)
+                .one();
+        if(null != collection){
+            //执行取消收藏
+            boolean result = employCollectionResumeService.removeById(collection.getId());
+            if(result){
+                return Result.OK("取消收藏成功");
+            }else {
+                return Result.OK("取消收藏失败");
+            }
+        }
+
+        //添加收藏
+        EmployCollectionResume collectionResume = new EmployCollectionResume();
+        collectionResume.setResumeId(resumeId);
+        collectionResume.setUserId(hanHaiMember.getId());
+
+        //执行工作收藏操作
+        boolean result = employCollectionResumeService.save(collectionResume);
+
+        if(result){
+            return Result.OK("收藏成功");
+        }else {
+            return Result.OK("收藏失败");
+        }
+
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java

@@ -76,6 +76,34 @@ public class ExaminationServiceImpl implements ExaminationService {
         return Result.OK("证书咨询列表", pageList);
     }
 
+    //查询证书详情
+    @Override
+    public Result<?> queryCertById(String cerId) {
+
+        //查询证书详情
+        EmployCert cert = employCertService.getById(cerId);
+
+        //获取证书相关报名材料关联
+        List<EmployCertMaterial> employCertMaterialList = employCertMaterialService
+                .lambdaQuery()
+                .eq(EmployCertMaterial::getCertId, cert.getId())
+                .orderByAsc(EmployCertMaterial::getOrderNo)
+                .list();
+
+        //获取报名材料
+        List<EmployMaterial> employMaterialList = new ArrayList<>();
+        for (EmployCertMaterial employCertMaterial : employCertMaterialList) {
+            EmployMaterial material = employMaterialService
+                    .lambdaQuery()
+                    .eq(EmployMaterial::getId, employCertMaterial.getMaterialId())
+                    .one();
+            employMaterialList.add(material);
+        }
+        cert.setEmployMaterialList(employMaterialList);
+
+        return Result.OK("证书详情", cert);
+    }
+
     //考证咨询-提交报名材料
     @Override
     public Result<?> addMaterial(String token, EmployRedister employRedister) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExchangeServiceImpl.java

@@ -1,13 +1,20 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.ExchangeService;
 import org.jeecg.modules.employCert.service.IEmployCertService;
+import org.jeecg.modules.employCheckResume.entity.EmployCheckResume;
 import org.jeecg.modules.employExchange.entity.EmployExchange;
 import org.jeecg.modules.employExchange.service.IEmployExchangeService;
+import org.jeecg.modules.employExchangeConfig.entity.EmployExchangeConfig;
+import org.jeecg.modules.employExchangeConfig.service.IEmployExchangeConfigService;
 import org.jeecg.modules.employExchangeRecord.entity.EmployExchangeRecord;
 import org.jeecg.modules.employExchangeRecord.service.IEmployExchangeRecordService;
+import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employScore.entity.EmployScore;
 import org.jeecg.modules.employScore.service.IEmployScoreService;
 import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord;
@@ -18,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.UUID;
 
 @Service
 public class ExchangeServiceImpl implements ExchangeService {
@@ -39,6 +47,10 @@ public class ExchangeServiceImpl implements ExchangeService {
     @Resource
     private IEmployExchangeRecordService employExchangeRecordService;
 
+    //兑换码问答配置
+    @Resource
+    private IEmployExchangeConfigService employExchangeConfigService;
+
     //积分表
     @Resource
     private IEmployScoreService employScoreService;
@@ -46,8 +58,38 @@ public class ExchangeServiceImpl implements ExchangeService {
     //积分记录表
     @Resource
     private IEmployScoreRecordService employScoreRecordService;
+
     /******************************************************************************************************************/
 
+    //我的服务-查询兑换码信息
+    @Override
+    public Result<?> queryExchangeList(PageBean pageBean) {
+        //返回信息
+        String message = "获取兑换码问答配置失败!";
+
+        try{
+            //分页
+            Page<EmployExchangeConfig> page = new Page<EmployExchangeConfig>(pageBean.getPageNo(), pageBean.getPageSize());
+            Page<EmployExchangeConfig> pageList = employExchangeConfigService
+                    .lambdaQuery()
+                    .page(page);
+
+            //判断执行结果
+            if(null != pageList){
+                message = "兑换码问答配置信息";
+            }else {
+                message = "兑换码问答配置为空";
+            }
+
+            //返回执行结果
+            return Result.OK(message, pageList);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message);
+        }
+    }
     //我的服务-使用兑换码
     @Override
     public Result<?> useExchange(String token, String code) {
@@ -77,41 +119,48 @@ public class ExchangeServiceImpl implements ExchangeService {
 
             //4、添加用户积分
             boolean scoreFlag = false;
-            //查询该用户是否有积分信息
-            EmployScore one = employScoreService
-                    .lambdaQuery()
-                    .eq(EmployScore::getUserId, hanHaiMember.getId())
-                    .one();
-
-            double score = exchange.getScore();
-
-            //如果有积分信息，就在该基础上增加积分
-            EmployScore employScore = new EmployScore();
-            employScore.setUserId(hanHaiMember.getId());
-            if(null != one){
-                double  newScore;
-                if(null != one.getScore()){
-                    newScore = one.getScore() + score;
-                }else {
-                    newScore = score;
-                }
-
-                employScore.setId(one.getId());
-                employScore.setScore(newScore);
-
-                //添加/修改积分信息
-                scoreFlag = employScoreService.updateById(employScore);
-
-            }else {
-                //如果没有积分信息，就新建积分信息
-                employScore.setScore(score);
-                scoreFlag = employScoreService.save(employScore);
-
-            }
+            BigDecimal score = exchange.getScore();
+
+            BigDecimal newScore = hanHaiMember.getIntegerPrice().add(score);
+            hanHaiMember.setIntegerPrice(newScore);
+
+            //修改积分
+            scoreFlag = hanHaiMemberService.updateById(hanHaiMember);
+//            //查询该用户是否有积分信息
+//            EmployScore one = employScoreService
+//                    .lambdaQuery()
+//                    .eq(EmployScore::getUserId, hanHaiMember.getId())
+//                    .one();
+//
+//            double score = exchange.getScore();
+//
+//            //如果有积分信息，就在该基础上增加积分
+//            EmployScore employScore = new EmployScore();
+//            employScore.setUserId(hanHaiMember.getId());
+//            if(null != one){
+//                double  newScore;
+//                if(null != one.getScore()){
+//                    newScore = one.getScore() + score;
+//                }else {
+//                    newScore = score;
+//                }
+//
+//                employScore.setId(one.getId());
+//                employScore.setScore(newScore);
+//
+//                //添加/修改积分信息
+//                scoreFlag = employScoreService.updateById(employScore);
+//
+//            }else {
+//                //如果没有积分信息，就新建积分信息
+//                employScore.setScore(score);
+//                scoreFlag = employScoreService.save(employScore);
+//
+//            }
 
             //5、添加用户积分记录
             EmployScoreRecord scoreRecord = new EmployScoreRecord();
-            scoreRecord.setScore(BigDecimal.valueOf(score));
+            scoreRecord.setScore(score);
             scoreRecord.setUserId(hanHaiMember.getId());
             scoreRecord.setTitle("兑换码获取积分");
             scoreRecord.setType("0");
@@ -133,14 +182,15 @@ public class ExchangeServiceImpl implements ExchangeService {
 
     //我的服务-生成兑换码
     @Override
-    public Result<?> addExchange() {
+    public Result<?> addExchange(EmployExchange employExchange) {
 
+        UUID code = UUID.randomUUID();//生成兑换码
 
         EmployExchange exchange = new EmployExchange();
-        exchange.setCode("");//兑换码
+        exchange.setCode(code.toString());//兑换码
         exchange.setStatus("0");//兑换码状态
-        exchange.setScore(100.0);//兑换码可换取积分数量
-        //exchange.setOverdueTime();//兑换码过期时间
+        exchange.setScore(employExchange.getScore());//兑换码可换取积分数量
+        exchange.setOverdueTime(employExchange.getOverdueTime());//兑换码过期时间
 
         boolean result = employExchangeService.save(exchange);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java

@@ -7,6 +7,8 @@ import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.CollectionBean;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.JobService;
+import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
+import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
 import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employCheckJob.entity.EmployCheckJob;
@@ -18,6 +20,7 @@ import org.jeecg.modules.employCompany.service.IEmployCompanyService;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employJob.service.IEmployJobService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,6 +35,10 @@ public class JobServiceImpl implements JobService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    //工作信息表
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
     //工作信息表
     @Resource
     private IEmployJobService employJobService;
@@ -44,6 +51,10 @@ public class JobServiceImpl implements JobService {
     @Resource
     private IEmployCheckJobService employCheckJobService;
 
+    //企业实名认证表
+    @Resource
+    private IEmployAhthenticationCompanyService employAhthenticationCompanyService;
+
     //个人实名认证表
     @Resource
     private IEmployAuthenticationPersonService employAuthenticationPersonService;
@@ -79,6 +90,10 @@ public class JobServiceImpl implements JobService {
                 //工作性质
                 query.eq(EmployJob::getNatureId, employJob.getNatureId());
             }
+            if(null != employJob.getCompany()){
+                //所属公司
+                query.eq(EmployJob::getCompany, employJob.getCompany());
+            }
 
 
             //获取工作信息列表
@@ -91,6 +106,12 @@ public class JobServiceImpl implements JobService {
                 message = "工作列表信息为空";
             }
 
+            //把用户信息放入工作详情中
+            for (EmployJob record : pageList.getRecords()) {
+                HanHaiMember hanHaiMember = hanHaiMemberService.getById(record.getUserId());
+                record.setHanHaiMember(hanHaiMember);
+            }
+
             //返回执行结果
             return Result.OK(message, pageList);
 
@@ -101,47 +122,6 @@ public class JobServiceImpl implements JobService {
         }
     }
 
-    //根据id查询工作详情
-//    @Override
-//    public Result<?> queryJobById(String token, String jobId) {
-//        CollectionBean collectionBean = new CollectionBean();
-//        Boolean collectionFlag = false;
-//
-//        //获取工作详情
-//        EmployJob one = employJobService
-//                .lambdaQuery()
-//                .eq(EmployJob::getId, jobId)
-//                .one();
-//
-//        collectionBean.setEmployJob(one);
-//
-//        //添加工作被查看记录
-//        if(null != token){
-//            //权限验证
-//            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-//
-//            EmployCheckJob employCheckJob = new EmployCheckJob();
-//            employCheckJob.setJobId(one.getId());
-//            employCheckJob.setUserId(hanHaiMember.getId());
-//            employCheckJobService.saveOrUpdate(employCheckJob);
-//
-//            //添加是否被收藏标识
-//            EmployCollectionJob collection = employCollectionJobService
-//                    .lambdaQuery()
-//                    .eq(EmployCollectionJob::getJobId, one.getId())
-//                    .eq(EmployCollectionJob::getUserId, hanHaiMember.getId())
-//                    .one();
-//
-//            if(null != collection){
-//                collectionFlag = true;
-//            }
-//        }
-//
-//        collectionBean.setCollectionFlag(collectionFlag);
-//
-//        return Result.OK("工作详情", collectionBean);
-//    }
-
     @Override
     public Result<?> queryJobById(String token, String jobId) {
 
@@ -155,6 +135,11 @@ public class JobServiceImpl implements JobService {
         EmployJob job = employJobService.getById(jobId);
         map.put("jobInfo", job);
 
+
+        //查看招聘者信息
+        HanHaiMember member = hanHaiMemberService.getById(job.getUserId());
+        map.put("hanHaiMember", member);
+
         //根据工作关联用户id查询出用户实名认证信息
         EmployAuthenticationPerson person = employAuthenticationPersonService
                 .lambdaQuery()
@@ -165,7 +150,7 @@ public class JobServiceImpl implements JobService {
         //根据关联公司id查询出公司信息
         EmployCompany company = employCompanyService
                 .lambdaQuery()
-                .eq(EmployCompany::getCompanyName, job.getCompany())
+                .eq(EmployCompany::getId, job.getCompany())
                 .one();
         map.put("companyInfo", company);
 
@@ -217,6 +202,41 @@ public class JobServiceImpl implements JobService {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         employJob.setUserId(hanHaiMember.getId());
 
+        //判断用户是否通过个人实名认证企业信息，没有通过实名认证信息则不能发布工作岗位信息
+        EmployAuthenticationPerson authenticationPerson = employAuthenticationPersonService
+                .lambdaQuery()
+                .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId())
+                .eq(EmployAuthenticationPerson::getStatus, "1")
+                .one();
+        if(null == authenticationPerson){
+            return Result.error("未进行个人实名认证或个人实名认证审核未通过，请先去进行个人实名认证");
+        }
+
+        //判断用户是否通过企业实名认证信息，没有通过实名认证信息则不能发布工作岗位信息
+        EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService
+                .lambdaQuery()
+                .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId())
+                .eq(EmployAhthenticationCompany::getStatus, "1")
+                .one();
+        if(null == ahthenticationCompany){
+            return Result.error("未进行企业实名认证或企业实名认证审核未通过，请先去进行企业实名认证");
+        }else {
+            //查询企业信息
+            EmployCompany company = employCompanyService
+                    .lambdaQuery()
+                    .eq(EmployCompany::getSocialCode, ahthenticationCompany.getSocialCode())
+                    .one();
+            if(null != company){
+                employJob.setCompany(company.getId());//工作信息关联公司
+                if(null == employJob.getWorkAddress()){
+                    employJob.setWorkAddress(company.getAddress());//如果没有填写工作地址，则默认为公司地址
+                }
+            }else {
+                return Result.error("未查询到企业信息，工作发布失败");
+            }
+
+        }
+
         try{
             //执行工作信息添加
             result = employJobService.save(employJob);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java

@@ -8,6 +8,8 @@ import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.CollectionBean;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.ResumeService;
+import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
+import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService;
 import org.jeecg.modules.employCheckResume.entity.EmployCheckResume;
 import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService;
@@ -17,12 +19,15 @@ import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.employResume.service.IEmployResumeService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class ResumeServiceImpl implements ResumeService {
@@ -31,6 +36,10 @@ public class ResumeServiceImpl implements ResumeService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    //用户信息表
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
     //简历信息表
     @Resource
     private IEmployResumeService employResumeService;
@@ -42,6 +51,10 @@ public class ResumeServiceImpl implements ResumeService {
     //简历查看表
     @Resource
     private IEmployCheckResumeService employCheckResumeService;
+
+    //简历查看表
+    @Resource
+    private IEmployAuthenticationPersonService employAuthenticationPersonService;
     /******************************************************************************************************************/
 
     //查询简历信息列表
@@ -73,11 +86,25 @@ public class ResumeServiceImpl implements ResumeService {
             //获取简历信息列表
             pageList = query.page(page);
 
+            //把用户信息放入简历详情中
+            for (EmployResume record : pageList.getRecords()) {
+                //获取用户信息
+                HanHaiMember hanHaiMember = hanHaiMemberService.getById(record.getUserId());
+                record.setHanHaiMember(hanHaiMember);
+
+                //获取个人实名认证信息
+                EmployAuthenticationPerson person = employAuthenticationPersonService
+                        .lambdaQuery()
+                        .eq(EmployAuthenticationPerson::getUserId, record.getUserId())
+                        .one();
+                record.setEmployAuthenticationPerson(person);
+            }
+
             //判断执行结果
             if(null != pageList){
-                message = "工作列表信息";
+                message = "简历列表信息";
             }else {
-                message = "工作列表信息为空";
+                message = "简历列表信息为空";
             }
 
             //返回执行结果
@@ -93,40 +120,46 @@ public class ResumeServiceImpl implements ResumeService {
     //根据id查看简历详情
     @Override
     public Result<?> queryResumeById(String token, String resumeId) {
-        CollectionBean collectionBean = new CollectionBean();
-        Boolean collectionFlag = false;
-        //获取简历详情
-        EmployResume one = employResumeService
-                .lambdaQuery()
-                .eq(EmployResume::getId, resumeId)
-                .one();
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        Map<String, Object> map = new HashMap<>();
 
-        collectionBean.setEmployResume(one);
+        //1、获取简历详情
+        EmployResume resume = employResumeService.getById(resumeId);
+        map.put("resume", resume);
 
-        if(null != token){
-            //权限验证
-            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-            //添加简历被查看记录
-            EmployCheckResume employCheckResume = new EmployCheckResume();
-            employCheckResume.setResumeId(one.getId());
-            employCheckResume.setUserId(hanHaiMember.getId());
-            employCheckResumeService.saveOrUpdate(employCheckResume);
+        //2、获取个人实名认证信息
+        EmployAuthenticationPerson person = employAuthenticationPersonService
+                .lambdaQuery()
+                .eq(EmployAuthenticationPerson::getUserId, resume.getUserId())
+                .one();
+        map.put("authenticationPerson", person);
 
-            //添加是否被收藏标识
-            EmployCollectionResume collection = employCollectionResumeService
-                    .lambdaQuery()
-                    .eq(EmployCollectionResume::getResumeId, one.getId())
-                    .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
-                    .one();
+        //3、获取简历拥有者信息
+        HanHaiMember member = hanHaiMemberService.getById(resume.getUserId());
+        map.put("hanHaiMember", member);
 
-            if(null != collection){
-                collectionFlag = true;
-            }
+        //4、添加是否被收藏标识
+        EmployCollectionResume collection = employCollectionResumeService
+                .lambdaQuery()
+                .eq(EmployCollectionResume::getResumeId, resume.getId())
+                .eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
+                .one();
+        if(null != collection){
+            map.put("collectionFlag", true);
+        }else {
+            map.put("collectionFlag", false);
         }
-        collectionBean.setCollectionFlag(collectionFlag);
 
-        return Result.OK("简历详情", collectionBean);
+        //5、添加简历被查看记录
+        EmployCheckResume employCheckResume = new EmployCheckResume();
+        employCheckResume.setResumeId(resume.getId());
+        employCheckResume.setUserId(hanHaiMember.getId());
+        employCheckResumeService.saveOrUpdate(employCheckResume);
+
+        return Result.OK("简历详情", map);
     }
 
     //会员中心-我的简历
@@ -157,14 +190,36 @@ public class ResumeServiceImpl implements ResumeService {
         employResume.setUserId(hanHaiMember.getId());
 
         try{
-            //执行简历信息添加
-            result = employResumeService.save(employResume);
+            //判断用户是否通过个人实名认证企业信息，没有通过实名认证信息则不能发布简历信息
+            EmployAuthenticationPerson authenticationPerson = employAuthenticationPersonService
+                    .lambdaQuery()
+                    .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId())
+                    .eq(EmployAuthenticationPerson::getStatus, "1")
+                    .one();
+            if(null == authenticationPerson){
+                return Result.error("未进行个人实名认证或个人实名认证审核未通过，请先去进行个人实名认证");
+            }
+
+            //查询是用户是否存在简历，存在则进行修改，不存在则进行新增
+            EmployResume resume = employResumeService
+                    .lambdaQuery()
+                    .eq(EmployResume::getUserId, hanHaiMember.getId())
+                    .one();
+
+            if(null == resume){
+                //执行新增
+                result = employResumeService.save(employResume);
+            }else {
+                //执行修改
+                employResume.setUserId(hanHaiMember.getId());
+                result = employResumeService.updateById(employResume);
+            }
 
             //判断执行结果
             if(result){
-                message = "简历信息添加成功！";
+                message = "操作成功！";
             }else {
-                message = "简历信息添加失败！";
+                message = "操作失败！";
             }
 
             //返回执行结果

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

@@ -9,6 +9,11 @@ import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationP
 import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord;
 import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService;
+import org.jeecg.modules.employVip.entity.EmployVip;
+import org.jeecg.modules.employVipType.entity.EmployVipType;
+import org.jeecg.modules.employVipType.service.IEmployVipTypeService;
+import org.jeecg.modules.employVipUser.entity.EmployVipUser;
+import org.jeecg.modules.employVipUser.service.IEmployVipUserService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
@@ -37,9 +42,18 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Resource
     private IEmployScoreRecordService employScoreRecordService;
 
+    //会员信息关联表
+    @Resource
+    private IEmployVipUserService employVipUserService;
+
+    //会员类型表
+    @Resource
+    private IEmployVipTypeService employVipTypeService;
+
 
     @Resource
     private ScoreServiceImpl scoreService;
+    /******************************************************************************************************************/
 
 
 
@@ -89,6 +103,9 @@ public class UserInfoServiceImpl implements UserInfoService {
         //获取是否签到
         boolean signFlag = scoreService.judgeSign(token);
 
+        //获取用户vip类型
+        String vipType = getVip(token);
+
         //组装个人基础数据
         Map map = new HashMap();
         map.put("integerNum",hanHaiMember.getIntegerPrice());
@@ -100,6 +117,28 @@ public class UserInfoServiceImpl implements UserInfoService {
             map.put("status","0");//实名状态
         }
         map.put("signFlag",signFlag);
+        map.put("vipType", vipType);//VIP类型
         return Result.OK("获取个人中心基础数据信息",map);
     }
+
+    //获取用户VIP信息
+    public String getVip(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        //查询用户vip关联
+        EmployVipUser vu = employVipUserService
+                .lambdaQuery()
+                .eq(EmployVipUser::getUserId, hanHaiMember.getId())
+                .one();
+
+        if(null == vu){
+            return "暂未开通VIP";
+        }
+
+        //查询vip信息
+        EmployVipType vt = employVipTypeService.getById(vu.getTypeId());
+
+        return vt.getName();
+    }
 }