!3 优化合并

Merge pull request !3 from WYB/prod

pom.xml

@@ -192,11 +192,11 @@
                 <artifactId>hutool-all</artifactId>
                 <version>5.7.12</version>
             </dependency>
-<!--            <dependency>
+            <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>3.5.3.1</version>
+                <version>3.5.3.2</version>
-            </dependency>-->
+            </dependency>
             <dependency>
                 <groupId>com.xuxueli</groupId>
                 <artifactId>xxl-job-core</artifactId>
@@ -247,11 +247,11 @@
                 <version>${ruoyi.version}</version>
             </dependency>
             <!-- mybatis-flex -->
-            <dependency>
+<!--            <dependency>
                 <groupId>com.mybatis-flex</groupId>
                 <artifactId>mybatis-flex-spring-boot-starter</artifactId>
                 <version>${mybatis-flex.version}</version>
-            </dependency>
+            </dependency>-->
             <!-- 多数据源 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -284,7 +284,6 @@
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>1.18.18</version>
-                <scope>provided</scope>
             </dependency>
 
         </dependencies>

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java

@@ -1,8 +1,9 @@
 package com.ruoyi.system.api.model;
 
+import com.ruoyi.system.api.domain.SysUser;
+
 import java.io.Serializable;
 import java.util.Set;
-import com.ruoyi.system.api.domain.SysUser;
 
 /**
  * 用户信息
@@ -27,6 +28,10 @@ public class LoginUser implements Serializable
      * 用户名
      */
     private String username;
+    /**
+     * 微信用户名
+     */
+    private String nickname;
 
     /**
      * 登录时间
@@ -53,6 +58,14 @@ public class LoginUser implements Serializable
      */
     private Set<String> roles;
 
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
     /**
      * 用户信息
      */

ruoyi-common/ruoyi-common-core/pom.xml

@@ -116,11 +116,16 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
-        <!-- mybatis-flex -->
+        <!-- mybatis-plus-->
         <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- mybatis-flex -->
+    <!--    <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- Swagger -->
         <dependency>
             <groupId>io.swagger</groupId>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java

@@ -1,11 +1,12 @@
 package com.ruoyi.common.core.web.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Column;
 
 /**
  * Entity基类
@@ -17,7 +18,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
-    @Column(ignore = true)
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -25,7 +26,6 @@ public class BaseEntity implements Serializable
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(onInsertValue = "now()")
     private Date createTime;
 
     /** 更新者 */
@@ -33,14 +33,13 @@ public class BaseEntity implements Serializable
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(onUpdateValue = "now()", onInsertValue = "now()")
     private Date updateTime;
 
     /** 备注 */
     private String remark;
 
     /** 请求参数 */
-    @Column(ignore = true)
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

ruoyi-common/ruoyi-common-security/pom.xml

@@ -34,9 +34,13 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
         <!-- mybatis-flex -->
-        <dependency>
+   <!--     <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
     </dependencies>
 

ruoyi-modules/ruoyi-gen/pom.xml

@@ -77,7 +77,15 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!-- mybatis-flex -->
+   <!--     <dependency>
+            <groupId>com.mybatis-flex</groupId>
+            <artifactId>mybatis-flex-spring-boot-starter</artifactId>
+        </dependency>-->
     </dependencies>
 
     <build>

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -1,18 +1,21 @@
 package com.ruoyi.gen.domain;
 
-import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableName;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 业务表 gen_table
  * 
  * @author ruoyi
  */
+@TableName("gen_table")
 public class GenTable extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java

@@ -1,15 +1,18 @@
 package com.ruoyi.gen.domain;
 
-import javax.validation.constraints.NotBlank;
+import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 代码生成业务字段表 gen_table_column
  * 
  * @author ruoyi
  */
+@TableName("gen_table_column")
 public class GenTableColumn extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -7,3 +7,26 @@ spring:
   application:
     # 应用名称
     name: ruoyi-gen
+# Mybatis开启驼峰映射
+mybatis:
+  configuration:
+    mapUnderscoreToCamelCase: true
+# MyBatis配置
+mybatis-flex:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  cacheEnabled: true
+  useGeneratedKeys: true
+  defaultExecutorType: SIMPLE
+  configuration:
+    # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
+    # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
+    # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
+    logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gen.mapper.GenTableColumnMapper">
     
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+    <resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
     </sql>
 	
-    <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+    <select id="selectGenTableColumnListByTableId" parameterType="com.ruoyi.gen.domain.GenTableColumn" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where table_id = #{tableId}
         order by sort
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by ordinal_position
 	</select>
     
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+    <insert id="insertGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
 	 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+    <update id="updateGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn">
         update gen_table_column
         <set>
             column_comment = #{columnComment},

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gen.mapper.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
+	<resultMap type="com.ruoyi.gen.domain.GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"          />
 		<result property="tableName"      column="table_name"        />
 		<result property="tableComment"   column="table_comment"     />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
 	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+	<resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
     
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
+    <select id="selectGenTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="tableName != null and tableName != ''">
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</select>
 
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+	<select id="selectDbTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_schema = (select database())
 		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by c.sort
 	</select>
 	
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+	<insert id="insertGenTable" parameterType="com.ruoyi.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (
 			<if test="tableName != null">table_name,</if>
 			<if test="tableComment != null and tableComment != ''">table_comment,</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
     
-    <update id="updateGenTable" parameterType="GenTable">
+    <update id="updateGenTable" parameterType="com.ruoyi.gen.domain.GenTable">
         update gen_table
         <set>
             <if test="tableName != null">table_name = #{tableName},</if>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm

@@ -6,6 +6,8 @@ import ${import};
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.web.domain.BaseEntity;
 #elseif($table.tree)
@@ -23,6 +25,8 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
+@Data
+@TableName("${tableName}")
 public class ${ClassName} extends ${Entity}
 {
     private static final long serialVersionUID = 1L;
@@ -62,15 +66,7 @@ public class ${ClassName} extends ${Entity}
 #else
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
 
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
 #end
 #end
 
@@ -86,20 +82,5 @@ public class ${ClassName} extends ${Entity}
     }
 
 #end
-    @Override
+
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm

@@ -2,6 +2,7 @@ package ${packageName}.mapper;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
 #end
@@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
 {
     /**
      * 查询${functionName}

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm

@@ -2,14 +2,14 @@ package ${packageName}.service;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
-
+import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * ${functionName}Service接口
  * 
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
+public interface I${ClassName}Service extends IService<${ClassName}>
 {
     /**
      * 查询${functionName}

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 #end
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 #if($table.sub)
 import java.util.ArrayList;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -26,7 +27,7 @@ import ${packageName}.service.I${ClassName}Service;
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service
 {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;

ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm

@@ -4,18 +4,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
     
-    <resultMap type="${ClassName}" id="${ClassName}Result">
+    <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
 #foreach ($column in $columns)
         <result property="${column.javaField}"    column="${column.columnName}"    />
 #end
     </resultMap>
 #if($table.sub)
 
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+    <resultMap id="${ClassName}${subClassName}Result" type="${packageName}.domain.${ClassName}" extends="${ClassName}Result">
         <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
     </resultMap>
 
-    <resultMap type="${subClassName}" id="${subClassName}Result">
+    <resultMap type="${packageName}.domain.${subClassName}" id="${subClassName}Result">
 #foreach ($column in $subTable.columns)
         <result property="${column.javaField}"    column="sub_${column.columnName}"    />
 #end
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
     </sql>
 
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
         <include refid="select${ClassName}Vo"/>
         <where>  
 #foreach($column in $columns)
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
     </select>
         
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+    <insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
         insert into ${tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
 #foreach($column in $columns)
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update${ClassName}" parameterType="${ClassName}">
+    <update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
         update ${tableName}
         <trim prefix="SET" suffixOverrides=",">
 #foreach($column in $columns)

ruoyi-modules/ruoyi-system/pom.xml

@@ -59,11 +59,16 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-datasource</artifactId>
         </dependency>
-        <!-- mybatis-flex -->
+       <!-- mybatis-plus-->
         <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- mybatis-flex -->
+  <!--      <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- RuoYi Common DataScope -->
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -109,6 +114,25 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>com.mybatis-flex</groupId>
+                            <artifactId>mybatis-flex-processor</artifactId>
+                            <version>1.6.0</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.18</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>-->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java

@@ -1,62 +1,63 @@
 package com.ruoyi.system.controller;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.security.InvalidParameterException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.system.UserInfo;
-import com.alibaba.csp.sentinel.util.IdUtil;
-import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.exception.CheckedException;
 import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.exception.UtilException;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
 import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.WxLoginUser;
+import com.ruoyi.system.domain.Competition;
-import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.CompetitionSharePermissions;
-import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.domain.Sms;
+import com.ruoyi.system.domain.UserRole;
+import com.ruoyi.system.domain.vo.CompetitionExcleVo;
+import com.ruoyi.system.domain.vo.CompetitionResponse;
+import com.ruoyi.system.domain.vo.CompetitionVo;
+import com.ruoyi.system.domain.vo.SmsResponse;
 import com.ruoyi.system.service.*;
-import com.ruoyi.system.utils.LoginUserUtil;
 import com.ruoyi.system.utils.UtilTool;
-import io.seata.core.model.Result;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.PictureData;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.*;
-import org.aspectj.weaver.loadtime.Aj;
 import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.InvalidParameterException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 /**
  * 比赛信息Controller
  * 
@@ -372,6 +373,48 @@ public class CompetitionController extends BaseController
         return AjaxResult.success(excleVo);
     }
 
+    @PostMapping(value = "/teamEnrollExcleImportUserPhone",produces = "application/json;charset=utf-8")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)补充队员头像")
+    public AjaxResult teamEnrollExcleImportUserPhone(
+            @RequestParam(value = "competitionId", required = true) Long competitionId,
+            @RequestParam("file") MultipartFile file) throws Exception {
+        CompetitionExcleVo excleVo = new CompetitionExcleVo();
+        String fileName = file.getOriginalFilename();
+        // 上传文件为空
+        if (StringUtils.isEmpty(fileName)) {
+            throw new CheckedException("没有导入文件");
+        }
+        // 上传文件名格式不正确
+        if (fileName.lastIndexOf(".") != -1 && !".xlsx".equals(fileName.substring(fileName.lastIndexOf(".")))) {
+            throw new CheckedException("文件名格式不正确, 请使用后缀名为.xlsx的文件");
+        }
+        String filePath = getFilePath(file);
+        Sheet sheet = null;
+        Workbook wb = null;
+        //读图片--开始
+        Map<String, PictureData> maplist = null;
+        BufferedInputStream inputStream = new BufferedInputStream(file.getInputStream());
+        // 判断用07还是03的方法获取图片
+        if (filePath.endsWith("xls")) {
+            wb = new HSSFWorkbook(inputStream);
+            sheet = wb.getSheetAt(0);
+            maplist = getPictures03((HSSFSheet) sheet);
+        } else if (filePath.endsWith("xlsx")) {
+            wb = new XSSFWorkbook(inputStream);
+            sheet = wb.getSheetAt(0);
+            maplist = getPictures07((XSSFSheet) sheet);
+        } else {
+            throw new CheckedException("Excel文件格式不支持");
+        }
+        excleVo = competitionService.importExcleDataUserAvatar(competitionId,maplist,sheet);
+        //使用完成关闭
+        wb.close();
+        if (inputStream != null) {
+            inputStream.close();
+        }
+        return AjaxResult.success(excleVo);
+    }
     /**
      * 获取03图片和位置 (xls) clerk
      *

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java

@@ -67,7 +67,12 @@ public class CompetitionMembersController extends BaseController
     {
         return AjaxResult.success(competitionMembersService.selectCompetitionMembersById(id));
     }
-
+    @ApiOperation("获取赛会中个人得分数据")
+    @PostMapping( "/getCompetitionUserScoreInfo")
+    @ResponseBody
+    public AjaxResult getCompetitionUserScoreInfo(@RequestBody CompetitionMembersVo entity){
+        return AjaxResult.success(competitionMembersService.getCompetitionUserScoreInfo(entity));
+    }
     /**
      * 新增比赛参与人员
      */
@@ -108,4 +113,11 @@ public class CompetitionMembersController extends BaseController
         List<CompetitionMembersVo> list = competitionMembersService.getJoinCompetitionMembersPage(entity);
         return getDataTable(list);
     }
+    @Log(title = "修改人员信息", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"修改人员信息")
+    @PostMapping("/updateTeamUser")
+    public AjaxResult updateTeamUser(@RequestBody CompetitionMembers competitionMembers)
+    {
+        return toAjax(competitionMembersService.updateCompetitionMembers(competitionMembers));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java

@@ -1,32 +1,30 @@
 package com.ruoyi.system.controller;
 
-import java.security.InvalidParameterException;
-import java.text.ParseException;
-import java.util.*;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.exception.CheckedException;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
 import com.ruoyi.system.domain.CompetitionResult;
+import com.ruoyi.system.domain.CompetitionTeamVsTeam;
 import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.service.ICompetitionTeamVsTeamService;
 import com.ruoyi.system.utils.UtilTool;
-import io.seata.core.model.Result;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.log.annotation.Log;
+
-import com.ruoyi.common.log.enums.BusinessType;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import java.security.InvalidParameterException;
-import com.ruoyi.system.domain.CompetitionTeamVsTeam;
+import java.text.ParseException;
-import com.ruoyi.system.service.ICompetitionTeamVsTeamService;
+import java.util.*;
-import com.ruoyi.common.core.web.controller.BaseController;
+import java.util.stream.Collectors;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
 
 /**
  * 赛会中-球队VS球队关系Controller
@@ -180,7 +178,8 @@ public class CompetitionTeamVsTeamController extends BaseController
                                         //正序
                                         //list1 -> list1.stream().sorted(Comparator.comparing(CompetitionTeamIntegralVo::getIntegral))
                                                 //倒序
-                                                list1 -> list1.stream().sorted(Comparator.comparing(CompetitionTeamIntegralVo::getIntegral).reversed())
+                                                list1 -> list1.stream().sorted(Comparator.comparing(CompetitionTeamIntegralVo::getIntegral).reversed()
+                                                                .thenComparing(CompetitionTeamIntegralVo::getNetWinPoint,Comparator.reverseOrder()))
                                                 .collect(Collectors.toList())
                                 )));
                 for (String key:map.keySet()){
@@ -193,7 +192,8 @@ public class CompetitionTeamVsTeamController extends BaseController
             if(notGroup.size()>0){
                 competitionTeamIntegralRankingVo rankingVo = new competitionTeamIntegralRankingVo();
                 rankingVo.setCompetitionGroup("未分");
-                rankingVo.setIntegralList(notGroup.stream().sorted(Comparator.comparing(CompetitionTeamIntegralVo::getIntegral).reversed()).collect(Collectors.toList()));
+                rankingVo.setIntegralList(notGroup.stream().sorted(Comparator.comparing(CompetitionTeamIntegralVo::getIntegral).reversed()
+                .thenComparing(CompetitionTeamIntegralVo::getNetWinPoint,Comparator.reverseOrder())).collect(Collectors.toList()));
                 rankingVoList.add(rankingVo);
             }
         }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java

@@ -49,6 +49,18 @@ public class CustomerController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询客户信息列表
+     */
+    @RequiresPermissions("system:customer:makerList")
+    @GetMapping("/makerList")
+    public TableDataInfo makerList(CustomerVo customer)
+    {
+        startPage();
+        List<CustomerVo> list = customerService.selectCustomerMakerList(customer);
+        return getDataTable(list);
+    }
+
     /**
      * 导出客户信息列表
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerOrderController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.Customer;
+import com.ruoyi.system.domain.vo.CustomerOrderVo;
+import com.ruoyi.system.service.ICustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.CustomerOrder;
+import com.ruoyi.system.service.ICustomerOrderService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 客户-订车Controller
+ * 
+ * @author ruoyi
+ * @date 2023-08-01
+ */
+@RestController
+@RequestMapping("/customerOrder")
+public class CustomerOrderController extends BaseController
+{
+    @Autowired
+    private ICustomerOrderService customerOrderService;
+    @Autowired
+    private ICustomerService customerService;
+    /**
+     * 查询客户-订车列表
+     */
+    @RequiresPermissions("system:customerOrder:list")
+    @GetMapping("/list")
+    public TableDataInfo list(CustomerOrder customerOrder)
+    {
+        startPage();
+        List<CustomerOrder> list = customerOrderService.selectCustomerOrderList(customerOrder);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/getCustomerOrderPage")
+    public TableDataInfo getCustomerOrderPage(CustomerOrderVo customerOrder)
+    {
+        startPage();
+        List<CustomerOrderVo> list = customerOrderService.getCustomerOrderPage(customerOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出客户-订车列表
+     */
+    @RequiresPermissions("system:customerOrder:export")
+    @Log(title = "客户-订车", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CustomerOrder customerOrder)
+    {
+        List<CustomerOrder> list = customerOrderService.selectCustomerOrderList(customerOrder);
+        ExcelUtil<CustomerOrder> util = new ExcelUtil<CustomerOrder>(CustomerOrder.class);
+        util.exportExcel(response, list, "客户-订车数据");
+    }
+
+    /**
+     * 获取客户-订车详细信息
+     */
+    @RequiresPermissions("system:customerOrder:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(customerOrderService.selectCustomerOrderById(id));
+    }
+
+    /**
+     * 新增客户-订车
+     */
+    @Log(title = "客户-订车", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CustomerOrder customerOrder)
+    {
+        Customer customer = new Customer();
+        customer.setId(customerOrder.getCustomerId());
+        customer.setStatus("order");
+        customerService.updateCustomer(customer);
+        return toAjax(customerOrderService.insertCustomerOrder(customerOrder));
+    }
+
+    /**
+     * 修改客户-订车
+     */
+    @RequiresPermissions("system:customerOrder:edit")
+    @Log(title = "客户-订车", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CustomerOrder customerOrder)
+    {
+        return toAjax(customerOrderService.updateCustomerOrder(customerOrder));
+    }
+
+    /**
+     * 删除客户-订车
+     */
+    @RequiresPermissions("system:customerOrder:remove")
+    @Log(title = "客户-订车", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(customerOrderService.deleteCustomerOrderByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
 import com.ruoyi.system.domain.UserRole;
+import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
 import com.ruoyi.system.domain.vo.PersonalCareerVo;
 import com.ruoyi.system.domain.vo.UserInfoResponse;
 import com.ruoyi.system.service.ICompetitionMembersScoreService;
@@ -192,9 +193,9 @@ public class WxUserController extends BaseController
         }
 
         //个人生涯
-        PersonalCareerVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(userId);
+        CompetitionMembersScoreVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(userId);
         if(personalCareerVo==null){
-            personalCareerVo = new PersonalCareerVo();
+            personalCareerVo = new CompetitionMembersScoreVo();
         }
         userInfoResponse.setPersonalCareerVo(personalCareerVo);
         return AjaxResult.success(userInfoResponse);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java

@@ -1,12 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.*;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 building_info_detail
@@ -20,11 +21,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+@TableName("building_info_detail")
 public class BuildingInfoDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 building_label
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("building_label")
 public class BuildingLabel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -48,91 +52,4 @@ public class BuildingLabel extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long featureLabelId;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(Integer isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-    public void setFeatureLabelId(Long featureLabelId) 
-    {
-        this.featureLabelId = featureLabelId;
-    }
-
-    public Long getFeatureLabelId() 
-    {
-        return featureLabelId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("buildingId", getBuildingId())
-            .append("featureLabelId", getFeatureLabelId())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java

@@ -1,13 +1,12 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 building_team_rel
@@ -16,12 +15,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2023-07-04
  */
 @Data
-@Table("building_team_rel")
+@TableName("building_team_rel")
 public class BuildingTeamRel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 camera_info
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("camera_info")
 public class CameraInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -68,141 +72,4 @@ public class CameraInfo extends BaseEntity
     @Excel(name = "播放路径")
     private String url;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setCityCode(String cityCode) 
-    {
-        this.cityCode = cityCode;
-    }
-
-    public String getCityCode() 
-    {
-        return cityCode;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setSn(String sn) 
-    {
-        this.sn = sn;
-    }
-
-    public String getSn() 
-    {
-        return sn;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-    public void setUrl(String url) 
-    {
-        this.url = url;
-    }
-
-    public String getUrl() 
-    {
-        return url;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("status", getStatus())
-            .append("cityCode", getCityCode())
-            .append("type", getType())
-            .append("name", getName())
-            .append("sn", getSn())
-            .append("buildingId", getBuildingId())
-            .append("remark", getRemark())
-            .append("url", getUrl())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java

@@ -1,14 +1,15 @@
 package com.ruoyi.system.domain;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 比赛信息对象 competition
@@ -22,11 +23,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+@TableName("competition")
 public class Competition extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 主队ID */
@@ -195,5 +197,7 @@ public class Competition extends BaseEntity
     /** 赞助商 */
     @Excel(name = "赞助商")
     private String sponsor;
+    @Excel(name = "图片库id")
+    private String orderId;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java

@@ -1,13 +1,15 @@
 package com.ruoyi.system.domain;
 
+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 com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 比赛参与人员对象 competition_members
@@ -16,11 +18,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2022-11-03
  */
 @Data
+@TableName("competition_members")
 public class CompetitionMembers extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 用户ID */
@@ -136,6 +139,8 @@ public class CompetitionMembers extends BaseEntity
     /** 个人照片（最新） */
     @Excel(name = "个人照片", readConverterExp = "最=新")
     private String personalPhoto;
+    @Excel(name = "是否隐藏头像")
+    private Boolean isHideAvatar;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java

@@ -1,13 +1,15 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 赛会中-赛程-人员得分对象 competition_members_score
@@ -16,11 +18,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2022-11-03
  */
 @Data
+@TableName("competition_members_score")
 public class CompetitionMembersScore extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java

@@ -1,12 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 赛会中-参赛队伍对象 competition_of_team
@@ -15,11 +17,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2022-11-03
  */
 @Data
+@TableName("competition_of_team")
 public class CompetitionOfTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
@@ -67,7 +70,8 @@ public class CompetitionOfTeam extends BaseEntity
     /** 联系人 */
     @Excel(name = "领队人")
     private String contacts;
-
+    @Excel(name = "是否隐藏头像")
+    private Boolean isHideAvatar;
     /** 联系人电话 */
     @Excel(name = "领队人电话")
     private String contactsTel;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java

@@ -1,13 +1,15 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 赛会中-赛程结果记录对象 competition_result
@@ -16,11 +18,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2022-11-03
  */
 @Data
+@TableName("competition_result")
 public class CompetitionResult extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
@@ -104,5 +108,7 @@ public class CompetitionResult extends BaseEntity
     private String vsType;
     @ApiModelProperty(value = "比赛总分", required = false)
     private Integer totalScore;
+    @ApiModelProperty(value = "净胜分", required = false)
+    private Integer netWinPoint;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java

@@ -1,12 +1,11 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
 
 /**
  * 赛会-权限分享对象 competition_share_permissions
@@ -15,11 +14,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2023-07-20
  */
 @Data
+@TableName("competition_share_permissions")
 public class CompetitionSharePermissions extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java

@@ -1,12 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 lombok.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.*;
+
+import java.util.Date;
 
 /**
  * 赛会中-分组对象 competition_team_group
@@ -20,11 +22,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+@TableName("competition_team_group")
 public class CompetitionTeamGroup extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java

@@ -1,12 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 赛会中-球队VS球队关系对象 competition_team_vs_team
@@ -15,11 +17,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2022-11-03
  */
 @Data
+@TableName("competition_team_vs_team")
 public class CompetitionTeamVsTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerOrder.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 客户-订车对象 f_customer_order
+ * 
+ * @author ruoyi
+ * @date 2023-08-01
+ */
+@Data
+public class CustomerOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 客户id */
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    /** 订车时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "订车时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderDate;
+
+    /** 车辆详细 */
+    @Excel(name = "车辆详细")
+    private String carInfo;
+
+    /** 车辆VIN */
+    @Excel(name = "车辆VIN")
+    private String carVin;
+
+    /** 车辆状态 */
+    @Excel(name = "车辆状态")
+    private String carStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outDate;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 球馆特征对象 feature_label
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-06
  */
+@Data
+@TableName("feature_label")
 public class FeatureLabel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -48,91 +52,4 @@ public class FeatureLabel extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long buildingId;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(Integer isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("description", getDescription())
-            .append("remark", getRemark())
-            .append("buildingId", getBuildingId())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java

@@ -1,15 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 跟进模块-客户跟进记录对象 f_follow_up
@@ -18,13 +17,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2023-05-07
  */
 @Data
-@Table("f_follow_up")
+@TableName("f_follow_up")
 public class FollowUp extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
-    @Id(keyType = KeyType.Auto)
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /** 客户id */
@@ -36,21 +35,47 @@ public class FollowUp extends BaseEntity
     @Excel(name = "跟进日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date followUpDate;
 
-    /** 跟进记录 */
+    /** 跟进方式 */
-    @Excel(name = "跟进记录")
-    private String followUpRecord;
-
-    /** 再次预约到店日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "再次预约到店日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date preToStoreDate;
-
-    /** 级别 */
-    @Excel(name = "级别")
-    private String followLevel;
-    @Excel(name = "跟进结果")
-    private String followResult;
     @Excel(name = "跟进方式")
     private String followUpMethod;
 
+    /** 跟进结果 */
+    @Excel(name = "跟进结果")
+    private String followResult;
+
+    /** 意向级别 */
+    @Excel(name = "意向级别")
+    private String intentionLevel;
+
+    /** 本次跟进记录 */
+    @Excel(name = "本次跟进记录")
+    private String followUpRecord;
+
+    /** 下次跟进备注 */
+    @Excel(name = "下次跟进备注")
+    private String nextFollowUpRecord;
+
+    /** 下次跟进时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "下次跟进时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date nextFollowUpTime;
+
+    /** 预约时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预约时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date appointmentTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "到店时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date arrivalTime;
+
+    /** 战败原因 */
+    @Excel(name = "战败原因")
+    private String defeatReasons;
+    @Excel(name = "预约状态")
+    private String makerStatus;
+    @Excel(name = "跟进类型（销售回访，潜客跟进）")
+    private String followType;
+    @Excel(name = "跟进目的")
+    private String objective;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 global_attachment
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("global_attachment")
 public class GlobalAttachment extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 单据类型 */
@@ -68,140 +72,4 @@ public class GlobalAttachment extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String consultType;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setBizType(String bizType) 
-    {
-        this.bizType = bizType;
-    }
-
-    public String getBizType() 
-    {
-        return bizType;
-    }
-    public void setBizId(Long bizId) 
-    {
-        this.bizId = bizId;
-    }
-
-    public Long getBizId() 
-    {
-        return bizId;
-    }
-    public void setAttachmentName(String attachmentName) 
-    {
-        this.attachmentName = attachmentName;
-    }
-
-    public String getAttachmentName() 
-    {
-        return attachmentName;
-    }
-    public void setAttachmentType(Long attachmentType) 
-    {
-        this.attachmentType = attachmentType;
-    }
-
-    public Long getAttachmentType() 
-    {
-        return attachmentType;
-    }
-    public void setAttachmentUrl(String attachmentUrl) 
-    {
-        this.attachmentUrl = attachmentUrl;
-    }
-
-    public String getAttachmentUrl() 
-    {
-        return attachmentUrl;
-    }
-    public void setVersion(Long version) 
-    {
-        this.version = version;
-    }
-
-    public Long getVersion() 
-    {
-        return version;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setConsultType(String consultType) 
-    {
-        this.consultType = consultType;
-    }
-
-    public String getConsultType() 
-    {
-        return consultType;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("bizType", getBizType())
-            .append("bizId", getBizId())
-            .append("attachmentName", getAttachmentName())
-            .append("attachmentType", getAttachmentType())
-            .append("attachmentUrl", getAttachmentUrl())
-            .append("version", getVersion())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("consultType", getConsultType())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 group_wechat
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("group_wechat")
 public class GroupWechat extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -72,150 +76,4 @@ public class GroupWechat extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date lastUpdatedTime;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-    public void setGroupName(String groupName) 
-    {
-        this.groupName = groupName;
-    }
-
-    public String getGroupName() 
-    {
-        return groupName;
-    }
-    public void setHeaderPicture(String headerPicture) 
-    {
-        this.headerPicture = headerPicture;
-    }
-
-    public String getHeaderPicture() 
-    {
-        return headerPicture;
-    }
-    public void setGroupCode(String groupCode) 
-    {
-        this.groupCode = groupCode;
-    }
-
-    public String getGroupCode() 
-    {
-        return groupCode;
-    }
-    public void setScanNum(String scanNum) 
-    {
-        this.scanNum = scanNum;
-    }
-
-    public String getScanNum() 
-    {
-        return scanNum;
-    }
-    public void setServiceUser(String serviceUser) 
-    {
-        this.serviceUser = serviceUser;
-    }
-
-    public String getServiceUser() 
-    {
-        return serviceUser;
-    }
-    public void setServiceUserQrcode(String serviceUserQrcode) 
-    {
-        this.serviceUserQrcode = serviceUserQrcode;
-    }
-
-    public String getServiceUserQrcode() 
-    {
-        return serviceUserQrcode;
-    }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("buildingId", getBuildingId())
-            .append("groupName", getGroupName())
-            .append("headerPicture", getHeaderPicture())
-            .append("groupCode", getGroupCode())
-            .append("scanNum", getScanNum())
-            .append("serviceUser", getServiceUser())
-            .append("serviceUserQrcode", getServiceUserQrcode())
-            .append("remarks", getRemarks())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java

@@ -1,11 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 message
@@ -13,11 +16,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("message")
 public class Message extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -73,150 +78,4 @@ public class Message extends BaseEntity
     @Excel(name = "流程参数【json】")
     private String flowEntity;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setIsDeleted(Integer isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setMessageTitle(String messageTitle) 
-    {
-        this.messageTitle = messageTitle;
-    }
-
-    public String getMessageTitle() 
-    {
-        return messageTitle;
-    }
-    public void setMessageType(String messageType) 
-    {
-        this.messageType = messageType;
-    }
-
-    public String getMessageType() 
-    {
-        return messageType;
-    }
-    public void setFlowType(String flowType) 
-    {
-        this.flowType = flowType;
-    }
-
-    public String getFlowType() 
-    {
-        return flowType;
-    }
-    public void setAuditor(Long auditor) 
-    {
-        this.auditor = auditor;
-    }
-
-    public Long getAuditor() 
-    {
-        return auditor;
-    }
-    public void setAuditDate(Date auditDate) 
-    {
-        this.auditDate = auditDate;
-    }
-
-    public Date getAuditDate() 
-    {
-        return auditDate;
-    }
-    public void setSourceId(Long sourceId) 
-    {
-        this.sourceId = sourceId;
-    }
-
-    public Long getSourceId() 
-    {
-        return sourceId;
-    }
-    public void setAgreeFlag(Integer agreeFlag) 
-    {
-        this.agreeFlag = agreeFlag;
-    }
-
-    public Integer getAgreeFlag() 
-    {
-        return agreeFlag;
-    }
-    public void setFlowEntity(String flowEntity) 
-    {
-        this.flowEntity = flowEntity;
-    }
-
-    public String getFlowEntity() 
-    {
-        return flowEntity;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("createdBy", getCreatedBy())
-            .append("createdTime", getCreatedTime())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("isDeleted", getIsDeleted())
-            .append("messageTitle", getMessageTitle())
-            .append("messageType", getMessageType())
-            .append("flowType", getFlowType())
-            .append("auditor", getAuditor())
-            .append("auditDate", getAuditDate())
-            .append("sourceId", getSourceId())
-            .append("agreeFlag", getAgreeFlag())
-            .append("flowEntity", getFlowEntity())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Sms.java

@@ -1,15 +1,13 @@
 package com.ruoyi.system.domain;
 
 import com.ruoyi.common.core.constant.Constants;
-import lombok.Getter;
+import lombok.Data;
-import lombok.Setter;
 
 /**
  * 
  * 此类的描述：短信的封装类型。
  */
-@Getter
+@Data
-@Setter
 public class Sms {
 	/**
      * 发送内容，如果含有空格，百分数等特殊内容，请用utf8方式进行编码，最多500个文字（1个英文或数字也算1个文字）

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java

@@ -1,12 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 lombok.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.*;
+
+import java.util.Date;
 
 /**
  * 球队人员对象 team_members
@@ -20,11 +22,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+@TableName("team_members")
 public class TeamMembers extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 球队ID */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 training_info
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("training_info")
 public class TrainingInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -68,140 +72,4 @@ public class TrainingInfo extends BaseEntity
     @Excel(name = "培训价格")
     private String price;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setTrainName(String trainName) 
-    {
-        this.trainName = trainName;
-    }
-
-    public String getTrainName() 
-    {
-        return trainName;
-    }
-    public void setPhone(String phone) 
-    {
-        this.phone = phone;
-    }
-
-    public String getPhone() 
-    {
-        return phone;
-    }
-    public void setLinkman(String linkman) 
-    {
-        this.linkman = linkman;
-    }
-
-    public String getLinkman() 
-    {
-        return linkman;
-    }
-    public void setTrainDesc(String trainDesc) 
-    {
-        this.trainDesc = trainDesc;
-    }
-
-    public String getTrainDesc() 
-    {
-        return trainDesc;
-    }
-    public void setBuildId(Long buildId) 
-    {
-        this.buildId = buildId;
-    }
-
-    public Long getBuildId() 
-    {
-        return buildId;
-    }
-    public void setDefaultPicture(String defaultPicture) 
-    {
-        this.defaultPicture = defaultPicture;
-    }
-
-    public String getDefaultPicture() 
-    {
-        return defaultPicture;
-    }
-    public void setPrice(String price) 
-    {
-        this.price = price;
-    }
-
-    public String getPrice() 
-    {
-        return price;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("trainName", getTrainName())
-            .append("phone", getPhone())
-            .append("linkman", getLinkman())
-            .append("trainDesc", getTrainDesc())
-            .append("buildId", getBuildId())
-            .append("defaultPicture", getDefaultPicture())
-            .append("price", getPrice())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 user_building_rel
@@ -13,11 +15,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-04
  */
+@Data
+@TableName("user_building_rel")
 public class UserBuildingRel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -48,90 +52,4 @@ public class UserBuildingRel extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long buildingId;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(String isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public String getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setUserCode(String userCode) 
-    {
-        this.userCode = userCode;
-    }
-
-    public String getUserCode() 
-    {
-        return userCode;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("userCode", getUserCode())
-            .append("buildingId", getBuildingId())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java

@@ -1,12 +1,13 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.*;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 user_role
@@ -20,11 +21,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+@TableName("user_role")
 public class UserRole extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 用户id */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java

@@ -1,12 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 微信用户小程序二维码对象 user_wx_aqr_code
@@ -14,11 +16,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-10-20
  */
+@Data
+@TableName("user_wx_aqr_code")
 public class UserWxAqrCode extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除表示 */
@@ -84,155 +88,4 @@ public class UserWxAqrCode extends BaseEntity
     @Excel(name = "赛会参赛球队ID")
     private Long competitionOfTeamId;
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setIsDeleted(Long isDeleted)
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted()
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime)
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime()
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy)
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy()
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy)
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy()
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime)
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime()
-    {
-        return lastUpdatedTime;
-    }
-    public void setScene(String scene)
-    {
-        this.scene = scene;
-    }
-
-    public String getScene()
-    {
-        return scene;
-    }
-    public void setCodeImgUrl(String codeImgUrl)
-    {
-        this.codeImgUrl = codeImgUrl;
-    }
-
-    public String getCodeImgUrl()
-    {
-        return codeImgUrl;
-    }
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-    public void setBusType(String busType)
-    {
-        this.busType = busType;
-    }
-
-    public String getBusType()
-    {
-        return busType;
-    }
-    public void setPage(String page)
-    {
-        this.page = page;
-    }
-
-    public String getPage()
-    {
-        return page;
-    }
-    public void setWidth(Integer width)
-    {
-        this.width = width;
-    }
-
-    public Integer getWidth()
-    {
-        return width;
-    }
-    public void setUseDesc(String useDesc)
-    {
-        this.useDesc = useDesc;
-    }
-
-    public String getUseDesc()
-    {
-        return useDesc;
-    }
-    public void setJerseyNo(String jerseyNo)
-    {
-        this.jerseyNo = jerseyNo;
-    }
-
-    public String getJerseyNo()
-    {
-        return jerseyNo;
-    }
-    public void setTeamId(Long teamId)
-    {
-        this.teamId = teamId;
-    }
-
-    public Long getTeamId()
-    {
-        return teamId;
-    }
-
-    public Long getCompetitionMembersId() {
-        return competitionMembersId;
-    }
-
-    public void setCompetitionMembersId(Long competitionMembersId) {
-        this.competitionMembersId = competitionMembersId;
-    }
-
-    public Long getCompetitionOfTeamId() {
-        return competitionOfTeamId;
-    }
-
-    public void setCompetitionOfTeamId(Long competitionOfTeamId) {
-        this.competitionOfTeamId = competitionOfTeamId;
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java

@@ -1,11 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+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 org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 球队管理对象 basketball_team
@@ -13,12 +16,15 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-08-30
  */
+@Data
+@TableName("basketball_team")
 public class WxBasketballTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** ID */
     @Excel(name = "ID")
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除 */
@@ -69,151 +75,4 @@ public class WxBasketballTeam extends BaseEntity
     /** 球队logo */
     private String teamLogo;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(String isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public String getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setTeamName(String teamName) 
-    {
-        this.teamName = teamName;
-    }
-
-    public String getTeamName() 
-    {
-        return teamName;
-    }
-    public void setTeamDes(String teamDes) 
-    {
-        this.teamDes = teamDes;
-    }
-
-    public String getTeamDes() 
-    {
-        return teamDes;
-    }
-    public void setBuildId(Long buildId) 
-    {
-        this.buildId = buildId;
-    }
-
-    public Long getBuildId() 
-    {
-        return buildId;
-    }
-    public void setDefaultPicture(String defaultPicture) 
-    {
-        this.defaultPicture = defaultPicture;
-    }
-
-    public String getDefaultPicture() 
-    {
-        return defaultPicture;
-    }
-    public void setBuildingName(String buildingName) 
-    {
-        this.buildingName = buildingName;
-    }
-
-    public String getBuildingName() 
-    {
-        return buildingName;
-    }
-    public void setCreatedId(Long createdId) 
-    {
-        this.createdId = createdId;
-    }
-
-    public Long getCreatedId() 
-    {
-        return createdId;
-    }
-    public void setContactTel(String contactTel) 
-    {
-        this.contactTel = contactTel;
-    }
-
-    public String getContactTel() 
-    {
-        return contactTel;
-    }
-    public void setTeamLogo(String teamLogo) 
-    {
-        this.teamLogo = teamLogo;
-    }
-
-    public String getTeamLogo() 
-    {
-        return teamLogo;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("teamName", getTeamName())
-            .append("teamDes", getTeamDes())
-            .append("remark", getRemark())
-            .append("buildId", getBuildId())
-            .append("defaultPicture", getDefaultPicture())
-            .append("buildingName", getBuildingName())
-            .append("createdId", getCreatedId())
-            .append("contactTel", getContactTel())
-            .append("teamLogo", getTeamLogo())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java

@@ -1,12 +1,15 @@
 package com.ruoyi.system.domain;
 
+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 com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 球场管理对象 building_info
@@ -14,11 +17,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-08-30
  */
+@Data
+@TableName("building_info")
 public class WxBuildingInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除 */
@@ -111,241 +116,4 @@ public class WxBuildingInfo extends BaseEntity
     @Excel(name = "描述")
     private String desc;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(Integer isDeleted)
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted()
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setBuildingName(String buildingName) 
-    {
-        this.buildingName = buildingName;
-    }
-
-    public String getBuildingName() 
-    {
-        return buildingName;
-    }
-    public void setAddress(String address) 
-    {
-        this.address = address;
-    }
-
-    public String getAddress() 
-    {
-        return address;
-    }
-    public void setLongitude(BigDecimal longitude) 
-    {
-        this.longitude = longitude;
-    }
-
-    public BigDecimal getLongitude() 
-    {
-        return longitude;
-    }
-    public void setLatitude(BigDecimal latitude) 
-    {
-        this.latitude = latitude;
-    }
-
-    public BigDecimal getLatitude() 
-    {
-        return latitude;
-    }
-    public void setProvinceCode(String provinceCode) 
-    {
-        this.provinceCode = provinceCode;
-    }
-
-    public String getProvinceCode() 
-    {
-        return provinceCode;
-    }
-    public void setCityCode(String cityCode) 
-    {
-        this.cityCode = cityCode;
-    }
-
-    public String getCityCode() 
-    {
-        return cityCode;
-    }
-    public void setCountyCode(String countyCode) 
-    {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyCode() 
-    {
-        return countyCode;
-    }
-    public void setCityName(String cityName) 
-    {
-        this.cityName = cityName;
-    }
-
-    public String getCityName() 
-    {
-        return cityName;
-    }
-    public void setDefaultPicture(String defaultPicture) 
-    {
-        this.defaultPicture = defaultPicture;
-    }
-
-    public String getDefaultPicture() 
-    {
-        return defaultPicture;
-    }
-    public void setIsSupportlive(Boolean isSupportlive)
-    {
-        this.isSupportlive = isSupportlive;
-    }
-
-    public Boolean getIsSupportlive()
-    {
-        return isSupportlive;
-    }
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-    public void setRejectReason(String rejectReason) 
-    {
-        this.rejectReason = rejectReason;
-    }
-
-    public String getRejectReason() 
-    {
-        return rejectReason;
-    }
-    public void setIsOpen(Boolean isOpen)
-    {
-        this.isOpen = isOpen;
-    }
-
-    public Boolean getIsOpen()
-    {
-        return isOpen;
-    }
-    public void setMittelkurs(String mittelkurs) 
-    {
-        this.mittelkurs = mittelkurs;
-    }
-
-    public String getMittelkurs() 
-    {
-        return mittelkurs;
-    }
-    public void setChatGroupUrl(String chatGroupUrl) 
-    {
-        this.chatGroupUrl = chatGroupUrl;
-    }
-
-    public String getChatGroupUrl() 
-    {
-        return chatGroupUrl;
-    }
-    public void setCreatedId(Long createdId) 
-    {
-        this.createdId = createdId;
-    }
-
-    public Long getCreatedId() 
-    {
-        return createdId;
-    }
-    public void setDesc(String desc) 
-    {
-        this.desc = desc;
-    }
-
-    public String getDesc() 
-    {
-        return desc;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("buildingName", getBuildingName())
-            .append("address", getAddress())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("provinceCode", getProvinceCode())
-            .append("cityCode", getCityCode())
-            .append("countyCode", getCountyCode())
-            .append("remark", getRemark())
-            .append("cityName", getCityName())
-            .append("defaultPicture", getDefaultPicture())
-            .append("isSupportlive", getIsSupportlive())
-            .append("status", getStatus())
-            .append("rejectReason", getRejectReason())
-            .append("isOpen", getIsOpen())
-            .append("mittelkurs", getMittelkurs())
-            .append("chatGroupUrl", getChatGroupUrl())
-            .append("createdId", getCreatedId())
-            .append("desc", getDesc())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java

@@ -1,12 +1,15 @@
 package com.ruoyi.system.domain;
 
+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 com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 微信用户对象 user_info
@@ -14,11 +17,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author 吴一博
  * @date 2022-08-30
  */
+@Data
+@TableName("user_info")
 public class WxUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除 */
@@ -112,240 +117,4 @@ public class WxUser extends BaseEntity
     @Excel(name = "真实姓名")
     private String realName;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDeleted(Integer isDeleted)
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted()
-    {
-        return isDeleted;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setLoginName(String loginName) 
-    {
-        this.loginName = loginName;
-    }
-
-    public String getLoginName() 
-    {
-        return loginName;
-    }
-    public void setPassWord(String passWord) 
-    {
-        this.passWord = passWord;
-    }
-
-    public String getPassWord() 
-    {
-        return passWord;
-    }
-    public void setRole(String role) 
-    {
-        this.role = role;
-    }
-
-    public String getRole() 
-    {
-        return role;
-    }
-    public void setOpenid(String openid) 
-    {
-        this.openid = openid;
-    }
-
-    public String getOpenid() 
-    {
-        return openid;
-    }
-    public void setAvatar(String avatar) 
-    {
-        this.avatar = avatar;
-    }
-
-    public String getAvatar() 
-    {
-        return avatar;
-    }
-    public void setGender(Integer gender)
-    {
-        this.gender = gender;
-    }
-
-    public Integer getGender()
-    {
-        return gender;
-    }
-    public void setUserName(String userName) 
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName() 
-    {
-        return userName;
-    }
-    public void setTelephone(String telephone) 
-    {
-        this.telephone = telephone;
-    }
-
-    public String getTelephone() 
-    {
-        return telephone;
-    }
-    public void setBirthday(Date birthday) 
-    {
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday() 
-    {
-        return birthday;
-    }
-    public void setHeight(Long height) 
-    {
-        this.height = height;
-    }
-
-    public Long getHeight() 
-    {
-        return height;
-    }
-    public void setWeight(BigDecimal weight) 
-    {
-        this.weight = weight;
-    }
-
-    public BigDecimal getWeight() 
-    {
-        return weight;
-    }
-    public void setTeamPosition(String teamPosition) 
-    {
-        this.teamPosition = teamPosition;
-    }
-
-    public String getTeamPosition() 
-    {
-        return teamPosition;
-    }
-    public void setTag(String tag) 
-    {
-        this.tag = tag;
-    }
-
-    public String getTag() 
-    {
-        return tag;
-    }
-    public void setEnabled(Integer enabled)
-    {
-        this.enabled = enabled;
-    }
-
-    public Integer getEnabled()
-    {
-        return enabled;
-    }
-    public void setUnionid(String unionid) 
-    {
-        this.unionid = unionid;
-    }
-
-    public String getUnionid() 
-    {
-        return unionid;
-    }
-    public void setOfficialAccountOpenid(String officialAccountOpenid) 
-    {
-        this.officialAccountOpenid = officialAccountOpenid;
-    }
-
-    public String getOfficialAccountOpenid() 
-    {
-        return officialAccountOpenid;
-    }
-    public void setRealName(String realName) 
-    {
-        this.realName = realName;
-    }
-
-    public String getRealName() 
-    {
-        return realName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isDeleted", getIsDeleted())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("loginName", getLoginName())
-            .append("passWord", getPassWord())
-            .append("role", getRole())
-            .append("openid", getOpenid())
-            .append("avatar", getAvatar())
-            .append("gender", getGender())
-            .append("userName", getUserName())
-            .append("telephone", getTelephone())
-            .append("birthday", getBirthday())
-            .append("height", getHeight())
-            .append("weight", getWeight())
-            .append("teamPosition", getTeamPosition())
-            .append("tag", getTag())
-            .append("enabled", getEnabled())
-            .append("unionid", getUnionid())
-            .append("officialAccountOpenid", getOfficialAccountOpenid())
-            .append("realName", getRealName())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java

@@ -11,4 +11,7 @@ import lombok.Data;
 @Data
 public class CompetitionMembersScoreVo extends CompetitionMembersScore {
     private String realName;
+    private Long totalCount;
+    private Long avgCountScore;
+    private Boolean isHideAvatar;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain.vo;
 import com.ruoyi.system.domain.CompetitionMembers;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,8 +18,7 @@ import lombok.Setter;
  * @date : 2020年08月07日
  */
 @ApiModel(value = "比赛参与人员Vo")
-@Setter
+@Data
-@Getter
 public class CompetitionMembersVo extends CompetitionMembers {
 
     private static final long serialVersionUID = 1L;
@@ -56,17 +56,13 @@ public class CompetitionMembersVo extends CompetitionMembers {
 
     @ApiModelProperty(value = "短信验证码", required = false)
     private String captcha;
+    @ApiModelProperty(value = "赛会名称", required = false)
+    private String competitionName;
+    @ApiModelProperty(value = "球队名称", required = false)
+    private String teamName;
 
-    @ApiModelProperty(value="身高",required=false)
+    @ApiModelProperty(value="个人生涯",required=false)
-    private java.math.BigDecimal height;
+    private CompetitionMembersScoreVo personalCareerVo;
-
+    @ApiModelProperty(value="赛会个人得分",required=false)
-
+    private CompetitionMembersScoreVo competitionMemberScore;
-    @ApiModelProperty(value="体重",required=false)
-    private java.math.BigDecimal weight;
-
-    /**
-     *球队位置【字典】
-     */
-    @ApiModelProperty(value="球队位置【字典】",required=false)
-    private String teamPosition;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamIntegralVo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,13 +12,26 @@ import java.io.Serializable;
  */
 @Data
 public class CompetitionTeamIntegralVo implements Serializable {
+    @ApiModelProperty(value = "赛会ID")
     private Long competitionId;
+    @ApiModelProperty(value = "球队")
     private String teamName;
+    @ApiModelProperty(value = "球队Logo")
     private String teamLogo;
+    @ApiModelProperty(value = "胜场")
     private Integer win;
+    @ApiModelProperty(value = "负场")
     private Integer fail;
+    @ApiModelProperty(value = "总得分")
     private Integer totalScore;
+    @ApiModelProperty(value = "总输分")
+    private Integer totalFailScore;
+    @ApiModelProperty(value = "净胜分")
+    private Integer netWinPoint;
+    @ApiModelProperty(value = "积分")
     private Integer integral;
+    @ApiModelProperty(value = "赛程类型")
     private String vsType;
+    @ApiModelProperty(value = "球队分组")
     private String competitionGroup;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerOrderVo.java

@@ -0,0 +1,48 @@
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 吴一博
+ * @date 2023年08月03日 8:36
+ * @Description
+ */
+@Data
+public class CustomerOrderVo extends CustomerVo{
+
+    /** 客户id */
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    /** 订车时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "订车时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderDate;
+
+    /** 车辆详细 */
+    @Excel(name = "车辆详细")
+    private String carInfo;
+
+    /** 车辆VIN */
+    @Excel(name = "车辆VIN")
+    private String carVin;
+
+    /** 车辆状态 */
+    @Excel(name = "车辆状态")
+    private String carStatus;
+    /** 车辆状态 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private String outDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划跟进日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private String planFollowUpDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际跟进日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private String actualFollowUpDate;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CustomerVo.java

@@ -27,4 +27,18 @@ public class CustomerVo extends Customer {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "跟进超期", width = 30, dateFormat = "yyyy-MM-dd")
     private String followUpOverdueDate;
+    /** 意向级别 */
+    @Excel(name = "意向级别")
+    private String intentionLevel;
+    @Excel(name = "跟进方式")
+    private String followUpMethod;
+    /** 预约时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预约时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date appointmentTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "到店时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date arrivalTime;
+    @Excel(name = "预约状态")
+    private String makerStatus;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.domain.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,12 +11,12 @@ import java.math.BigDecimal;
  *
  */
 @ApiModel(value = "个人生涯Vo")
-@Setter
+@Data
-@Getter
 public class PersonalCareerVo {
 
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty(value="总场次",required=false)
+    private Long totalCount;
     /**
      *场均得分
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java

@@ -56,6 +56,6 @@ public class UserInfoResponse extends WxUser {
     @Setter
     @Getter
     @ApiModelProperty(value="个人生涯",required=false)
-    private PersonalCareerVo personalCareerVo;
+    private CompetitionMembersScoreVo personalCareerVo;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BuildingInfoDetail;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-06
  */
-public interface BuildingInfoDetailMapper 
+public interface BuildingInfoDetailMapper extends BaseMapper<BuildingInfoDetail>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BuildingLabel;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface BuildingLabelMapper 
+public interface BuildingLabelMapper extends BaseMapper<BuildingLabel>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BuildingTeamRel;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface BuildingTeamRelMapper 
+public interface BuildingTeamRelMapper extends BaseMapper<BuildingTeamRel>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CameraInfo;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface CameraInfoMapper 
+public interface CameraInfoMapper extends BaseMapper<CameraInfo>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java

@@ -1,17 +1,19 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.Competition;
 import com.ruoyi.system.domain.vo.CompetitionExcleVo;
 import com.ruoyi.system.domain.vo.CompetitionVo;
 
+import java.util.List;
+
 /**
  * 比赛信息Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-02
  */
-public interface CompetitionMapper 
+public interface CompetitionMapper  extends BaseMapper<Competition>
 {
     /**
      * 查询比赛信息

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java

@@ -1,17 +1,19 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionMembers;
 import com.ruoyi.system.domain.vo.CompetitionMembersVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 比赛参与人员Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface CompetitionMembersMapper 
+public interface CompetitionMembersMapper extends BaseMapper<CompetitionMembers>
 {
     /**
      * 查询比赛参与人员

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java

@@ -1,18 +1,19 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionMembersScore;
 import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
-import com.ruoyi.system.domain.vo.PersonalCareerVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 赛会中-赛程-人员得分Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface CompetitionMembersScoreMapper 
+public interface CompetitionMembersScoreMapper extends BaseMapper<CompetitionMembersScore>
 {
     /**
      * 查询赛会中-赛程-人员得分
@@ -64,7 +65,9 @@ public interface CompetitionMembersScoreMapper
 
     public List<CompetitionMembersScoreVo> findMembersScoreByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId);
 
-    PersonalCareerVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId);
+    CompetitionMembersScoreVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId);
 
     List<CompetitionMembersScore> getHonorList(@Param("competitionId") Long competitionId,@Param("userId") Long userId);
+
+    CompetitionMembersScoreVo getThisCompetitionScore(@Param("competitionId") Long competitionId,@Param("competitionMembersId") Long competitionMembersId);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java

@@ -1,17 +1,19 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionOfTeam;
 import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 赛会中-参赛队伍Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface CompetitionOfTeamMapper 
+public interface CompetitionOfTeamMapper extends BaseMapper<CompetitionOfTeam>
 {
     /**
      * 查询赛会中-参赛队伍

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java

@@ -1,17 +1,19 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.vo.CompetitionResultVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 赛会中-赛程结果记录Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface CompetitionResultMapper 
+public interface CompetitionResultMapper extends BaseMapper<CompetitionResult>
 {
     /**
      * 查询赛会中-赛程结果记录

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionSharePermissions;
 
+import java.util.List;
+
 /**
  * 赛会-权限分享Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-20
  */
-public interface CompetitionSharePermissionsMapper 
+public interface CompetitionSharePermissionsMapper extends BaseMapper<CompetitionSharePermissions>
 {
     /**
      * 查询赛会-权限分享

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionTeamGroup;
 
+import java.util.List;
+
 /**
  * 赛会中-分组Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface CompetitionTeamGroupMapper 
+public interface CompetitionTeamGroupMapper extends BaseMapper<CompetitionTeamGroup>
 {
     /**
      * 查询赛会中-分组

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java

@@ -1,11 +1,11 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionTeamVsTeam;
 import com.ruoyi.system.domain.vo.CompetitionTeamIntegralVo;
 import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
-import com.ruoyi.system.service.ICompetitionResultService;
+
-import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 /**
  * 赛会中-球队VS球队关系Mapper接口
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface CompetitionTeamVsTeamMapper 
+public interface CompetitionTeamVsTeamMapper extends BaseMapper<CompetitionTeamVsTeam>
 {
     /**
      * 查询赛会中-球队VS球队关系
@@ -80,5 +80,5 @@ public interface CompetitionTeamVsTeamMapper
 
     int competitionVsTeamStatusUpdate(CompetitionTeamVsTeam competitionTeamVsTeam);
 
-    List<CompetitionTeamVsTeamVo> getTodaySchedule(ICompetitionResultService competitionResultService);
+    List<CompetitionTeamVsTeamVo> getTodaySchedule(CompetitionTeamVsTeam teamVsTeam);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java

@@ -85,4 +85,6 @@ public interface CustomerMapper
      * @return 结果
      */
     public int deleteFollowUpByCustomerId(Long id);
+    //预约记录列表
+    List<CustomerVo> selectCustomerMakerList(CustomerVo customer);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java

@@ -0,0 +1,66 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.domain.CustomerOrder;
+import com.ruoyi.system.domain.vo.CustomerOrderVo;
+
+import java.util.List;
+
+/**
+ * 客户-订车Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-01
+ */
+public interface CustomerOrderMapper extends BaseMapper<CustomerOrder>
+{
+    /**
+     * 查询客户-订车
+     * 
+     * @param id 客户-订车主键
+     * @return 客户-订车
+     */
+    public CustomerOrder selectCustomerOrderById(Long id);
+
+    /**
+     * 查询客户-订车列表
+     * 
+     * @param customerOrder 客户-订车
+     * @return 客户-订车集合
+     */
+    public List<CustomerOrder> selectCustomerOrderList(CustomerOrder customerOrder);
+
+    /**
+     * 新增客户-订车
+     * 
+     * @param customerOrder 客户-订车
+     * @return 结果
+     */
+    public int insertCustomerOrder(CustomerOrder customerOrder);
+
+    /**
+     * 修改客户-订车
+     * 
+     * @param customerOrder 客户-订车
+     * @return 结果
+     */
+    public int updateCustomerOrder(CustomerOrder customerOrder);
+
+    /**
+     * 删除客户-订车
+     * 
+     * @param id 客户-订车主键
+     * @return 结果
+     */
+    public int deleteCustomerOrderById(Long id);
+
+    /**
+     * 批量删除客户-订车
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCustomerOrderByIds(Long[] ids);
+
+    List<CustomerOrderVo> getCustomerOrderPage(CustomerOrderVo customerOrder);
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.FeatureLabel;
 
+import java.util.List;
+
 /**
  * 球馆特征Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-06
  */
-public interface FeatureLabelMapper 
+public interface FeatureLabelMapper extends BaseMapper<FeatureLabel>
 {
     /**
      * 查询球馆特征

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java

@@ -1,10 +1,10 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import com.mybatisflex.core.BaseMapper;
 import com.ruoyi.system.domain.FollowUp;
 
+import java.util.List;
+
 /**
  * 跟进模块-客户跟进记录Mapper接口
  * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.GlobalAttachment;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface GlobalAttachmentMapper 
+public interface GlobalAttachmentMapper extends BaseMapper<GlobalAttachment>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.GroupWechat;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface GroupWechatMapper 
+public interface GroupWechatMapper  extends BaseMapper<GroupWechat>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.Message;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface MessageMapper 
+public interface MessageMapper extends BaseMapper<Message>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java

@@ -1,18 +1,20 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.TeamMembers;
 import com.ruoyi.system.domain.vo.TeamMembersResponse;
 import com.ruoyi.system.domain.vo.TeamMembersVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 球队人员Mapper接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface TeamMembersMapper 
+public interface TeamMembersMapper  extends BaseMapper<TeamMembers>
 {
     /**
      * 查询球队人员

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.TrainingInfo;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface TrainingInfoMapper 
+public interface TrainingInfoMapper extends BaseMapper<TrainingInfo>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.UserBuildingRel;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface UserBuildingRelMapper 
+public interface UserBuildingRelMapper extends BaseMapper<UserBuildingRel>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.UserRole;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface UserRoleMapper 
+public interface UserRoleMapper  extends BaseMapper<UserRole>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java

@@ -1,16 +1,18 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.UserWxAqrCode;
 import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
 
+import java.util.List;
+
 /**
  * 微信用户小程序二维码Mapper接口
  * 
  * @author ruoyi
  * @date 2022-10-18
  */
-public interface UserWxAqrCodeMapper 
+public interface UserWxAqrCodeMapper  extends BaseMapper<UserWxAqrCode>
 {
     /**
      * 查询微信用户小程序二维码

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java

@@ -1,16 +1,18 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.WxBasketballTeam;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 球队管理Mapper接口
  * 
  * @author ruoyi
  * @date 2022-08-30
  */
-public interface WxBasketballTeamMapper 
+public interface WxBasketballTeamMapper extends BaseMapper<WxBasketballTeam>
 {
     /**
      * 查询球队管理

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java

@@ -1,17 +1,19 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.WxBuildingInfo;
 import com.ruoyi.system.domain.vo.BuildingInfoRequest;
 import com.ruoyi.system.domain.vo.BuildingInfoResponse;
 
+import java.util.List;
+
 /**
  * 球场管理Mapper接口
  * 
  * @author ruoyi
  * @date 2022-08-30
  */
-public interface WxBuildingInfoMapper 
+public interface WxBuildingInfoMapper extends BaseMapper<WxBuildingInfo>
 {
     /**
      * 查询球场管理

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java

@@ -1,16 +1,18 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.WxUser;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 微信用户Mapper接口
  * 
  * @author 吴一博
  * @date 2022-08-30
  */
-public interface WxUserMapper 
+public interface WxUserMapper extends BaseMapper<WxUser>
 {
     /**
      * 查询微信用户

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BuildingInfoDetail;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service接口
  * 
  * @author ruoyi
  * @date 2023-07-06
  */
-public interface IBuildingInfoDetailService 
+public interface IBuildingInfoDetailService extends IService<BuildingInfoDetail>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BuildingLabel;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface IBuildingLabelService 
+public interface IBuildingLabelService extends IService<BuildingLabel>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BuildingTeamRel;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface IBuildingTeamRelService 
+public interface IBuildingTeamRelService extends IService<BuildingTeamRel>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CameraInfo;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service接口
  * 
  * @author ruoyi
  * @date 2023-07-04
  */
-public interface ICameraInfoService 
+public interface ICameraInfoService extends IService<CameraInfo>
 {
     /**
      * 查询【请填写功能名称】

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionMembersScore;
-import com.ruoyi.system.domain.vo.PersonalCareerVo;
+import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
+
+import java.util.List;
 
 /**
  * 赛会中-赛程-人员得分Service接口
@@ -10,7 +12,7 @@ import com.ruoyi.system.domain.vo.PersonalCareerVo;
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface ICompetitionMembersScoreService 
+public interface ICompetitionMembersScoreService extends IService<CompetitionMembersScore>
 {
     /**
      * 查询赛会中-赛程-人员得分
@@ -60,7 +62,9 @@ public interface ICompetitionMembersScoreService
      */
     public int deleteCompetitionMembersScoreById(Long id);
 
-    PersonalCareerVo getUserScoreByUserId(Long userId);
+    CompetitionMembersScoreVo getUserScoreByUserId(Long userId);
 
     List<CompetitionMembersScore> getHonorList(Long competitionId, Long userId);
+
+    CompetitionMembersScoreVo getThisCompetitionScore(Long competitionId, Long competitionMembersId);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java

@@ -1,16 +1,18 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionMembers;
 import com.ruoyi.system.domain.vo.CompetitionMembersVo;
 
+import java.util.List;
+
 /**
  * 比赛参与人员Service接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface ICompetitionMembersService 
+public interface ICompetitionMembersService extends IService<CompetitionMembers>
 {
     /**
      * 查询比赛参与人员
@@ -52,6 +54,7 @@ public interface ICompetitionMembersService
      */
     public int deleteCompetitionMembersByIds(Long[] ids);
 
+    public CompetitionMembersVo getCompetitionUserScoreInfo(CompetitionMembersVo vo);
     /**
      * 删除比赛参与人员信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java

@@ -1,16 +1,18 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionOfTeam;
 import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
 
+import java.util.List;
+
 /**
  * 赛会中-参赛队伍Service接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface ICompetitionOfTeamService 
+public interface ICompetitionOfTeamService extends IService<CompetitionOfTeam>
 {
     /**
      * 查询赛会中-参赛队伍

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java

@@ -1,17 +1,19 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.vo.CompetitionResultVo;
 import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;
 
+import java.util.List;
+
 /**
  * 赛会中-赛程结果记录Service接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface ICompetitionResultService 
+public interface ICompetitionResultService  extends IService<CompetitionResult>
 {
     /**
      * 查询赛会中-赛程结果记录

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java

@@ -1,8 +1,6 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.Map;
-
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
 import com.ruoyi.system.domain.Competition;
 import com.ruoyi.system.domain.vo.CompetitionExcleVo;
@@ -10,7 +8,9 @@ import com.ruoyi.system.domain.vo.CompetitionResponse;
 import com.ruoyi.system.domain.vo.CompetitionVo;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 比赛信息Service接口
@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author ruoyi
  * @date 2022-11-02
  */
-public interface ICompetitionService 
+public interface ICompetitionService extends IService<Competition>
 {
     /**
      * 查询比赛信息
@@ -87,6 +87,8 @@ public interface ICompetitionService
     Boolean edit(Competition entity);
 
     CompetitionExcleVo importExcleData(Long competitionId,Map<String, PictureData> maplist, Sheet sheet);
+
+    CompetitionExcleVo importExcleDataUserAvatar(Long competitionId,Map<String, PictureData> maplist, Sheet sheet);
     //根据当前时间修改已经完成的赛会数据
     int updateCompetitionFinish();
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java

@@ -1,8 +1,9 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionSharePermissions;
-import com.ruoyi.system.domain.vo.CompetitionSharePermissionsVo;
+
+import java.util.List;
 
 /**
  * 赛会-权限分享Service接口
@@ -10,7 +11,7 @@ import com.ruoyi.system.domain.vo.CompetitionSharePermissionsVo;
  * @author ruoyi
  * @date 2023-07-20
  */
-public interface ICompetitionSharePermissionsService 
+public interface ICompetitionSharePermissionsService extends IService<CompetitionSharePermissions>
 {
     /**
      * 查询赛会-权限分享

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.CompetitionSharePermissions;
 import com.ruoyi.system.domain.CompetitionTeamGroup;
 import com.ruoyi.system.domain.vo.TeamGroupRequest;
 
@@ -11,7 +13,7 @@ import com.ruoyi.system.domain.vo.TeamGroupRequest;
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface ICompetitionTeamGroupService 
+public interface ICompetitionTeamGroupService extends IService<CompetitionTeamGroup>
 {
     /**
      * 查询赛会中-分组

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java

@@ -1,19 +1,20 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.Map;
-
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.CompetitionTeamVsTeam;
 import com.ruoyi.system.domain.vo.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 赛会中-球队VS球队关系Service接口
  * 
  * @author ruoyi
  * @date 2022-11-03
  */
-public interface ICompetitionTeamVsTeamService 
+public interface ICompetitionTeamVsTeamService extends IService<CompetitionTeamVsTeam>
 {
     /**
      * 查询赛会中-球队VS球队关系

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java

@@ -0,0 +1,66 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.CustomerOrder;
+import com.ruoyi.system.domain.vo.CustomerOrderVo;
+
+/**
+ * 客户-订车Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-01
+ */
+public interface ICustomerOrderService extends IService<CustomerOrder>
+{
+    /**
+     * 查询客户-订车
+     * 
+     * @param id 客户-订车主键
+     * @return 客户-订车
+     */
+    public CustomerOrder selectCustomerOrderById(Long id);
+
+    /**
+     * 查询客户-订车列表
+     * 
+     * @param customerOrder 客户-订车
+     * @return 客户-订车集合
+     */
+    public List<CustomerOrder> selectCustomerOrderList(CustomerOrder customerOrder);
+
+    /**
+     * 新增客户-订车
+     * 
+     * @param customerOrder 客户-订车
+     * @return 结果
+     */
+    public int insertCustomerOrder(CustomerOrder customerOrder);
+
+    /**
+     * 修改客户-订车
+     * 
+     * @param customerOrder 客户-订车
+     * @return 结果
+     */
+    public int updateCustomerOrder(CustomerOrder customerOrder);
+
+    /**
+     * 批量删除客户-订车
+     * 
+     * @param ids 需要删除的客户-订车主键集合
+     * @return 结果
+     */
+    public int deleteCustomerOrderByIds(Long[] ids);
+
+    /**
+     * 删除客户-订车信息
+     * 
+     * @param id 客户-订车主键
+     * @return 结果
+     */
+    public int deleteCustomerOrderById(Long id);
+
+    List<CustomerOrderVo> getCustomerOrderPage(CustomerOrderVo customerOrder);
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java

@@ -59,4 +59,6 @@ public interface ICustomerService
      * @return 结果
      */
     public int deleteCustomerById(Long id);
+
+    List<CustomerVo> selectCustomerMakerList(CustomerVo customer);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.FeatureLabel;
 
+import java.util.List;
+
 /**
  * 球馆特征Service接口
  * 
  * @author ruoyi
  * @date 2023-07-06
  */
-public interface IFeatureLabelService 
+public interface IFeatureLabelService  extends IService<FeatureLabel>
 {
     /**
      * 查询球馆特征

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java

@@ -2,7 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.FollowUp;
 
 /**