1、接口整理

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-10-21
+ * @Date:   2024-12-20
  * @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-10-21
+ * @Date:   2024-12-20
  * @Version: V1.0
  */
 @Data
@@ -50,5 +50,5 @@ public class EmployAddress implements Serializable {
 	/**地址*/
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
-    private java.lang.String adress;
+    private java.lang.String address;
 }

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

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

@@ -124,7 +124,7 @@
           {
             title:'地址',
             align:"center",
-            dataIndex: 'adress'
+            dataIndex: 'address'
           },
           {
             title: '操作',
@@ -160,7 +160,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'adress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',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="adress">
-              <a-input v-model="model.adress" placeholder="请输入地址"  ></a-input>
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" 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,7 +7,7 @@ export const columns: BasicColumn[] = [
     {
     title: '地址',
     align:"center",
-    dataIndex: 'adress'
+    dataIndex: 'address'
    },
 ];
 //查询数据
@@ -17,7 +17,7 @@ export const searchFormSchema: FormSchema[] = [
 export const formSchema: FormSchema[] = [
   {
     label: '地址',
-    field: 'adress',
+    field: 'address',
     component: 'Input',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java

@@ -68,7 +68,8 @@ public class EmployAhthenticationCompany implements Serializable {
     @ApiModelProperty(value = "工商营业执照")
     private java.lang.String businessLicense;
 	/**审核状态*/
-	@Excel(name = "审核状态", width = 15)
+	@Excel(name = "审核状态", width = 15, dicCode = "employ_status")
+	@Dict(dicCode = "employ_status")
     @ApiModelProperty(value = "审核状态")
     private java.lang.String status;
 	/**关联用户id*/
@@ -76,4 +77,8 @@ public class EmployAhthenticationCompany implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+	/**审核备注*/
+	@Excel(name = "审核备注", width = 15)
+    @ApiModelProperty(value = "审核备注")
+    private java.lang.String remark;
 }

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

@@ -151,13 +151,18 @@
           {
             title:'审核状态',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'status_dictText'
           },
           {
             title:'关联用户id',
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'审核备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -197,8 +202,9 @@
         fieldList.push({type:'string',value:'legalPerson',text:'企业法人',dictCode:''})
         fieldList.push({type:'string',value:'socialCode',text:'社会统一信用代码',dictCode:''})
         fieldList.push({type:'string',value:'businessLicense',text:'工商营业执照',dictCode:''})
-        fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'employ_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -30,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input v-model="model.status" placeholder="请输入审核状态"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -38,6 +38,11 @@
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" 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/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts

@@ -33,13 +33,18 @@ export const columns: BasicColumn[] = [
    {
     title: '审核状态',
     align:"center",
-    dataIndex: 'status'
+    dataIndex: 'status_dictText'
    },
    {
     title: '关联用户id',
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '审核备注',
+    align:"center",
+    dataIndex: 'remark'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -76,7 +81,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '审核状态',
     field: 'status',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_status"
+     },
   },
   {
     label: '关联用户id',
@@ -86,4 +94,9 @@ export const formSchema: FormSchema[] = [
         dictCode:"han_hai_member,nick_name,id"
      },
   },
+  {
+    label: '审核备注',
+    field: 'remark',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java

@@ -64,7 +64,8 @@ public class EmployAuthenticationPerson implements Serializable {
     @ApiModelProperty(value = "身份证人像面照片")
     private java.lang.String image;
 	/**审核状态*/
-	@Excel(name = "审核状态", width = 15)
+	@Excel(name = "审核状态", width = 15, dicCode = "employ_status")
+	@Dict(dicCode = "employ_status")
     @ApiModelProperty(value = "审核状态")
     private java.lang.String status;
 	/**关联用户id*/
@@ -72,4 +73,8 @@ public class EmployAuthenticationPerson implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+	/**审核备注*/
+	@Excel(name = "审核备注", width = 15)
+    @ApiModelProperty(value = "审核备注")
+    private java.lang.String remark;
 }

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

@@ -146,13 +146,18 @@
           {
             title:'审核状态',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'status_dictText'
           },
           {
             title:'关联用户id',
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'审核备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -191,8 +196,9 @@
         fieldList.push({type:'string',value:'cerNo',text:'身份证号',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
         fieldList.push({type:'string',value:'image',text:'身份证人像面照片',dictCode:''})
-        fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'employ_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -25,7 +25,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input v-model="model.status" placeholder="请输入审核状态"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -33,6 +33,11 @@
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" 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/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts

@@ -28,13 +28,18 @@ export const columns: BasicColumn[] = [
    {
     title: '审核状态',
     align:"center",
-    dataIndex: 'status'
+    dataIndex: 'status_dictText'
    },
    {
     title: '关联用户id',
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '审核备注',
+    align:"center",
+    dataIndex: 'remark'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -66,7 +71,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '审核状态',
     field: 'status',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_status"
+     },
   },
   {
     label: '关联用户id',
@@ -76,4 +84,9 @@ export const formSchema: FormSchema[] = [
         dictCode:"han_hai_member,nick_name,id"
      },
   },
+  {
+    label: '审核备注',
+    field: 'remark',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/controller/EmployBillInfoController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/entity/EmployBillInfo.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 记账信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -47,9 +47,9 @@ public class EmployBillInfo implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**账单类型(0-收入 1-支出)*/
-	@Excel(name = "账单类型(0-收入 1-支出)", width = 15)
-    @ApiModelProperty(value = "账单类型(0-收入 1-支出)")
+	/**账单类型*/
+	@Excel(name = "账单类型", width = 15)
+    @ApiModelProperty(value = "账单类型")
     private java.lang.Integer type;
 	/**记账日期*/
 	@Excel(name = "记账日期", width = 15, format = "yyyy-MM-dd")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/mapper/EmployBillInfoMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 记账信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployBillInfoMapper extends BaseMapper<EmployBillInfo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/IEmployBillInfoService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 记账信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployBillInfoService extends IService<EmployBillInfo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/impl/EmployBillInfoServiceImpl.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/EmployBillInfoList.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.type"></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>
@@ -123,13 +138,14 @@
             }
           },
           {
-            title:'账单类型(0-收入 1-支出)',
+            title:'账单类型',
             align:"center",
             dataIndex: 'type'
           },
           {
             title:'记账日期',
             align:"center",
+            sorter: true,
             dataIndex: 'billDate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -138,6 +154,7 @@
           {
             title:'记账金额',
             align:"center",
+            sorter: true,
             dataIndex: 'amount'
           },
           {
@@ -185,7 +202,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'int',value:'type',text:'账单类型(0-收入 1-支出)',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'账单类型',dictCode:'employ_bill'})
         fieldList.push({type:'date',value:'billDate',text:'记账日期'})
         fieldList.push({type:'BigDecimal',value:'amount',text:'记账金额',dictCode:''})
         fieldList.push({type:'string',value:'remarks',text:'备注',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/modules/EmployBillInfoForm.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="账单类型(0-收入 1-支出)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input-number v-model="model.type" placeholder="请输入账单类型(0-收入 1-支出)" style="width: 100%" />
+            <a-form-model-item label="账单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-input-number v-model="model.type" placeholder="请输入账单类型" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue3/EmployBillInfo.data.ts

@@ -5,13 +5,14 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '账单类型(0-收入 1-支出)',
+    title: '账单类型',
     align:"center",
     dataIndex: 'type'
    },
    {
     title: '记账日期',
     align:"center",
+    sorter: true,
     dataIndex: 'billDate',
     customRender:({text}) =>{
       return !text?"":(text.length>10?text.substr(0,10):text)
@@ -20,6 +21,7 @@ export const columns: BasicColumn[] = [
    {
     title: '记账金额',
     align:"center",
+    sorter: true,
     dataIndex: 'amount'
    },
    {
@@ -36,11 +38,17 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "账单类型",
+      field: "type",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '账单类型(0-收入 1-支出)',
+    label: '账单类型',
     field: 'type',
     component: 'InputNumber',
   },

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

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employCompany.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.employCompany.entity.EmployCompany;
+import org.jeecg.modules.employCompany.service.IEmployCompanyService;
+
+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-20
+ * @Version: V1.0
+ */
+@Api(tags="企业信息表")
+@RestController
+@RequestMapping("/employCompany/employCompany")
+@Slf4j
+public class EmployCompanyController extends JeecgController<EmployCompany, IEmployCompanyService> {
+	@Autowired
+	private IEmployCompanyService employCompanyService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employCompany
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "企业信息表-分页列表查询")
+	@ApiOperation(value="企业信息表-分页列表查询", notes="企业信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployCompany>> queryPageList(EmployCompany employCompany,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployCompany> queryWrapper = QueryGenerator.initQueryWrapper(employCompany, req.getParameterMap());
+		Page<EmployCompany> page = new Page<EmployCompany>(pageNo, pageSize);
+		IPage<EmployCompany> pageList = employCompanyService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employCompany
+	 * @return
+	 */
+	@AutoLog(value = "企业信息表-添加")
+	@ApiOperation(value="企业信息表-添加", notes="企业信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployCompany employCompany) {
+		employCompanyService.save(employCompany);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employCompany
+	 * @return
+	 */
+	@AutoLog(value = "企业信息表-编辑")
+	@ApiOperation(value="企业信息表-编辑", notes="企业信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployCompany employCompany) {
+		employCompanyService.updateById(employCompany);
+		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) {
+		employCompanyService.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.employCompanyService.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<EmployCompany> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployCompany employCompany = employCompanyService.getById(id);
+		if(employCompany==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employCompany);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employCompany
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployCompany employCompany) {
+        return super.exportXls(request, employCompany, EmployCompany.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, EmployCompany.class);
+    }
+
+}

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

@@ -0,0 +1,82 @@
+package org.jeecg.modules.employCompany.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-20
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_company")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_company对象", description="企业信息表")
+public class EmployCompany 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 companyName;
+	/**企业图片*/
+	@Excel(name = "企业图片", width = 15)
+    @ApiModelProperty(value = "企业图片")
+    private java.lang.String image;
+	/**营业执照*/
+	@Excel(name = "营业执照", width = 15)
+    @ApiModelProperty(value = "营业执照")
+    private java.lang.String license;
+	/**企业人数*/
+	@Excel(name = "企业人数", width = 15)
+    @ApiModelProperty(value = "企业人数")
+    private java.lang.Integer number;
+	/**法人名称*/
+	@Excel(name = "法人名称", width = 15)
+    @ApiModelProperty(value = "法人名称")
+    private java.lang.String legalPerson;
+	/**企业地址*/
+	@Excel(name = "企业地址", width = 15)
+    @ApiModelProperty(value = "企业地址")
+    private java.lang.String address;
+	/**公司电话*/
+	@Excel(name = "公司电话", width = 15)
+    @ApiModelProperty(value = "公司电话")
+    private java.lang.String phone;
+	/**统一社会信用代码*/
+	@Excel(name = "统一社会信用代码", width = 15)
+    @ApiModelProperty(value = "统一社会信用代码")
+    private java.lang.String socialCode;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employCompany.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 企业信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+public interface EmployCompanyMapper extends BaseMapper<EmployCompany> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/mapper/xml/EmployCompanyMapper.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.employCompany.mapper.EmployCompanyMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employCompany.service;
+
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 企业信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employCompany.service.impl;
+
+import org.jeecg.modules.employCompany.entity.EmployCompany;
+import org.jeecg.modules.employCompany.mapper.EmployCompanyMapper;
+import org.jeecg.modules.employCompany.service.IEmployCompanyService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 企业信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+@Service
+public class EmployCompanyServiceImpl extends ServiceImpl<EmployCompanyMapper, EmployCompany> implements IEmployCompanyService {
+
+}

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

@@ -0,0 +1,213 @@
+<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-company-modal ref="modalForm" @ok="modalFormOk"></employ-company-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployCompanyModal from './modules/EmployCompanyModal'
+
+  export default {
+    name: 'EmployCompanyList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployCompanyModal
+    },
+    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: 'companyName'
+          },
+          {
+            title:'企业图片',
+            align:"center",
+            dataIndex: 'image'
+          },
+          {
+            title:'营业执照',
+            align:"center",
+            dataIndex: 'license'
+          },
+          {
+            title:'企业人数',
+            align:"center",
+            dataIndex: 'number'
+          },
+          {
+            title:'法人名称',
+            align:"center",
+            dataIndex: 'legalPerson'
+          },
+          {
+            title:'企业地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'公司电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'统一社会信用代码',
+            align:"center",
+            dataIndex: 'socialCode'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employCompany/employCompany/list",
+          delete: "/employCompany/employCompany/delete",
+          deleteBatch: "/employCompany/employCompany/deleteBatch",
+          exportXlsUrl: "/employCompany/employCompany/exportXls",
+          importExcelUrl: "employCompany/employCompany/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'companyName',text:'企业名称',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'企业图片',dictCode:''})
+        fieldList.push({type:'Text',value:'license',text:'营业执照',dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'企业人数',dictCode:''})
+        fieldList.push({type:'string',value:'legalPerson',text:'法人名称',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'企业地址',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'公司电话',dictCode:''})
+        fieldList.push({type:'string',value:'socialCode',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/employCompany/vue/modules/EmployCompanyForm.vue

@@ -0,0 +1,139 @@
+<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="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="企业图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-input v-model="model.image" placeholder="请输入企业图片"  ></a-input>
+            </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>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="企业人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
+              <a-input-number v-model="model.number" placeholder="请输入企业人数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="法人名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="legalPerson">
+              <a-input v-model="model.legalPerson" placeholder="请输入法人名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <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>
+          </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="socialCode">
+              <a-input v-model="model.socialCode" placeholder="请输入统一社会信用代码"  ></a-input>
+            </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: 'EmployCompanyForm',
+    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: "/employCompany/employCompany/add",
+          edit: "/employCompany/employCompany/edit",
+          queryById: "/employCompany/employCompany/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/employCompany/vue/modules/EmployCompanyModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <employ-company-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-company-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 EmployCompanyForm from './EmployCompanyForm'
+
+  export default {
+    name: 'EmployCompanyModal',
+    components: {
+      EmployCompanyForm
+    },
+    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/employCompany/vue/modules/EmployCompanyModal.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-company-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-company-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployCompanyForm from './EmployCompanyForm'
+  export default {
+    name: 'EmployCompanyModal',
+    components: {
+      EmployCompanyForm
+    },
+    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/employCompany/vue3/EmployCompany.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employCompany/employCompany/list',
+  save='/employCompany/employCompany/add',
+  edit='/employCompany/employCompany/edit',
+  deleteOne = '/employCompany/employCompany/delete',
+  deleteBatch = '/employCompany/employCompany/deleteBatch',
+  importExcel = '/employCompany/employCompany/importExcel',
+  exportXls = '/employCompany/employCompany/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/employCompany/vue3/EmployCompany.data.ts

@@ -0,0 +1,93 @@
+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: 'companyName'
+   },
+   {
+    title: '企业图片',
+    align:"center",
+    dataIndex: 'image'
+   },
+   {
+    title: '营业执照',
+    align:"center",
+    dataIndex: 'license'
+   },
+   {
+    title: '企业人数',
+    align:"center",
+    dataIndex: 'number'
+   },
+   {
+    title: '法人名称',
+    align:"center",
+    dataIndex: 'legalPerson'
+   },
+   {
+    title: '企业地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '公司电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '统一社会信用代码',
+    align:"center",
+    dataIndex: 'socialCode'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '企业名称',
+    field: 'companyName',
+    component: 'Input',
+  },
+  {
+    label: '企业图片',
+    field: 'image',
+    component: 'Input',
+  },
+  {
+    label: '营业执照',
+    field: 'license',
+    component: 'Input',
+  },
+  {
+    label: '企业人数',
+    field: 'number',
+    component: 'InputNumber',
+  },
+  {
+    label: '法人名称',
+    field: 'legalPerson',
+    component: 'Input',
+  },
+  {
+    label: '企业地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '公司电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '统一社会信用代码',
+    field: 'socialCode',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCompany/vue3/EmployCompanyList.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>
+    <!-- 表单区域 -->
+    <EmployCompanyModal @register="registerModal" @success="handleSuccess"></EmployCompanyModal>
+  </div>
+</template>
+
+<script lang="ts" name="employCompany-employCompany" 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 EmployCompanyModal from './components/EmployCompanyModal.vue'
+  import {columns, searchFormSchema} from './employCompany.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employCompany.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/employCompany/vue3/components/EmployCompanyModal.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 '../employCompany.data';
+    import {saveOrUpdate} from '../employCompany.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/employConfig/controller/EmployConfigController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/entity/EmployConfig.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 参数配置表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2024-12-20
  * @Version: V1.0
  */
 @Data
@@ -51,10 +51,18 @@ public class EmployConfig implements Serializable {
 	@Excel(name = "参数编码", width = 15)
     @ApiModelProperty(value = "参数编码")
     private java.lang.String paramCode;
-	/**参数值*/
-	@Excel(name = "参数值", width = 15)
-    @ApiModelProperty(value = "参数值")
+	/**参数值_普通文本*/
+	@Excel(name = "参数值_普通文本", width = 15)
+    @ApiModelProperty(value = "参数值_普通文本")
     private java.lang.String paramValue;
+	/**参数值_普通图片*/
+	@Excel(name = "参数值_普通图片", width = 15)
+    @ApiModelProperty(value = "参数值_普通图片")
+    private java.lang.String paramValueImage;
+	/**参数值_富文本*/
+	@Excel(name = "参数值_富文本", width = 15)
+    @ApiModelProperty(value = "参数值_富文本")
+    private java.lang.String paramValueText;
 	/**参数描述*/
 	@Excel(name = "参数描述", width = 15)
     @ApiModelProperty(value = "参数描述")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/EmployConfigMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 参数配置表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2024-12-20
  * @Version: V1.0
  */
 public interface EmployConfigMapper extends BaseMapper<EmployConfig> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/IEmployConfigService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 参数配置表
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2024-12-20
  * @Version: V1.0
  */
 public interface IEmployConfigService extends IService<EmployConfig> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/impl/EmployConfigServiceImpl.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/EmployConfigList.vue

@@ -127,10 +127,22 @@
             dataIndex: 'paramCode'
           },
           {
-            title:'参数值',
+            title:'参数值_普通文本',
             align:"center",
             dataIndex: 'paramValue'
           },
+          {
+            title:'参数值_普通图片',
+            align:"center",
+            dataIndex: 'paramValueImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'参数值_富文本',
+            align:"center",
+            dataIndex: 'paramValueText',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
           {
             title:'参数描述',
             align:"center",
@@ -171,7 +183,9 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'paramCode',text:'参数编码',dictCode:''})
-        fieldList.push({type:'Text',value:'paramValue',text:'参数值',dictCode:''})
+        fieldList.push({type:'Text',value:'paramValue',text:'参数值_普通文本',dictCode:''})
+        fieldList.push({type:'string',value:'paramValueImage',text:'参数值_普通图片',dictCode:''})
+        fieldList.push({type:'Text',value:'paramValueText',text:'参数值_富文本',dictCode:''})
         fieldList.push({type:'Text',value:'paramDescription',text:'参数描述',dictCode:''})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigForm.vue

@@ -9,8 +9,18 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="参数值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramValue">
-              <a-input v-model="model.paramValue" placeholder="请输入参数值"  ></a-input>
+            <a-form-model-item label="参数值_普通文本" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramValue">
+              <a-input v-model="model.paramValue" placeholder="请输入参数值_普通文本"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="参数值_普通图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramValueImage">
+              <j-image-upload isMultiple  v-model="model.paramValueImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="参数值_富文本" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramValueText">
+              <j-editor v-model="model.paramValueText" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.data.ts

@@ -10,10 +10,22 @@ export const columns: BasicColumn[] = [
     dataIndex: 'paramCode'
    },
    {
-    title: '参数值',
+    title: '参数值_普通文本',
     align:"center",
     dataIndex: 'paramValue'
    },
+   {
+    title: '参数值_普通图片',
+    align:"center",
+    dataIndex: 'paramValueImage',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '参数值_富文本',
+    align:"center",
+    dataIndex: 'paramValueText',
+    slots: { customRender: 'htmlSlot' },
+   },
    {
     title: '参数描述',
     align:"center",
@@ -31,10 +43,22 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '参数值',
+    label: '参数值_普通文本',
     field: 'paramValue',
     component: 'Input',
   },
+  {
+    label: '参数值_普通图片',
+    field: 'paramValueImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '参数值_富文本',
+    field: 'paramValueText',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
   {
     label: '参数描述',
     field: 'paramDescription',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="电子合同表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -51,13 +51,15 @@ public class EmployContract implements Serializable {
 	@Excel(name = "合同文件", width = 15)
     @ApiModelProperty(value = "合同文件")
     private java.lang.String fileContract;
-	/**公司签署(0-未签 1-已签)*/
-	@Excel(name = "公司签署(0-未签 1-已签)", width = 15)
-    @ApiModelProperty(value = "公司签署(0-未签 1-已签)")
+	/**公司签署*/
+	@Excel(name = "公司签署", width = 15, dicCode = "contract_status")
+	@Dict(dicCode = "contract_status")
+    @ApiModelProperty(value = "公司签署")
     private java.lang.String signCompany;
-	/**求职者签署(0-未签 1-已签)*/
-	@Excel(name = "求职者签署(0-未签 1-已签)", width = 15)
-    @ApiModelProperty(value = "求职者签署(0-未签 1-已签)")
+	/**求职者签署*/
+	@Excel(name = "求职者签署", width = 15, dicCode = "contract_status")
+	@Dict(dicCode = "contract_status")
+    @ApiModelProperty(value = "求职者签署")
     private java.lang.String signPerson;
 	/**合同标题*/
 	@Excel(name = "合同标题", width = 15)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployContractMapper extends BaseMapper<EmployContract> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployContractService extends IService<EmployContract> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 电子合同表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue

@@ -4,6 +4,43 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="公司签署">
+              <j-dict-select-tag placeholder="请选择公司签署" v-model="queryParam.signCompany" dictCode="contract_status"/>
+            </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.signPerson" dictCode="contract_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.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.nameA"></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.nameB"></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>
@@ -129,14 +166,14 @@
             scopedSlots: {customRender: 'fileSlot'}
           },
           {
-            title:'公司签署(0-未签 1-已签)',
+            title:'公司签署',
             align:"center",
-            dataIndex: 'signCompany'
+            dataIndex: 'signCompany_dictText'
           },
           {
-            title:'求职者签署(0-未签 1-已签)',
+            title:'求职者签署',
             align:"center",
-            dataIndex: 'signPerson'
+            dataIndex: 'signPerson_dictText'
           },
           {
             title:'合同标题',
@@ -198,8 +235,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'fileContract',text:'合同文件',dictCode:''})
-        fieldList.push({type:'string',value:'signCompany',text:'公司签署(0-未签 1-已签)',dictCode:''})
-        fieldList.push({type:'string',value:'signPerson',text:'求职者签署(0-未签 1-已签)',dictCode:''})
+        fieldList.push({type:'string',value:'signCompany',text:'公司签署',dictCode:'contract_status'})
+        fieldList.push({type:'string',value:'signPerson',text:'求职者签署',dictCode:'contract_status'})
         fieldList.push({type:'string',value:'title',text:'合同标题',dictCode:''})
         fieldList.push({type:'string',value:'nameA',text:'合同甲方名称',dictCode:''})
         fieldList.push({type:'string',value:'nameB',text:'合同乙方名称',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue

@@ -9,13 +9,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="公司签署(0-未签 1-已签)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="signCompany">
-              <a-input v-model="model.signCompany" placeholder="请输入公司签署(0-未签 1-已签)"  ></a-input>
+            <a-form-model-item label="公司签署" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="signCompany">
+              <j-dict-select-tag type="list" v-model="model.signCompany" dictCode="contract_status" placeholder="请选择公司签署" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="求职者签署(0-未签 1-已签)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="signPerson">
-              <a-input v-model="model.signPerson" placeholder="请输入求职者签署(0-未签 1-已签)"  ></a-input>
+            <a-form-model-item label="求职者签署" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="signPerson">
+              <j-dict-select-tag type="list" v-model="model.signPerson" dictCode="contract_status" placeholder="请选择求职者签署" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts

@@ -11,14 +11,14 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'fileSlot' },
    },
    {
-    title: '公司签署(0-未签 1-已签)',
+    title: '公司签署',
     align:"center",
-    dataIndex: 'signCompany'
+    dataIndex: 'signCompany_dictText'
    },
    {
-    title: '求职者签署(0-未签 1-已签)',
+    title: '求职者签署',
     align:"center",
-    dataIndex: 'signPerson'
+    dataIndex: 'signPerson_dictText'
    },
    {
     title: '合同标题',
@@ -48,6 +48,42 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "公司签署",
+      field: "signCompany",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"contract_status"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "求职者签署",
+      field: "signPerson",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"contract_status"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "合同标题",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "合同甲方名称",
+      field: "nameA",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "合同乙方名称",
+      field: "nameB",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -59,14 +95,20 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '公司签署(0-未签 1-已签)',
+    label: '公司签署',
     field: 'signCompany',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"contract_status"
+     },
   },
   {
-    label: '求职者签署(0-未签 1-已签)',
+    label: '求职者签署',
     field: 'signPerson',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"contract_status"
+     },
   },
   {
     label: '合同标题',

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

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employExchange.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.employExchange.entity.EmployExchange;
+import org.jeecg.modules.employExchange.service.IEmployExchangeService;
+
+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-20
+ * @Version: V1.0
+ */
+@Api(tags="兑换码信息表")
+@RestController
+@RequestMapping("/employExchange/employExchange")
+@Slf4j
+public class EmployExchangeController extends JeecgController<EmployExchange, IEmployExchangeService> {
+	@Autowired
+	private IEmployExchangeService employExchangeService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employExchange
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "兑换码信息表-分页列表查询")
+	@ApiOperation(value="兑换码信息表-分页列表查询", notes="兑换码信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployExchange>> queryPageList(EmployExchange employExchange,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployExchange> queryWrapper = QueryGenerator.initQueryWrapper(employExchange, req.getParameterMap());
+		Page<EmployExchange> page = new Page<EmployExchange>(pageNo, pageSize);
+		IPage<EmployExchange> pageList = employExchangeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employExchange
+	 * @return
+	 */
+	@AutoLog(value = "兑换码信息表-添加")
+	@ApiOperation(value="兑换码信息表-添加", notes="兑换码信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployExchange employExchange) {
+		employExchangeService.save(employExchange);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employExchange
+	 * @return
+	 */
+	@AutoLog(value = "兑换码信息表-编辑")
+	@ApiOperation(value="兑换码信息表-编辑", notes="兑换码信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployExchange employExchange) {
+		employExchangeService.updateById(employExchange);
+		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) {
+		employExchangeService.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.employExchangeService.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<EmployExchange> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployExchange employExchange = employExchangeService.getById(id);
+		if(employExchange==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employExchange);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employExchange
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployExchange employExchange) {
+        return super.exportXls(request, employExchange, EmployExchange.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, EmployExchange.class);
+    }
+
+}

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

@@ -0,0 +1,67 @@
+package org.jeecg.modules.employExchange.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-20
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_exchange")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_exchange对象", description="兑换码信息表")
+public class EmployExchange 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.util.Date overdueTime;
+	/**兑换码*/
+	@Excel(name = "兑换码", width = 15)
+    @ApiModelProperty(value = "兑换码")
+    private java.lang.String code;
+	/**使用状态*/
+	@Excel(name = "使用状态", width = 15, dicCode = "exchangeCode_status")
+	@Dict(dicCode = "exchangeCode_status")
+    @ApiModelProperty(value = "使用状态")
+    private java.lang.String status;
+	/**兑换积分数量*/
+	@Excel(name = "兑换积分数量", width = 15)
+    @ApiModelProperty(value = "兑换积分数量")
+    private java.lang.Double score;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employExchange.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employExchange.entity.EmployExchange;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 兑换码信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+public interface EmployExchangeMapper extends BaseMapper<EmployExchange> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/mapper/xml/EmployExchangeMapper.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.employExchange.mapper.EmployExchangeMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employExchange.service;
+
+import org.jeecg.modules.employExchange.entity.EmployExchange;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 兑换码信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employExchange.service.impl;
+
+import org.jeecg.modules.employExchange.entity.EmployExchange;
+import org.jeecg.modules.employExchange.mapper.EmployExchangeMapper;
+import org.jeecg.modules.employExchange.service.IEmployExchangeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 兑换码信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+@Service
+public class EmployExchangeServiceImpl extends ServiceImpl<EmployExchangeMapper, EmployExchange> implements IEmployExchangeService {
+
+}

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

@@ -0,0 +1,190 @@
+<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-modal ref="modalForm" @ok="modalFormOk"></employ-exchange-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployExchangeModal from './modules/EmployExchangeModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'EmployExchangeList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployExchangeModal
+    },
+    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: 'overdueTime'
+          },
+          {
+            title:'兑换码',
+            align:"center",
+            dataIndex: 'code'
+          },
+          {
+            title:'使用状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'兑换积分数量',
+            align:"center",
+            dataIndex: 'score'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employExchange/employExchange/list",
+          delete: "/employExchange/employExchange/delete",
+          deleteBatch: "/employExchange/employExchange/deleteBatch",
+          exportXlsUrl: "/employExchange/employExchange/exportXls",
+          importExcelUrl: "employExchange/employExchange/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        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:''})
+        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/employExchange/vue/modules/EmployExchangeForm.vue

@@ -0,0 +1,119 @@
+<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="overdueTime">
+              <j-date placeholder="请选择过期时间"  v-model="model.overdueTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="兑换码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+              <a-input v-model="model.code" placeholder="请输入兑换码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="使用状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="exchangeCode_status" placeholder="请选择使用状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="兑换积分数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="score">
+              <a-input-number v-model="model.score" 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: 'EmployExchangeForm',
+    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: "/employExchange/employExchange/add",
+          edit: "/employExchange/employExchange/edit",
+          queryById: "/employExchange/employExchange/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/employExchange/vue/modules/EmployExchangeModal.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-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-exchange-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 EmployExchangeForm from './EmployExchangeForm'
+
+  export default {
+    name: 'EmployExchangeModal',
+    components: {
+      EmployExchangeForm
+    },
+    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/employExchange/vue/modules/EmployExchangeModal.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-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-exchange-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployExchangeForm from './EmployExchangeForm'
+  export default {
+    name: 'EmployExchangeModal',
+    components: {
+      EmployExchangeForm
+    },
+    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/employExchange/vue3/EmployExchange.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employExchange/employExchange/list',
+  save='/employExchange/employExchange/add',
+  edit='/employExchange/employExchange/edit',
+  deleteOne = '/employExchange/employExchange/delete',
+  deleteBatch = '/employExchange/employExchange/deleteBatch',
+  importExcel = '/employExchange/employExchange/importExcel',
+  exportXls = '/employExchange/employExchange/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/employExchange/vue3/EmployExchange.data.ts

@@ -0,0 +1,56 @@
+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: 'overdueTime'
+   },
+   {
+    title: '兑换码',
+    align:"center",
+    dataIndex: 'code'
+   },
+   {
+    title: '使用状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
+   {
+    title: '兑换积分数量',
+    align:"center",
+    dataIndex: 'score'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '过期时间',
+    field: 'overdueTime',
+    component: 'Input',
+  },
+  {
+    label: '兑换码',
+    field: 'code',
+    component: 'Input',
+  },
+  {
+    label: '使用状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"exchangeCode_status"
+     },
+  },
+  {
+    label: '兑换积分数量',
+    field: 'score',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchange/vue3/EmployExchangeList.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>
+    <!-- 表单区域 -->
+    <EmployExchangeModal @register="registerModal" @success="handleSuccess"></EmployExchangeModal>
+  </div>
+</template>
+
+<script lang="ts" name="employExchange-employExchange" 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 EmployExchangeModal from './components/EmployExchangeModal.vue'
+  import {columns, searchFormSchema} from './employExchange.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employExchange.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/employExchange/vue3/components/EmployExchangeModal.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 '../employExchange.data';
+    import {saveOrUpdate} from '../employExchange.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/employExchangeRecord/controller/EmployExchangeRecordController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employExchangeRecord.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.employExchangeRecord.entity.EmployExchangeRecord;
+import org.jeecg.modules.employExchangeRecord.service.IEmployExchangeRecordService;
+
+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-20
+ * @Version: V1.0
+ */
+@Api(tags="兑换码使用记录表")
+@RestController
+@RequestMapping("/employExchangeRecord/employExchangeRecord")
+@Slf4j
+public class EmployExchangeRecordController extends JeecgController<EmployExchangeRecord, IEmployExchangeRecordService> {
+	@Autowired
+	private IEmployExchangeRecordService employExchangeRecordService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employExchangeRecord
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "兑换码使用记录表-分页列表查询")
+	@ApiOperation(value="兑换码使用记录表-分页列表查询", notes="兑换码使用记录表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployExchangeRecord>> queryPageList(EmployExchangeRecord employExchangeRecord,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployExchangeRecord> queryWrapper = QueryGenerator.initQueryWrapper(employExchangeRecord, req.getParameterMap());
+		Page<EmployExchangeRecord> page = new Page<EmployExchangeRecord>(pageNo, pageSize);
+		IPage<EmployExchangeRecord> pageList = employExchangeRecordService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employExchangeRecord
+	 * @return
+	 */
+	@AutoLog(value = "兑换码使用记录表-添加")
+	@ApiOperation(value="兑换码使用记录表-添加", notes="兑换码使用记录表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployExchangeRecord employExchangeRecord) {
+		employExchangeRecordService.save(employExchangeRecord);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employExchangeRecord
+	 * @return
+	 */
+	@AutoLog(value = "兑换码使用记录表-编辑")
+	@ApiOperation(value="兑换码使用记录表-编辑", notes="兑换码使用记录表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployExchangeRecord employExchangeRecord) {
+		employExchangeRecordService.updateById(employExchangeRecord);
+		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) {
+		employExchangeRecordService.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.employExchangeRecordService.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<EmployExchangeRecord> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployExchangeRecord employExchangeRecord = employExchangeRecordService.getById(id);
+		if(employExchangeRecord==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employExchangeRecord);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employExchangeRecord
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployExchangeRecord employExchangeRecord) {
+        return super.exportXls(request, employExchangeRecord, EmployExchangeRecord.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, EmployExchangeRecord.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/entity/EmployExchangeRecord.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.employExchangeRecord.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-20
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_exchange_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_exchange_record对象", description="兑换码使用记录表")
+public class EmployExchangeRecord 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;
+	/**关联兑换码id*/
+	@Excel(name = "关联兑换码id", width = 15, dictTable = "employ_exchange", dicText = "code", dicCode = "id")
+	@Dict(dictTable = "employ_exchange", dicText = "code", dicCode = "id")
+    @ApiModelProperty(value = "关联兑换码id")
+    private java.lang.String codeId;
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/mapper/EmployExchangeRecordMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employExchangeRecord.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employExchangeRecord.entity.EmployExchangeRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 兑换码使用记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+public interface EmployExchangeRecordMapper extends BaseMapper<EmployExchangeRecord> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/mapper/xml/EmployExchangeRecordMapper.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.employExchangeRecord.mapper.EmployExchangeRecordMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/service/IEmployExchangeRecordService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employExchangeRecord.service;
+
+import org.jeecg.modules.employExchangeRecord.entity.EmployExchangeRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 兑换码使用记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+public interface IEmployExchangeRecordService extends IService<EmployExchangeRecord> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/service/impl/EmployExchangeRecordServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employExchangeRecord.service.impl;
+
+import org.jeecg.modules.employExchangeRecord.entity.EmployExchangeRecord;
+import org.jeecg.modules.employExchangeRecord.mapper.EmployExchangeRecordMapper;
+import org.jeecg.modules.employExchangeRecord.service.IEmployExchangeRecordService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 兑换码使用记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-20
+ * @Version: V1.0
+ */
+@Service
+public class EmployExchangeRecordServiceImpl extends ServiceImpl<EmployExchangeRecordMapper, EmployExchangeRecord> implements IEmployExchangeRecordService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/vue/EmployExchangeRecordList.vue

@@ -0,0 +1,178 @@
+<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-record-modal ref="modalForm" @ok="modalFormOk"></employ-exchange-record-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployExchangeRecordModal from './modules/EmployExchangeRecordModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'EmployExchangeRecordList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployExchangeRecordModal
+    },
+    data () {
+      return {
+        description: '兑换码使用记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'关联兑换码id',
+            align:"center",
+            dataIndex: 'codeId_dictText'
+          },
+          {
+            title:'关联用户id',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employExchangeRecord/employExchangeRecord/list",
+          delete: "/employExchangeRecord/employExchangeRecord/delete",
+          deleteBatch: "/employExchangeRecord/employExchangeRecord/deleteBatch",
+          exportXlsUrl: "/employExchangeRecord/employExchangeRecord/exportXls",
+          importExcelUrl: "employExchangeRecord/employExchangeRecord/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'codeId',text:'关联兑换码id',dictCode:"employ_exchange,code,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        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/employExchangeRecord/vue/modules/EmployExchangeRecordForm.vue

@@ -0,0 +1,109 @@
+<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="关联兑换码id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="codeId">
+              <j-dict-select-tag type="list" v-model="model.codeId" dictCode="employ_exchange,code,id" placeholder="请选择关联兑换码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" />
+            </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: 'EmployExchangeRecordForm',
+    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: "/employExchangeRecord/employExchangeRecord/add",
+          edit: "/employExchangeRecord/employExchangeRecord/edit",
+          queryById: "/employExchangeRecord/employExchangeRecord/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/employExchangeRecord/vue/modules/EmployExchangeRecordModal.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-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-exchange-record-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 EmployExchangeRecordForm from './EmployExchangeRecordForm'
+
+  export default {
+    name: 'EmployExchangeRecordModal',
+    components: {
+      EmployExchangeRecordForm
+    },
+    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/employExchangeRecord/vue/modules/EmployExchangeRecordModal.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-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-exchange-record-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployExchangeRecordForm from './EmployExchangeRecordForm'
+  export default {
+    name: 'EmployExchangeRecordModal',
+    components: {
+      EmployExchangeRecordForm
+    },
+    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/employExchangeRecord/vue3/EmployExchangeRecord.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employExchangeRecord/employExchangeRecord/list',
+  save='/employExchangeRecord/employExchangeRecord/add',
+  edit='/employExchangeRecord/employExchangeRecord/edit',
+  deleteOne = '/employExchangeRecord/employExchangeRecord/delete',
+  deleteBatch = '/employExchangeRecord/employExchangeRecord/deleteBatch',
+  importExcel = '/employExchangeRecord/employExchangeRecord/importExcel',
+  exportXls = '/employExchangeRecord/employExchangeRecord/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/employExchangeRecord/vue3/EmployExchangeRecord.data.ts

@@ -0,0 +1,39 @@
+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: '关联兑换码id',
+    align:"center",
+    dataIndex: 'codeId_dictText'
+   },
+   {
+    title: '关联用户id',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '关联兑换码id',
+    field: 'codeId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_exchange,code,id"
+     },
+  },
+  {
+    label: '关联用户id',
+    field: 'userId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employExchangeRecord/vue3/EmployExchangeRecordList.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>
+    <!-- 表单区域 -->
+    <EmployExchangeRecordModal @register="registerModal" @success="handleSuccess"></EmployExchangeRecordModal>
+  </div>
+</template>
+
+<script lang="ts" name="employExchangeRecord-employExchangeRecord" 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 EmployExchangeRecordModal from './components/EmployExchangeRecordModal.vue'
+  import {columns, searchFormSchema} from './employExchangeRecord.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employExchangeRecord.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/employExchangeRecord/vue3/components/EmployExchangeRecordModal.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 '../employExchangeRecord.data';
+    import {saveOrUpdate} from '../employExchangeRecord.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/employNotebook/controller/EmployNotebookController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/entity/EmployNotebook.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 账本表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -51,13 +51,15 @@ public class EmployNotebook implements Serializable {
 	@Excel(name = "账本标题", width = 15)
     @ApiModelProperty(value = "账本标题")
     private java.lang.String title;
-	/**账本类型(0-个人 1-班组)*/
-	@Excel(name = "账本类型(0-个人 1-班组)", width = 15)
-    @ApiModelProperty(value = "账本类型(0-个人 1-班组)")
+	/**账本类型*/
+	@Excel(name = "账本类型", width = 15, dicCode = "employ_notebook")
+	@Dict(dicCode = "employ_notebook")
+    @ApiModelProperty(value = "账本类型")
     private java.lang.String type;
-	/**账本状态(0-在建 1-已结束)*/
-	@Excel(name = "账本状态(0-在建 1-已结束)", width = 15)
-    @ApiModelProperty(value = "账本状态(0-在建 1-已结束)")
+	/**账本状态*/
+	@Excel(name = "账本状态", width = 15, dicCode = "notebook_status")
+	@Dict(dicCode = "notebook_status")
+    @ApiModelProperty(value = "账本状态")
     private java.lang.String status;
 	/**关联用户id*/
 	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/mapper/EmployNotebookMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 账本表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployNotebookMapper extends BaseMapper<EmployNotebook> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/IEmployNotebookService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 账本表
  * @Author: jeecg-boot
- * @Date:   2024-10-17
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployNotebookService extends IService<EmployNotebook> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/impl/EmployNotebookServiceImpl.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/EmployNotebookList.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.title"></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.type" dictCode="employ_notebook"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="账本状态">
+                <j-dict-select-tag placeholder="请选择账本状态" v-model="queryParam.status" dictCode="notebook_status"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -128,14 +155,14 @@
             dataIndex: 'title'
           },
           {
-            title:'账本类型(0-个人 1-班组)',
+            title:'账本类型',
             align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type_dictText'
           },
           {
-            title:'账本状态(0-在建 1-已结束)',
+            title:'账本状态',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'status_dictText'
           },
           {
             title:'关联用户id',
@@ -177,8 +204,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'账本标题',dictCode:''})
-        fieldList.push({type:'string',value:'type',text:'账本类型(0-个人 1-班组)',dictCode:''})
-        fieldList.push({type:'string',value:'status',text:'账本状态(0-在建 1-已结束)',dictCode:''})
+        fieldList.push({type:'string',value:'type',text:'账本类型',dictCode:'employ_notebook'})
+        fieldList.push({type:'string',value:'status',text:'账本状态',dictCode:'notebook_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/modules/EmployNotebookForm.vue

@@ -9,13 +9,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="账本类型(0-个人 1-班组)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input v-model="model.type" placeholder="请输入账本类型(0-个人 1-班组)"  ></a-input>
+            <a-form-model-item label="账本类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="employ_notebook" placeholder="请选择账本类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="账本状态(0-在建 1-已结束)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input v-model="model.status" placeholder="请输入账本状态(0-在建 1-已结束)"  ></a-input>
+            <a-form-model-item label="账本状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="notebook_status" placeholder="请选择账本状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue3/EmployNotebook.data.ts

@@ -10,14 +10,14 @@ export const columns: BasicColumn[] = [
     dataIndex: 'title'
    },
    {
-    title: '账本类型(0-个人 1-班组)',
+    title: '账本类型',
     align:"center",
-    dataIndex: 'type'
+    dataIndex: 'type_dictText'
    },
    {
-    title: '账本状态(0-在建 1-已结束)',
+    title: '账本状态',
     align:"center",
-    dataIndex: 'status'
+    dataIndex: 'status_dictText'
    },
    {
     title: '关联用户id',
@@ -27,6 +27,30 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "账本标题",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "账本类型",
+      field: "type",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_notebook"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "账本状态",
+      field: "status",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"notebook_status"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -36,14 +60,20 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '账本类型(0-个人 1-班组)',
+    label: '账本类型',
     field: 'type',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_notebook"
+     },
   },
   {
-    label: '账本状态(0-在建 1-已结束)',
+    label: '账本状态',
     field: 'status',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"notebook_status"
+     },
   },
   {
     label: '关联用户id',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 积分记录表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="积分记录表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 积分记录表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -55,9 +55,10 @@ public class EmployScoreRecord implements Serializable {
 	@Excel(name = "积分", width = 15)
     @ApiModelProperty(value = "积分")
     private java.lang.Double score;
-	/**积分类型(0-收入 1-消耗)*/
-	@Excel(name = "积分类型(0-收入 1-消耗)", width = 15)
-    @ApiModelProperty(value = "积分类型(0-收入 1-消耗)")
+	/**积分类型*/
+	@Excel(name = "积分类型", width = 15, dicCode = "employ_bill")
+	@Dict(dicCode = "employ_bill")
+    @ApiModelProperty(value = "积分类型")
     private java.lang.String type;
 	/**关联用户id*/
 	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 积分记录表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface EmployScoreRecordMapper extends BaseMapper<EmployScoreRecord> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 积分记录表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 public interface IEmployScoreRecordService extends IService<EmployScoreRecord> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 积分记录表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.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="积分类型">
+              <j-dict-select-tag placeholder="请选择积分类型" v-model="queryParam.type" dictCode="employ_bill"/>
+            </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>
@@ -133,9 +148,9 @@
             dataIndex: 'score'
           },
           {
-            title:'积分类型(0-收入 1-消耗)',
+            title:'积分类型',
             align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type_dictText'
           },
           {
             title:'关联用户id',
@@ -178,7 +193,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'积分标题',dictCode:''})
         fieldList.push({type:'double',value:'score',text:'积分',dictCode:''})
-        fieldList.push({type:'string',value:'type',text:'积分类型(0-收入 1-消耗)',dictCode:''})
+        fieldList.push({type:'string',value:'type',text:'积分类型',dictCode:'employ_bill'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue

@@ -14,8 +14,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="积分类型(0-收入 1-消耗)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input v-model="model.type" placeholder="请输入积分类型(0-收入 1-消耗)"  ></a-input>
+            <a-form-model-item label="积分类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="employ_bill" placeholder="请选择积分类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts

@@ -15,9 +15,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'score'
    },
    {
-    title: '积分类型(0-收入 1-消耗)',
+    title: '积分类型',
     align:"center",
-    dataIndex: 'type'
+    dataIndex: 'type_dictText'
    },
    {
     title: '关联用户id',
@@ -27,6 +27,15 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "积分类型",
+      field: "type",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_bill"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -41,9 +50,12 @@ export const formSchema: FormSchema[] = [
     component: 'InputNumber',
   },
   {
-    label: '积分类型(0-收入 1-消耗)',
+    label: '积分类型',
     field: 'type',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_bill"
+     },
   },
   {
     label: '关联用户id',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 会员类型表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Api(tags="会员类型表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 会员类型表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-12-21
  * @Version: V1.0
  */
 @Data
@@ -55,16 +55,18 @@ public class EmployVipType implements Serializable {
 	@Excel(name = "会员开通金额", width = 15)
     @ApiModelProperty(value = "会员开通金额")
     private java.math.BigDecimal price;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private java.lang.String remark;
+	/**充值类型*/
+	@Excel(name = "充值类型", width = 15, dicCode = "employ_recharge")
+	@Dict(dicCode = "employ_recharge")
+    @ApiModelProperty(value = "充值类型")
+    private java.lang.String recharge;
 	/**专属特权*/
 	@Excel(name = "专属特权", width = 15)
     @ApiModelProperty(value = "专属特权")
     private java.lang.String perquisite;
-	/**会员类型(0-个人 1-企业)*/
-	@Excel(name = "会员类型(0-个人 1-企业)", width = 15)
-    @ApiModelProperty(value = "会员类型(0-个人 1-企业)")
+	/**会员类型*/
+	@Excel(name = "会员类型", width = 15, dicCode = "employ_vip_type")
+	@Dict(dicCode = "employ_vip_type")
+    @ApiModelProperty(value = "会员类型")
     private java.lang.String type;
 }