初版代码

console_1.sql

@@ -0,0 +1,104 @@
+create table tb_product
+(
+    id               varchar(36)  not null
+        primary key,
+    user_id          varchar(32)  null comment '用户id',
+    buy_user_id          varchar(32)  null comment '采购用户id',
+    company_name     varchar(64)  null comment '供应商名称',
+    user_name        varchar(32)  null comment '客户姓名',
+    phone            varchar(32)  null comment '客户电话',
+    address          varchar(128) null comment '提货地址',
+    address_id         varchar(32) null comment '地址id',
+    pic        text         null comment '报价照片',
+    price          decimal(10, 2) default 0.00              not null comment '单价',
+    num       bigint(32)     default 0                 null comment '暂定数量、',
+    audit_status     int          null comment '审核状态 0审核中 1 审核通过 2审核未通过',
+    show_status     int          null comment '挂单状态 0挂单 1 已撤单',
+    product_type          int          null comment '期货现货 0期货 1 现货',
+    transaction_time      datetime     null comment '交货时间',
+    create_by        varchar(50)  null comment '创建人',
+    create_time      datetime     null comment '创建日期',
+    update_by        varchar(50)  null comment '更新人',
+    update_time      datetime     null comment '更新日期',
+    sys_org_code     varchar(64)  null comment '所属部门',
+    del_flag              tinyint(1)     default 0                 not null comment '删除标识0-正常,1-已删除'
+);
+
+
+create table tb_user_role
+(
+    id               varchar(36)  not null
+        primary key,
+    user_id          varchar(32)  null comment '用户id',
+    role             int          null comment '角色信息 1供应商 2采购商',
+    user_name        varchar(32)  null comment '用户名',
+    company_name     varchar(64)  null comment '公司名称',
+    tax_code         varchar(32)  null comment '税收编码',
+    address          varchar(128) null comment '公司地址',
+    bank_account     varchar(32)  null comment '公司账号',
+    phone            varchar(32)  null comment '电话',
+    bank_nama        varchar(32)  null comment '开户行',
+    business_license text         null comment '营业执照上传',
+    basic_account    text         null comment '基本户信息照片上传',
+    bank_info        text         null comment '收款银行照片上传',
+    audit_status     int          null comment '审核状态 0审核中 1 审核通过 2审核未通过',
+    create_by        varchar(50)  null comment '创建人',
+    create_time      datetime     null comment '创建日期',
+    update_by        varchar(50)  null comment '更新人',
+    update_time      datetime     null comment '更新日期',
+    sys_org_code     varchar(64)  null comment '所属部门'
+);
+
+create index idx_phone
+    on tb_user_role (phone, user_name);
+
+create index idx_userid
+    on tb_user_role (user_id);
+
+
+
+create table tb_suggest
+(
+    id           varchar(36)  not null
+        primary key,
+    user_id      varchar(20)  null comment '用户id',
+    user_name    varchar(32)  null comment '用户名',
+    user_phone   varchar(64)  null comment '用户手机号',
+    content      longtext     null comment '问题描述',
+    proof_img    longtext     null comment '问题截图',
+    submit_time  date         null comment '提交时间',
+    is_reply     int          null comment '是否回复（0：未回复 1：已回复）',
+    reply_msg    varchar(512) null comment '回复结果',
+    reply_time   date         null comment '回复时间',
+    reply_id     varchar(19)  null comment '回复人',
+    create_by    varchar(50)  null comment '创建人',
+    create_time  date         null comment '创建日期',
+    update_by    varchar(50)  null comment '更新人',
+    update_time  date         null comment '更新日期',
+    sys_org_code varchar(64)  null comment '所属部门'
+);
+
+create table tb_customs
+(
+    id               varchar(36)  not null
+        primary key,
+    user_id          varchar(32)  null comment '用户id',
+    role             int          null comment '角色信息 1供应商 2采购商',
+    user_name        varchar(32)  null comment '用户名',
+    password         varchar(64)  null comment '密码',
+    company_name     varchar(64)  null comment '公司名称',
+    tax_code         varchar(32)  null comment '税收编码',
+    address          varchar(128) null comment '公司地址',
+    bank_account     varchar(32)  null comment '公司账号',
+    phone            varchar(32)  null comment '电话',
+    bank_nama        varchar(32)  null comment '开户行',
+    business_license longtext     null comment '营业执照上传',
+    basic_account    longtext     null comment '基本户信息照片上传',
+    bank_info        longtext     null comment '收款银行照片上传',
+    audit_status     int          null comment '审核状态 0审核中 1 审核通过 2审核未通过',
+    create_by        varchar(50)  null comment '创建人',
+    create_time      date         null comment '创建日期',
+    update_by        varchar(50)  null comment '更新人',
+    update_time      date         null comment '更新日期',
+    sys_org_code     varchar(64)  null comment '所属部门'
+);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/address/controller/TbAddressController.java

@@ -0,0 +1,156 @@
+package org.jeecg.modules.address.controller;
+
+import java.util.Arrays;
+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.modules.address.entity.TbAddress;
+import org.jeecg.modules.address.service.ITbAddressService;
+
+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.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 用户地址表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Api(tags="用户地址表")
+@RestController
+@RequestMapping("/address/tbAddress")
+@Slf4j
+public class TbAddressController extends JeecgController<TbAddress, ITbAddressService> {
+	@Autowired
+	private ITbAddressService tbAddressService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tbAddress
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "用户地址表-分页列表查询")
+	@ApiOperation(value="用户地址表-分页列表查询", notes="用户地址表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TbAddress>> queryPageList(TbAddress tbAddress,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TbAddress> queryWrapper = QueryGenerator.initQueryWrapper(tbAddress, req.getParameterMap());
+		Page<TbAddress> page = new Page<TbAddress>(pageNo, pageSize);
+		IPage<TbAddress> pageList = tbAddressService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tbAddress
+	 * @return
+	 */
+	@AutoLog(value = "用户地址表-添加")
+	@ApiOperation(value="用户地址表-添加", notes="用户地址表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TbAddress tbAddress) {
+		tbAddressService.save(tbAddress);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tbAddress
+	 * @return
+	 */
+	@AutoLog(value = "用户地址表-编辑")
+	@ApiOperation(value="用户地址表-编辑", notes="用户地址表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TbAddress tbAddress) {
+		tbAddressService.updateById(tbAddress);
+		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) {
+		tbAddressService.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.tbAddressService.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<TbAddress> queryById(@RequestParam(name="id",required=true) String id) {
+		TbAddress tbAddress = tbAddressService.getById(id);
+		if(tbAddress==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tbAddress);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tbAddress
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TbAddress tbAddress) {
+        return super.exportXls(request, tbAddress, TbAddress.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, TbAddress.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/address/entity/TbAddress.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.address.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-10-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_address")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_address对象", description="用户地址表")
+public class TbAddress implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**用户id*/
+	@Excel(name = "用户id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String userId;
+	/**收获详细地址*/
+	@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 city;
+	/**经度*/
+	@Excel(name = "经度", width = 15)
+    @ApiModelProperty(value = "经度")
+    private java.lang.String latitude;
+	/**纬度*/
+	@Excel(name = "纬度", width = 15)
+    @ApiModelProperty(value = "纬度")
+    private java.lang.String longitude;
+	/**是否默认地址 0非默认 1默认*/
+	@Excel(name = "是否默认地址 0非默认 1默认", width = 15)
+    @ApiModelProperty(value = "是否默认地址 0非默认 1默认")
+    private java.lang.Integer defaultFlag;
+	/**收货人*/
+	@Excel(name = "收货人", width = 15)
+    @ApiModelProperty(value = "收货人")
+    private java.lang.String name;
+	/**禁用0不禁用 1禁用*/
+	@Excel(name = "禁用0不禁用 1禁用", width = 15)
+    @ApiModelProperty(value = "禁用0不禁用 1禁用")
+    private java.lang.Integer isDisable;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**删除标识0-正常,1-已删除*/
+	@Excel(name = "删除标识0-正常,1-已删除", width = 15)
+    @ApiModelProperty(value = "删除标识0-正常,1-已删除")
+    private java.lang.Integer delFlag;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/address/mapper/TbAddressMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.address.mapper;
+
+import org.jeecg.modules.address.entity.TbAddress;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 用户地址表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+public interface TbAddressMapper extends BaseMapper<TbAddress> {
+
+}

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/address/service/ITbAddressService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.address.service;
+
+import org.jeecg.modules.address.entity.TbAddress;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 用户地址表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+public interface ITbAddressService extends IService<TbAddress> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/address/service/impl/TbAddressServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.address.service.impl;
+
+import org.jeecg.modules.address.entity.TbAddress;
+import org.jeecg.modules.address.mapper.TbAddressMapper;
+import org.jeecg.modules.address.service.ITbAddressService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 用户地址表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Service
+public class TbAddressServiceImpl extends ServiceImpl<TbAddressMapper, TbAddress> implements ITbAddressService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/address/vue/TbAddressList.vue

@@ -0,0 +1,225 @@
+<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>
+
+    <tb-address-modal ref="modalForm" @ok="modalFormOk"></tb-address-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbAddressModal from './modules/TbAddressModal'
+
+  export default {
+    name: 'TbAddressList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbAddressModal
+    },
+    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: 'userId'
+          },
+          {
+            title:'收获详细地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'收货手机号',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'城市',
+            align:"center",
+            dataIndex: 'city'
+          },
+          {
+            title:'经度',
+            align:"center",
+            dataIndex: 'latitude'
+          },
+          {
+            title:'纬度',
+            align:"center",
+            dataIndex: 'longitude'
+          },
+          {
+            title:'是否默认地址 0非默认 1默认',
+            align:"center",
+            dataIndex: 'defaultFlag'
+          },
+          {
+            title:'收货人',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'禁用0不禁用 1禁用',
+            align:"center",
+            dataIndex: 'isDisable'
+          },
+          {
+            title:'删除标识0-正常,1-已删除',
+            align:"center",
+            dataIndex: 'delFlag'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/address/tbAddress/list",
+          delete: "/address/tbAddress/delete",
+          deleteBatch: "/address/tbAddress/deleteBatch",
+          exportXlsUrl: "/address/tbAddress/exportXls",
+          importExcelUrl: "address/tbAddress/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:'userId',text:'用户id',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'收获详细地址',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'收货手机号',dictCode:''})
+        fieldList.push({type:'string',value:'city',text:'城市',dictCode:''})
+        fieldList.push({type:'string',value:'latitude',text:'经度',dictCode:''})
+        fieldList.push({type:'string',value:'longitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'int',value:'defaultFlag',text:'是否默认地址 0非默认 1默认',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'收货人',dictCode:''})
+        fieldList.push({type:'int',value:'isDisable',text:'禁用0不禁用 1禁用',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'删除标识0-正常,1-已删除',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/address/vue/modules/TbAddressForm.vue

@@ -0,0 +1,161 @@
+<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="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户id"  ></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="city">
+              <a-input v-model="model.city" placeholder="请输入城市"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
+              <a-input v-model="model.latitude" placeholder="请输入经度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
+              <a-input v-model="model.longitude" placeholder="请输入纬度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否默认地址 0非默认 1默认" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="defaultFlag">
+              <a-input-number v-model="model.defaultFlag" placeholder="请输入是否默认地址 0非默认 1默认" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收货人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入收货人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="禁用0不禁用 1禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isDisable">
+              <a-input-number v-model="model.isDisable" placeholder="请输入禁用0不禁用 1禁用" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="删除标识0-正常,1-已删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <a-input-number v-model="model.delFlag" placeholder="请输入删除标识0-正常,1-已删除" 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: 'TbAddressForm',
+    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: {
+           userId: [
+              { required: true, message: '请输入用户id!'},
+           ],
+           phone: [
+              { required: true, message: '请输入收货手机号!'},
+           ],
+           defaultFlag: [
+              { required: true, message: '请输入是否默认地址 0非默认 1默认!'},
+           ],
+           isDisable: [
+              { required: true, message: '请输入禁用0不禁用 1禁用!'},
+           ],
+        },
+        url: {
+          add: "/address/tbAddress/add",
+          edit: "/address/tbAddress/edit",
+          queryById: "/address/tbAddress/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/address/vue/modules/TbAddressModal.Style#Drawer.vue

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

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

@@ -0,0 +1,133 @@
+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: 'userId'
+   },
+   {
+    title: '收获详细地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '收货手机号',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '城市',
+    align:"center",
+    dataIndex: 'city'
+   },
+   {
+    title: '经度',
+    align:"center",
+    dataIndex: 'latitude'
+   },
+   {
+    title: '纬度',
+    align:"center",
+    dataIndex: 'longitude'
+   },
+   {
+    title: '是否默认地址 0非默认 1默认',
+    align:"center",
+    dataIndex: 'defaultFlag'
+   },
+   {
+    title: '收货人',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '禁用0不禁用 1禁用',
+    align:"center",
+    dataIndex: 'isDisable'
+   },
+   {
+    title: '删除标识0-正常,1-已删除',
+    align:"center",
+    dataIndex: 'delFlag'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户id',
+    field: 'userId',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入用户id!'},
+          ];
+     },
+  },
+  {
+    label: '收获详细地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '收货手机号',
+    field: 'phone',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入收货手机号!'},
+          ];
+     },
+  },
+  {
+    label: '城市',
+    field: 'city',
+    component: 'Input',
+  },
+  {
+    label: '经度',
+    field: 'latitude',
+    component: 'Input',
+  },
+  {
+    label: '纬度',
+    field: 'longitude',
+    component: 'Input',
+  },
+  {
+    label: '是否默认地址 0非默认 1默认',
+    field: 'defaultFlag',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入是否默认地址 0非默认 1默认!'},
+          ];
+     },
+  },
+  {
+    label: '收货人',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '禁用0不禁用 1禁用',
+    field: 'isDisable',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入禁用0不禁用 1禁用!'},
+          ];
+     },
+  },
+  {
+    label: '删除标识0-正常,1-已删除',
+    field: 'delFlag',
+    component: 'InputNumber',
+  },
+];

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

@@ -56,7 +56,7 @@ public class TbProductController extends JeecgController<TbProduct, ITbProductSe
 		IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java

@@ -0,0 +1,156 @@
+package org.jeecg.modules.tbCustoms.controller;
+
+import java.util.Arrays;
+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.modules.tbCustoms.entity.TbCustoms;
+import org.jeecg.modules.tbCustoms.service.ITbCustomsService;
+
+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.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 清关申请
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Api(tags="清关申请")
+@RestController
+@RequestMapping("/tbCustoms/tbCustoms")
+@Slf4j
+public class TbCustomsController extends JeecgController<TbCustoms, ITbCustomsService> {
+	@Autowired
+	private ITbCustomsService tbCustomsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tbCustoms
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "清关申请-分页列表查询")
+	@ApiOperation(value="清关申请-分页列表查询", notes="清关申请-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TbCustoms>> queryPageList(TbCustoms tbCustoms,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TbCustoms> queryWrapper = QueryGenerator.initQueryWrapper(tbCustoms, req.getParameterMap());
+		Page<TbCustoms> page = new Page<TbCustoms>(pageNo, pageSize);
+		IPage<TbCustoms> pageList = tbCustomsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tbCustoms
+	 * @return
+	 */
+	@AutoLog(value = "清关申请-添加")
+	@ApiOperation(value="清关申请-添加", notes="清关申请-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TbCustoms tbCustoms) {
+		tbCustomsService.save(tbCustoms);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tbCustoms
+	 * @return
+	 */
+	@AutoLog(value = "清关申请-编辑")
+	@ApiOperation(value="清关申请-编辑", notes="清关申请-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TbCustoms tbCustoms) {
+		tbCustomsService.updateById(tbCustoms);
+		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) {
+		tbCustomsService.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.tbCustomsService.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<TbCustoms> queryById(@RequestParam(name="id",required=true) String id) {
+		TbCustoms tbCustoms = tbCustomsService.getById(id);
+		if(tbCustoms==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tbCustoms);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tbCustoms
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TbCustoms tbCustoms) {
+        return super.exportXls(request, tbCustoms, TbCustoms.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, TbCustoms.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/entity/TbCustoms.java

@@ -0,0 +1,115 @@
+package org.jeecg.modules.tbCustoms.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-10-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_customs")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_customs对象", description="清关申请")
+public class TbCustoms implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**用户id*/
+	@Excel(name = "用户id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String userId;
+	/**角色信息 1供应商 2采购商*/
+	@Excel(name = "角色信息 1供应商 2采购商", width = 15, dicCode = "user_role")
+	@Dict(dicCode = "user_role")
+    @ApiModelProperty(value = "角色信息 1供应商 2采购商")
+    private java.lang.Integer role;
+	/**用户名*/
+	@Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private java.lang.String userName;
+	/**密码*/
+	@Excel(name = "密码", width = 15)
+    @ApiModelProperty(value = "密码")
+    private java.lang.String password;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+    private java.lang.String companyName;
+	/**税收编码*/
+	@Excel(name = "税收编码", width = 15)
+    @ApiModelProperty(value = "税收编码")
+    private java.lang.String taxCode;
+	/**公司地址*/
+	@Excel(name = "公司地址", width = 15)
+    @ApiModelProperty(value = "公司地址")
+    private java.lang.String address;
+	/**公司账号*/
+	@Excel(name = "公司账号", width = 15)
+    @ApiModelProperty(value = "公司账号")
+    private java.lang.String bankAccount;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+	/**开户行*/
+	@Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private java.lang.String bankNama;
+	/**营业执照上传*/
+	@Excel(name = "营业执照上传", width = 15)
+    @ApiModelProperty(value = "营业执照上传")
+    private java.lang.String businessLicense;
+	/**基本户信息照片上传*/
+	@Excel(name = "基本户信息照片上传", width = 15)
+    @ApiModelProperty(value = "基本户信息照片上传")
+    private java.lang.String basicAccount;
+	/**收款银行照片上传*/
+	@Excel(name = "收款银行照片上传", width = 15)
+    @ApiModelProperty(value = "收款银行照片上传")
+    private java.lang.String bankInfo;
+	/**审核状态 0审核中 1 审核通过 2审核未通过*/
+	@Excel(name = "审核状态 0审核中 1 审核通过 2审核未通过", width = 15, dicCode = "audit_status")
+	@Dict(dicCode = "audit_status")
+    @ApiModelProperty(value = "审核状态 0审核中 1 审核通过 2审核未通过")
+    private java.lang.Integer auditStatus;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/mapper/TbCustomsMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.tbCustoms.mapper;
+
+import org.jeecg.modules.tbCustoms.entity.TbCustoms;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 清关申请
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+public interface TbCustomsMapper extends BaseMapper<TbCustoms> {
+
+}

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/service/ITbCustomsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.tbCustoms.service;
+
+import org.jeecg.modules.tbCustoms.entity.TbCustoms;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 清关申请
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+public interface ITbCustomsService extends IService<TbCustoms> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/service/impl/TbCustomsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.tbCustoms.service.impl;
+
+import org.jeecg.modules.tbCustoms.entity.TbCustoms;
+import org.jeecg.modules.tbCustoms.mapper.TbCustomsMapper;
+import org.jeecg.modules.tbCustoms.service.ITbCustomsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 清关申请
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Service
+public class TbCustomsServiceImpl extends ServiceImpl<TbCustomsMapper, TbCustoms> implements ITbCustomsService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/vue/TbCustomsList.vue

@@ -0,0 +1,284 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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="角色信息 1供应商 2采购商">
+              <j-dict-select-tag placeholder="请选择角色信息 1供应商 2采购商" v-model="queryParam.role" dictCode="user_role"/>
+            </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.userName"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="公司名称">
+                <a-input placeholder="请输入公司名称" v-model="queryParam.companyName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="电话">
+                <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过">
+                <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_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>
+    <!-- 查询区域-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>
+
+    <tb-customs-modal ref="modalForm" @ok="modalFormOk"></tb-customs-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbCustomsModal from './modules/TbCustomsModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'TbCustomsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbCustomsModal
+    },
+    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: 'userId'
+          },
+          {
+            title:'角色信息 1供应商 2采购商',
+            align:"center",
+            dataIndex: 'role_dictText'
+          },
+          {
+            title:'用户名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'公司名称',
+            align:"center",
+            dataIndex: 'companyName'
+          },
+          {
+            title:'税收编码',
+            align:"center",
+            dataIndex: 'taxCode'
+          },
+          {
+            title:'公司地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'公司账号',
+            align:"center",
+            dataIndex: 'bankAccount'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankNama'
+          },
+          {
+            title:'营业执照上传',
+            align:"center",
+            dataIndex: 'businessLicense',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'基本户信息照片上传',
+            align:"center",
+            dataIndex: 'basicAccount',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'收款银行照片上传',
+            align:"center",
+            dataIndex: 'bankInfo',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'审核状态 0审核中 1 审核通过 2审核未通过',
+            align:"center",
+            dataIndex: 'auditStatus_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/tbCustoms/tbCustoms/list",
+          delete: "/tbCustoms/tbCustoms/delete",
+          deleteBatch: "/tbCustoms/tbCustoms/deleteBatch",
+          exportXlsUrl: "/tbCustoms/tbCustoms/exportXls",
+          importExcelUrl: "tbCustoms/tbCustoms/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:'userId',text:'用户id',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色信息 1供应商 2采购商',dictCode:'user_role'})
+        fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
+        fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
+        fieldList.push({type:'string',value:'taxCode',text:'税收编码',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''})
+        fieldList.push({type:'string',value:'bankAccount',text:'公司账号',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'bankNama',text:'开户行',dictCode:''})
+        fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
+        fieldList.push({type:'Text',value:'basicAccount',text:'基本户信息照片上传',dictCode:''})
+        fieldList.push({type:'Text',value:'bankInfo',text:'收款银行照片上传',dictCode:''})
+        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
+        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/tbCustoms/vue/modules/TbCustomsForm.vue

@@ -0,0 +1,164 @@
+<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="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="角色信息 1供应商 2采购商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色信息 1供应商 2采购商" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
+              <a-input v-model="model.companyName" placeholder="请输入公司名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="税收编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taxCode">
+              <a-input v-model="model.taxCode" 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="bankAccount">
+              <a-input v-model="model.bankAccount" 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="bankNama">
+              <a-input v-model="model.bankNama" placeholder="请输入开户行"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业执照上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="businessLicense">
+              <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="基本户信息照片上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="basicAccount">
+              <j-image-upload isMultiple  v-model="model.basicAccount" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收款银行照片上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankInfo">
+              <j-image-upload isMultiple  v-model="model.bankInfo" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态 0审核中 1 审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" />
+            </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: 'TbCustomsForm',
+    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: "/tbCustoms/tbCustoms/add",
+          edit: "/tbCustoms/tbCustoms/edit",
+          queryById: "/tbCustoms/tbCustoms/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/tbCustoms/vue/modules/TbCustomsModal.Style#Drawer.vue

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

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

@@ -0,0 +1,194 @@
+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: 'userId'
+   },
+   {
+    title: '角色信息 1供应商 2采购商',
+    align:"center",
+    dataIndex: 'role_dictText'
+   },
+   {
+    title: '用户名',
+    align:"center",
+    dataIndex: 'userName'
+   },
+   {
+    title: '公司名称',
+    align:"center",
+    dataIndex: 'companyName'
+   },
+   {
+    title: '税收编码',
+    align:"center",
+    dataIndex: 'taxCode'
+   },
+   {
+    title: '公司地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '公司账号',
+    align:"center",
+    dataIndex: 'bankAccount'
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '开户行',
+    align:"center",
+    dataIndex: 'bankNama'
+   },
+   {
+    title: '营业执照上传',
+    align:"center",
+    dataIndex: 'businessLicense',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '基本户信息照片上传',
+    align:"center",
+    dataIndex: 'basicAccount',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '收款银行照片上传',
+    align:"center",
+    dataIndex: 'bankInfo',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '审核状态 0审核中 1 审核通过 2审核未通过',
+    align:"center",
+    dataIndex: 'auditStatus_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "角色信息 1供应商 2采购商",
+      field: "role",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"user_role"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "用户名",
+      field: "userName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "公司名称",
+      field: "companyName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "电话",
+      field: "phone",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "审核状态 0审核中 1 审核通过 2审核未通过",
+      field: "auditStatus",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"audit_status"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户id',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '角色信息 1供应商 2采购商',
+    field: 'role',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"user_role"
+     },
+  },
+  {
+    label: '用户名',
+    field: 'userName',
+    component: 'Input',
+  },
+  {
+    label: '公司名称',
+    field: 'companyName',
+    component: 'Input',
+  },
+  {
+    label: '税收编码',
+    field: 'taxCode',
+    component: 'Input',
+  },
+  {
+    label: '公司地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '公司账号',
+    field: 'bankAccount',
+    component: 'Input',
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '开户行',
+    field: 'bankNama',
+    component: 'Input',
+  },
+  {
+    label: '营业执照上传',
+    field: 'businessLicense',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '基本户信息照片上传',
+    field: 'basicAccount',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '收款银行照片上传',
+    field: 'bankInfo',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '审核状态 0审核中 1 审核通过 2审核未通过',
+    field: 'auditStatus',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"audit_status"
+     },
+  },
+];

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

@@ -0,0 +1,156 @@
+package org.jeecg.modules.tbSuggest.controller;
+
+import java.util.Arrays;
+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.modules.tbSuggest.entity.TbSuggest;
+import org.jeecg.modules.tbSuggest.service.ITbSuggestService;
+
+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.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 帮助与反馈
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Api(tags="帮助与反馈")
+@RestController
+@RequestMapping("/tbSuggest/tbSuggest")
+@Slf4j
+public class TbSuggestController extends JeecgController<TbSuggest, ITbSuggestService> {
+	@Autowired
+	private ITbSuggestService tbSuggestService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tbSuggest
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "帮助与反馈-分页列表查询")
+	@ApiOperation(value="帮助与反馈-分页列表查询", notes="帮助与反馈-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TbSuggest>> queryPageList(TbSuggest tbSuggest,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TbSuggest> queryWrapper = QueryGenerator.initQueryWrapper(tbSuggest, req.getParameterMap());
+		Page<TbSuggest> page = new Page<TbSuggest>(pageNo, pageSize);
+		IPage<TbSuggest> pageList = tbSuggestService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tbSuggest
+	 * @return
+	 */
+	@AutoLog(value = "帮助与反馈-添加")
+	@ApiOperation(value="帮助与反馈-添加", notes="帮助与反馈-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TbSuggest tbSuggest) {
+		tbSuggestService.save(tbSuggest);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tbSuggest
+	 * @return
+	 */
+	@AutoLog(value = "帮助与反馈-编辑")
+	@ApiOperation(value="帮助与反馈-编辑", notes="帮助与反馈-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TbSuggest tbSuggest) {
+		tbSuggestService.updateById(tbSuggest);
+		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) {
+		tbSuggestService.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.tbSuggestService.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<TbSuggest> queryById(@RequestParam(name="id",required=true) String id) {
+		TbSuggest tbSuggest = tbSuggestService.getById(id);
+		if(tbSuggest==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tbSuggest);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tbSuggest
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TbSuggest tbSuggest) {
+        return super.exportXls(request, tbSuggest, TbSuggest.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, TbSuggest.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/entity/TbSuggest.java

@@ -0,0 +1,101 @@
+package org.jeecg.modules.tbSuggest.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-10-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_suggest")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_suggest对象", description="帮助与反馈")
+public class TbSuggest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键编号*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键编号")
+    private java.lang.String id;
+	/**用户id*/
+	@Excel(name = "用户id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String userId;
+	/**用户名*/
+	@Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private java.lang.String userName;
+	/**用户手机号*/
+	@Excel(name = "用户手机号", width = 15)
+    @ApiModelProperty(value = "用户手机号")
+    private java.lang.String userPhone;
+	/**问题描述*/
+	@Excel(name = "问题描述", width = 15)
+    @ApiModelProperty(value = "问题描述")
+    private java.lang.String content;
+	/**问题截图*/
+	@Excel(name = "问题截图", width = 15)
+    @ApiModelProperty(value = "问题截图")
+    private java.lang.String proofImg;
+	/**提交时间*/
+	@Excel(name = "提交时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "提交时间")
+    private java.util.Date submitTime;
+	/**是否回复（0：未回复 1：已回复）*/
+	@Excel(name = "是否回复（0：未回复 1：已回复）", width = 15)
+    @ApiModelProperty(value = "是否回复（0：未回复 1：已回复）")
+    private java.lang.Integer isReply;
+	/**回复结果*/
+	@Excel(name = "回复结果", width = 15)
+    @ApiModelProperty(value = "回复结果")
+    private java.lang.String replyMsg;
+	/**回复时间*/
+	@Excel(name = "回复时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "回复时间")
+    private java.util.Date replyTime;
+	/**回复人*/
+	@Excel(name = "回复人", width = 15)
+    @ApiModelProperty(value = "回复人")
+    private java.lang.String replyId;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/mapper/TbSuggestMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.tbSuggest.mapper;
+
+import org.jeecg.modules.tbSuggest.entity.TbSuggest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 帮助与反馈
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+public interface TbSuggestMapper extends BaseMapper<TbSuggest> {
+
+}

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/service/ITbSuggestService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.tbSuggest.service;
+
+import org.jeecg.modules.tbSuggest.entity.TbSuggest;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 帮助与反馈
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+public interface ITbSuggestService extends IService<TbSuggest> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/service/impl/TbSuggestServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.tbSuggest.service.impl;
+
+import org.jeecg.modules.tbSuggest.entity.TbSuggest;
+import org.jeecg.modules.tbSuggest.mapper.TbSuggestMapper;
+import org.jeecg.modules.tbSuggest.service.ITbSuggestService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 帮助与反馈
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Service
+public class TbSuggestServiceImpl extends ServiceImpl<TbSuggestMapper, TbSuggest> implements ITbSuggestService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/vue/TbSuggestList.vue

@@ -0,0 +1,219 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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.userName"></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.userPhone"></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>
+    <!-- 查询区域-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>
+
+    <tb-suggest-modal ref="modalForm" @ok="modalFormOk"></tb-suggest-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbSuggestModal from './modules/TbSuggestModal'
+
+  export default {
+    name: 'TbSuggestList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbSuggestModal
+    },
+    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: 'userName'
+          },
+          {
+            title:'用户手机号',
+            align:"center",
+            dataIndex: 'userPhone'
+          },
+          {
+            title:'问题描述',
+            align:"center",
+            dataIndex: 'content'
+          },
+          {
+            title:'问题截图',
+            align:"center",
+            dataIndex: 'proofImg',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'提交时间',
+            align:"center",
+            dataIndex: 'submitTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/tbSuggest/tbSuggest/list",
+          delete: "/tbSuggest/tbSuggest/delete",
+          deleteBatch: "/tbSuggest/tbSuggest/deleteBatch",
+          exportXlsUrl: "/tbSuggest/tbSuggest/exportXls",
+          importExcelUrl: "tbSuggest/tbSuggest/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:'userName',text:'用户名',dictCode:''})
+        fieldList.push({type:'string',value:'userPhone',text:'用户手机号',dictCode:''})
+        fieldList.push({type:'Text',value:'content',text:'问题描述',dictCode:''})
+        fieldList.push({type:'Text',value:'proofImg',text:'问题截图',dictCode:''})
+        fieldList.push({type:'date',value:'submitTime',text:'提交时间'})
+        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/tbSuggest/vue/modules/TbSuggestForm.vue

@@ -0,0 +1,124 @@
+<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="userName">
+              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userPhone">
+              <a-input v-model="model.userPhone" placeholder="请输入用户手机号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="问题描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
+              <a-input v-model="model.content" placeholder="请输入问题描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="问题截图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="proofImg">
+              <j-image-upload isMultiple  v-model="model.proofImg" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="submitTime">
+              <j-date placeholder="请选择提交时间" v-model="model.submitTime"  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: 'TbSuggestForm',
+    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: "/tbSuggest/tbSuggest/add",
+          edit: "/tbSuggest/tbSuggest/edit",
+          queryById: "/tbSuggest/tbSuggest/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/tbSuggest/vue/modules/TbSuggestModal.Style#Drawer.vue

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

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

@@ -0,0 +1,81 @@
+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: 'userName'
+   },
+   {
+    title: '用户手机号',
+    align:"center",
+    dataIndex: 'userPhone'
+   },
+   {
+    title: '问题描述',
+    align:"center",
+    dataIndex: 'content'
+   },
+   {
+    title: '问题截图',
+    align:"center",
+    dataIndex: 'proofImg',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '提交时间',
+    align:"center",
+    dataIndex: 'submitTime',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "用户名",
+      field: "userName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "用户手机号",
+      field: "userPhone",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户名',
+    field: 'userName',
+    component: 'Input',
+  },
+  {
+    label: '用户手机号',
+    field: 'userPhone',
+    component: 'Input',
+  },
+  {
+    label: '问题描述',
+    field: 'content',
+    component: 'Input',
+  },
+  {
+    label: '问题截图',
+    field: 'proofImg',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '提交时间',
+    field: 'submitTime',
+    component: 'DatePicker',
+  },
+];

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

@@ -0,0 +1,101 @@
+package org.jeecg.modules.alUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.address.entity.TbAddress;
+import org.jeecg.modules.address.service.ITbAddressService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.postBean.AddressReq;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+* @Description: 用户地址表
+* @Author: jeecg-boot
+* @Date:   2024-10-19
+* @Version: V1.0
+*/
+@Api(tags="用户地址")
+@RestController
+@RequestMapping("/address")
+@Slf4j
+public class AddressController extends JeecgController<TbAddress, ITbAddressService> {
+   @Autowired
+   private ITbAddressService tbAddressService;
+   @Resource
+   private ShiroRealm shiroRealm;
+   /**
+    * 分页列表查询
+    *
+    * @param
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
+    */
+   //@AutoLog(value = "用户地址表-分页列表查询")
+   @ApiOperation(value="用户地址表-分页列表查询", notes="用户地址表-分页列表查询")
+   @GetMapping(value = "/list")
+   public Result<IPage<TbAddress>> queryPageList(
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  HttpServletRequest req) {
+       QueryWrapper<TbAddress> queryWrapper = QueryGenerator.initQueryWrapper(new TbAddress(), req.getParameterMap());
+       queryWrapper.eq("is_disable",0).orderByDesc("create_time");
+       Page<TbAddress> page = new Page<TbAddress>(pageNo, pageSize);
+       IPage<TbAddress> pageList = tbAddressService.page(page, queryWrapper);
+       return Result.OK(pageList);
+   }
+
+   /**
+    *   添加
+    *
+    * @param tbAddress
+    * @return
+    */
+   @ApiOperation(value="用户地址表-添加", notes="用户地址表-添加")
+   @PostMapping(value = "/add")
+   public Result<String> add(@RequestBody AddressReq tbAddress, @RequestHeader("X-Access-Token") String token) {
+       HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+       TbAddress tbAddress1 = new TbAddress();
+       BeanUtils.copyProperties(tbAddress, tbAddress1);
+       tbAddress1.setUserId(hanHaiMember.getId());
+       tbAddressService.save(tbAddress1);
+       return Result.OK("添加成功！");
+   }
+
+   /**
+    *  编辑
+    *
+    * @param tbAddress
+    * @return
+    */
+   @ApiOperation(value="用户地址表-编辑", notes="用户地址表-编辑")
+   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+   public Result<String> edit(@RequestBody AddressReq tbAddress) {
+       TbAddress tbAddress1 = new TbAddress();
+       BeanUtils.copyProperties(tbAddress, tbAddress1);
+       tbAddressService.updateById(tbAddress1);
+       return Result.OK("编辑成功!");
+   }
+
+
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/IndexController.java

@@ -6,13 +6,18 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.alUser.service.UserService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.postBean.SuggestReq;
+import org.jeecg.modules.tbSuggest.entity.TbSuggest;
+import org.jeecg.modules.tbSuggest.service.ITbSuggestService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author scott
@@ -24,11 +29,11 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class IndexController {
     @Autowired
-    private IHanHaiMemberService iHanHaiMemberService;
+    private ITbSuggestService tbSuggestService;
     @Autowired
-    private RedisUtil redisUtil;
+    private IHanHaiMemberService hanHaiMemberService;
     @Autowired
-    private UserService userService;
+    private ShiroRealm shiroRealm;
 
 
     @ApiOperation(value = "铝价接口")
@@ -39,5 +44,28 @@ public class IndexController {
         return Result.ok(jsonObject);
     }
 
+    @ApiOperation(value = "我的头像昵称，平台客户电话等信息")
+    @RequestMapping(value = "/index", method = RequestMethod.POST)
+    public Result<JSONObject> index(@RequestHeader("X-Access-Token") String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        hanHaiMember.setPasswordSalt(null);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("phone","123456");
+        jsonObject.put("my",hanHaiMember);
+
+        return Result.ok(jsonObject);
+    }
+
+    @ApiOperation(value="帮助与反馈", notes="帮助与反馈")
+    @PostMapping(value = "/addSuggest")
+    public Result<String> addSuggest(@RequestBody SuggestReq tbSuggest, @RequestHeader("X-Access-Token") String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        TbSuggest tbSuggest1 = new TbSuggest();
+        BeanUtils.copyProperties(tbSuggest, tbSuggest1);
+        tbSuggest1.setUserId(hanHaiMember.getId());
+        tbSuggestService.save(tbSuggest1);
+        return Result.OK("添加成功！");
+    }
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java

@@ -9,64 +9,140 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.postBean.CustomsReq;
 import org.jeecg.modules.product.entity.ProductReq;
 import org.jeecg.modules.product.entity.TbProduct;
 import org.jeecg.modules.product.service.ProductService;
+import org.jeecg.modules.tbCustoms.entity.TbCustoms;
+import org.jeecg.modules.tbCustoms.service.ITbCustomsService;
+import org.jeecg.modules.utils.ValidateTool;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import static com.jeecg.qywx.api.base.JwParamesAPI.token;
+
 /**
-* @Description: 产品报价表
-* @Author: jeecg-boot
-* @Date:   2024-10-19
-* @Version: V1.0
-*/
-@Api(tags="产品报价")
+ * @Description: 产品报价表
+ * @Author: jeecg-boot
+ * @Date: 2024-10-19
+ * @Version: V1.0
+ */
+@Api(tags = "产品报价")
 @RestController
 @RequestMapping("/product")
 @Slf4j
 public class ProductController extends JeecgController<TbProduct, ProductService> {
-   @Autowired
-   private ProductService tbProductService;
-
-   /**
-    * 分页列表查询
-    *
-    * @param tbProduct
-    * @param pageNo
-    * @param pageSize
-    * @param req
-    * @return
-    */
-   @ApiOperation(value="产品报价分页列表", notes="产品报价分页列表")
-   @GetMapping(value = "/productList")
-   public Result<IPage<TbProduct>> queryPageList(
-                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                  HttpServletRequest req) {
-       QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(new TbProduct(), req.getParameterMap());
-       queryWrapper.eq("show_status",0).eq("audit_status",1)
-               .orderByDesc("sort_num","create_time");
-       Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize);
-       IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper);
-       return Result.OK(pageList);
-   }
-
-   /**
-    *   添加
-    *
-    * @param
-    * @return
-    */
-   @ApiOperation(value="产品报价", notes="产品报价")
-   @PostMapping(value = "/addProduct")
-   public Result<String> addProduct(@RequestBody ProductReq productReq, @RequestHeader("X-Access-Token") String token) {
-       tbProductService.addProduct(productReq,token);
-       return Result.OK("添加成功！");
-   }
+    @Autowired
+    private ProductService tbProductService;
+    @Resource
+    private ShiroRealm shiroRealm;
+
+    @Resource
+    private ITbCustomsService tbCustomsService;
+    /**
+     * 分页列表查询
+     *
+     * @param
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "产品报价分页列表", notes = "产品报价分页列表")
+    @GetMapping(value = "/productList")
+    public Result<IPage<TbProduct>> queryPageList(
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(new TbProduct(), req.getParameterMap());
+        queryWrapper.eq("audit_status", 1)
+                .orderByDesc("sort_num", "create_time");
+        Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize);
+        IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    @ApiOperation(value = "交易平台挂单列表", notes = "交易平台挂单列表")
+    @GetMapping(value = "/productlist")
+    public Result<IPage<TbProduct>> productlist(
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(new TbProduct(), req.getParameterMap());
+        queryWrapper.eq("show_status", 0).eq("audit_status", 1)
+                .orderByDesc("sort_num", "create_time");
+        Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize);
+        IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    @ApiOperation(value = "我的挂单列表", notes = "我的挂单列表")
+    @GetMapping(value = "/myProductlist")
+    public Result<IPage<TbProduct>> myProductlist(
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req, @RequestHeader("X-Access-Token") String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+
+        QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(new TbProduct(), req.getParameterMap());
+        queryWrapper.eq("user_id", hanHaiMember.getId()).orderByDesc("create_time");
+        Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize);
+        IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+
+
+    @ApiOperation(value="撤单", notes="撤单")
+    @GetMapping(value = "/noShow")
+    public Result<String> noShow(@RequestParam(name="id",required=true ) String id , @RequestHeader("X-Access-Token") String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        QueryWrapper<TbProduct> productQueryWrapper = new QueryWrapper<>();
+        productQueryWrapper.eq("user_id", hanHaiMember.getId()).eq("id", id);
+        TbProduct one = tbProductService.getOne(productQueryWrapper);
+        if (ValidateTool.isNull(one)){
+            return Result.error("参数错误!");
+        }
+        one.setShowStatus(1);
+        tbProductService.updateById(one);
+        return Result.OK("撤单成功!");
+    }
+
+
+
+    /**
+     * 添加
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "产品报价", notes = "产品报价")
+    @PostMapping(value = "/addProduct")
+    public Result<String> addProduct(@RequestBody ProductReq productReq, @RequestHeader("X-Access-Token") String token) {
+        tbProductService.addProduct(productReq, token);
+        return Result.OK("添加成功！");
+    }
+
 
+    @ApiOperation(value="清关申请", notes="清关申请")
+    @PostMapping(value = "/addCustoms")
+    public Result<String> addCustoms(@RequestBody CustomsReq customsReq, @RequestHeader("X-Access-Token") String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        TbCustoms tbCustoms = new TbCustoms();
+        BeanUtils.copyProperties(customsReq, tbCustoms);
+        tbCustoms.setUserId(hanHaiMember.getId());
+        tbCustomsService.save(tbCustoms);
+        return Result.OK("添加成功！");
+    }
 
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/UserServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
@@ -158,18 +159,20 @@ public class UserServiceImpl implements UserService {
         objectLambdaQueryWrapper.eq(TbUserRole::getUserName,reqUserRole.getUserName()).
                 eq(TbUserRole::getRole,reqUserRole.getRole()).in(TbUserRole::getAuditStatus,1,0);
         TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
-
         if (ValidateTool.isNotNull(one1) && one1.getAuditStatus()==0){
-            result.error500("已提交审核，请耐心等候或联系管理员");
+            return result.error500("已提交审核，请耐心等候或联系管理员");
         }
-        if (ValidateTool.isNotNull(one1) && one1.getAuditStatus()==0){
-            result.error500("已提交审核，请勿重复提交");
+        if (ValidateTool.isNotNull(one1) && one1.getAuditStatus()==1){
+           return result.error500("已提交审核，请勿重复提交");
         }
         TbUserRole tbUserRole = new TbUserRole();
         BeanUtils.copyProperties(reqUserRole, tbUserRole);
         tbUserRole.setUserId(one.getId());
         tbUserRole.setAuditStatus(0);
         tbUserRoleService.save(tbUserRole);
+        JSONObject obj = new JSONObject();
+        obj.put("role", tbUserRole);
+        result.setResult(obj);
         return result;
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/AddressReq.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.postBean;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 用户地址表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="地址", description="用户地址表")
+public class AddressReq implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "收货地址id")
+    private String id;
+
+	/**收获详细地址*/
+	@Excel(name = "收获详细地址", width = 15)
+    @ApiModelProperty(value = "收获详细地址")
+    private String address;
+	/**收货手机号*/
+	@Excel(name = "收货手机号", width = 15)
+    @ApiModelProperty(value = "收货手机号")
+    private String phone;
+	/**城市*/
+	@Excel(name = "城市", width = 15)
+    @ApiModelProperty(value = "城市")
+    private String city;
+	/**经度*/
+	@Excel(name = "经度", width = 15)
+    @ApiModelProperty(value = "经度")
+    private String latitude;
+	/**纬度*/
+	@Excel(name = "纬度", width = 15)
+    @ApiModelProperty(value = "纬度")
+    private String longitude;
+//	/**是否默认地址 0非默认 1默认*/
+//	@Excel(name = "是否默认地址 0非默认 1默认", width = 15)
+//    @ApiModelProperty(value = "是否默认地址 0非默认 1默认")
+//    private Integer defaultFlag;
+	/**收货人*/
+	@Excel(name = "收货人", width = 15)
+    @ApiModelProperty(value = "收货人")
+    private String name;
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/CustomsReq.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.postBean;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 清关申请
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="清关申请", description="清关申请")
+public class CustomsReq implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**角色信息 1供应商 2采购商*/
+	@Excel(name = "角色信息 1供应商 2采购商", width = 15, dicCode = "user_role")
+	@Dict(dicCode = "user_role")
+    @ApiModelProperty(value = "角色信息 1供应商 2采购商")
+    private Integer role;
+	/**用户名*/
+	@Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+	/**密码*/
+	@Excel(name = "密码", width = 15)
+    @ApiModelProperty(value = "密码")
+    private String password;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+	/**税收编码*/
+	@Excel(name = "税收编码", width = 15)
+    @ApiModelProperty(value = "税收编码")
+    private String taxCode;
+	/**公司地址*/
+	@Excel(name = "公司地址", width = 15)
+    @ApiModelProperty(value = "公司地址")
+    private String address;
+	/**公司账号*/
+	@Excel(name = "公司账号", width = 15)
+    @ApiModelProperty(value = "公司账号")
+    private String bankAccount;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private String phone;
+	/**开户行*/
+	@Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private String bankNama;
+	/**营业执照上传*/
+	@Excel(name = "营业执照上传", width = 15)
+    @ApiModelProperty(value = "营业执照上传")
+    private String businessLicense;
+	/**基本户信息照片上传*/
+	@Excel(name = "基本户信息照片上传", width = 15)
+    @ApiModelProperty(value = "基本户信息照片上传")
+    private String basicAccount;
+	/**收款银行照片上传*/
+	@Excel(name = "收款银行照片上传", width = 15)
+    @ApiModelProperty(value = "收款银行照片上传")
+    private String bankInfo;
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/SuggestReq.java

@@ -0,0 +1,44 @@
+package org.jeecg.modules.postBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 帮助与反馈
+ * @Author: jeecg-boot
+ * @Date:   2024-10-19
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="问题反馈", description="帮助与反馈")
+public class SuggestReq implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+	/**用户名*/
+	@Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+	/**用户手机号*/
+	@Excel(name = "用户手机号", width = 15)
+    @ApiModelProperty(value = "用户手机号")
+    private String userPhone;
+	/**问题描述*/
+	@Excel(name = "问题描述", width = 15)
+    @ApiModelProperty(value = "问题描述")
+    private String content;
+	/**问题截图*/
+	@Excel(name = "问题截图", width = 15)
+    @ApiModelProperty(value = "问题截图")
+    private String proofImg;
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java

@@ -1,15 +1,10 @@
 package org.jeecg.modules.product.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;